external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

SRT: Extract ISrsSrtPoller to hide SRT_EPOLL_EVENT

Browse source
This commit is contained in:
winlin 2022-06-07 20:40:31 +08:00
parent 94cc50d146
commit d39ec3cf45
5 changed files with 47 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_srt_server.cpp
View file

@ -359,7 +359,7 @@ srs_error_t SrsSrtEventLoop::initialize()
{
srs_error_t err = srs_success;
srt_poller_ = new SrsSrtPoller();
srt_poller_ = srs_srt_poller_new();
if ((err = srt_poller_->initialize()) != srs_success) {
return srs_error_wrap(err, "srt poller initialize");

4
trunk/src/app/srs_app_srt_server.hpp
View file

@ -111,7 +111,7 @@ public:
SrsSrtEventLoop();
virtual ~SrsSrtEventLoop();
public:
SrsSrtPoller* poller() { return srt_poller_; }
ISrsSrtPoller* poller() { return srt_poller_; }
public:
srs_error_t initialize();
srs_error_t start();
@ -119,7 +119,7 @@ public:
public:
virtual srs_error_t cycle();
private:
SrsSrtPoller* srt_poller_;
ISrsSrtPoller* srt_poller_;
SrsCoroutine* trd_;
};

33
trunk/src/protocol/srs_protocol_srt.cpp
View file

@ -439,6 +439,24 @@ srs_error_t SrsSrtStat::fetch(SRTSOCKET srt_fd, bool clear)
return err;
}
class SrsSrtPoller : public ISrsSrtPoller
{
public:
SrsSrtPoller();
virtual ~SrsSrtPoller();
public:
srs_error_t initialize();
srs_error_t add_socket(SrsSrtSocket* srt_skt);
srs_error_t mod_socket(SrsSrtSocket* srt_skt);
srs_error_t del_socket(SrsSrtSocket* srt_skt);
srs_error_t wait(int timeout_ms, int* pn_fds);
private:
// Find SrsSrtSocket* context by SRTSOCKET.
std::map<SRTSOCKET, SrsSrtSocket*> fd_sockets_;
int srt_epoller_fd_;
std::vector<SRT_EPOLL_EVENT> events_;
};
SrsSrtPoller::SrsSrtPoller()
{
srt_epoller_fd_ = -1;
@ -556,7 +574,20 @@ srs_error_t SrsSrtPoller::mod_socket(SrsSrtSocket* srt_skt)
return err;
}
SrsSrtSocket::SrsSrtSocket(SrsSrtPoller* srt_poller, SRTSOCKET srt_fd)
ISrsSrtPoller::ISrsSrtPoller()
{
}
ISrsSrtPoller::~ISrsSrtPoller()
{
}
ISrsSrtPoller* srs_srt_poller_new()
{
return new SrsSrtPoller();
}
SrsSrtSocket::SrsSrtSocket(ISrsSrtPoller* srt_poller, SRTSOCKET srt_fd)
{
srt_poller_ = srt_poller;
srt_fd_ = srt_fd;

26
trunk/src/protocol/srs_protocol_srt.hpp
View file

@ -86,31 +86,27 @@ public:
};
// Srt poller, subscribe/unsubscribed events and wait them fired.
class SrsSrtPoller
class ISrsSrtPoller
{
public:
SrsSrtPoller();
virtual ~SrsSrtPoller();
ISrsSrtPoller();
virtual ~ISrsSrtPoller();
public:
srs_error_t initialize();
srs_error_t add_socket(SrsSrtSocket* srt_skt);
srs_error_t mod_socket(SrsSrtSocket* srt_skt);
srs_error_t del_socket(SrsSrtSocket* srt_skt);
virtual srs_error_t initialize() = 0;
virtual srs_error_t add_socket(SrsSrtSocket* srt_skt) = 0;
virtual srs_error_t mod_socket(SrsSrtSocket* srt_skt) = 0;
virtual srs_error_t del_socket(SrsSrtSocket* srt_skt) = 0;
// Wait for the fds in its epoll to be fired in specified timeout_ms, where the pn_fds is the number of active fds.
// Note that for ST, please always use timeout_ms(0) and switch coroutine by yourself.
srs_error_t wait(int timeout_ms, int* pn_fds);
private:
// Find SrsSrtSocket* context by SRTSOCKET.
std::map<SRTSOCKET, SrsSrtSocket*> fd_sockets_;
int srt_epoller_fd_;
std::vector<SRT_EPOLL_EVENT> events_;
virtual srs_error_t wait(int timeout_ms, int* pn_fds) = 0;
};
ISrsSrtPoller* srs_srt_poller_new();
// Srt ST socket, wrap SRT io and make it adapt to ST-thread.
class SrsSrtSocket
{
public:
SrsSrtSocket(SrsSrtPoller* srt_poller, SRTSOCKET srt_fd);
SrsSrtSocket(ISrsSrtPoller* srt_poller, SRTSOCKET srt_fd);
virtual ~SrsSrtSocket();
public: // IO API
srs_error_t connect(const std::string& ip, int port);
@ -171,7 +167,7 @@ private:
// Event of this socket subscribed.
int events_;
// Srt poller which this socket attach to.
SrsSrtPoller* srt_poller_;
ISrsSrtPoller* srt_poller_;
};
#endif

2
trunk/src/utest/srs_utest_srt.cpp
View file

@ -23,7 +23,7 @@ VOID TEST(ServiceSrtPoller, SrtPollOperateSocket)
{
srs_error_t err = srs_success;
SrsSrtPoller* srt_poller = new SrsSrtPoller();
ISrsSrtPoller* srt_poller = srs_srt_poller_new();
HELPER_EXPECT_SUCCESS(srt_poller->initialize());
SRTSOCKET srt_fd = SRT_INVALID_SOCK;