external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

SRT: Refine get_srt_poller to poller.

Browse source
This commit is contained in:
winlin 2022-05-28 16:53:40 +08:00
parent 21899c5998
commit 6c94e91792
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ using namespace std;
SrsSrtConnection::SrsSrtConnection(SRTSOCKET srt_fd) SrsSrtConnection::SrsSrtConnection(SRTSOCKET srt_fd)
{ {
srt_fd_ = srt_fd; srt_fd_ = srt_fd;
srt_skt_ = new SrsSrtSocket(_srt_eventloop->get_srt_poller(), srt_fd_); srt_skt_ = new SrsSrtSocket(_srt_eventloop->poller(), srt_fd_);
} }
SrsSrtConnection::~SrsSrtConnection() SrsSrtConnection::~SrsSrtConnection()

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

@ -61,7 +61,7 @@ srs_error_t SrsSrtListener::listen()
return srs_error_wrap(err, "srs_srt_listen"); return srs_error_wrap(err, "srs_srt_listen");
} }
srt_skt_ = new SrsSrtSocket(_srt_eventloop->get_srt_poller(), lfd_); srt_skt_ = new SrsSrtSocket(_srt_eventloop->poller(), lfd_);
// Accept never timeout. // Accept never timeout.
srt_skt_->set_recv_timeout(ST_UTIME_NO_TIMEOUT); srt_skt_->set_recv_timeout(ST_UTIME_NO_TIMEOUT);
srt_skt_->set_send_timeout(ST_UTIME_NO_TIMEOUT); srt_skt_->set_send_timeout(ST_UTIME_NO_TIMEOUT);

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

@ -104,14 +104,14 @@ public:
virtual SrsSrtServer* instance(); virtual SrsSrtServer* instance();
}; };
// The srt event loop, run srt poller and wait event happeed. // Start a coroutine to drive the SRT events with state-threads.
class SrsSrtEventLoop : public ISrsCoroutineHandler class SrsSrtEventLoop : public ISrsCoroutineHandler
{ {
public: public:
SrsSrtEventLoop(); SrsSrtEventLoop();
virtual ~SrsSrtEventLoop(); virtual ~SrsSrtEventLoop();
public: public:
SrsSrtPoller* get_srt_poller() { return srt_poller_; } SrsSrtPoller* poller() { return srt_poller_; }
public: public:
srs_error_t initialize(); srs_error_t initialize();
srs_error_t start(); srs_error_t start();

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

@ -151,7 +151,7 @@ public:
return srs_error_wrap(err, "srt listen"); return srs_error_wrap(err, "srt listen");
} }
srt_socket_ = new SrsSrtSocket(_srt_eventloop->get_srt_poller(), srt_server_fd_); srt_socket_ = new SrsSrtSocket(_srt_eventloop->poller(), srt_server_fd_);
return err; return err;
} }
@ -185,7 +185,7 @@ VOID TEST(ServiceStSRTTest, ListenConnectAccept)
SRTSOCKET srt_client_fd = SRT_INVALID_SOCK; SRTSOCKET srt_client_fd = SRT_INVALID_SOCK;
HELPER_EXPECT_SUCCESS(srs_srt_socket(&srt_client_fd)); HELPER_EXPECT_SUCCESS(srs_srt_socket(&srt_client_fd));
SrsSrtSocket* srt_client_socket = new SrsSrtSocket(_srt_eventloop->get_srt_poller(), srt_client_fd); SrsSrtSocket* srt_client_socket = new SrsSrtSocket(_srt_eventloop->poller(), srt_client_fd);
// No client connected, accept will timeout. // No client connected, accept will timeout.
SRTSOCKET srt_fd = SRT_INVALID_SOCK; SRTSOCKET srt_fd = SRT_INVALID_SOCK;
@ -209,7 +209,7 @@ VOID TEST(ServiceStSRTTest, ConnectTimeout)
SRTSOCKET srt_client_fd = SRT_INVALID_SOCK; SRTSOCKET srt_client_fd = SRT_INVALID_SOCK;
HELPER_EXPECT_SUCCESS(srs_srt_socket_with_default_option(&srt_client_fd)); HELPER_EXPECT_SUCCESS(srs_srt_socket_with_default_option(&srt_client_fd));
SrsSrtSocket* srt_client_socket = new SrsSrtSocket(_srt_eventloop->get_srt_poller(), srt_client_fd); SrsSrtSocket* srt_client_socket = new SrsSrtSocket(_srt_eventloop->poller(), srt_client_fd);
srt_client_socket->set_send_timeout(50 * SRS_UTIME_MILLISECONDS); srt_client_socket->set_send_timeout(50 * SRS_UTIME_MILLISECONDS);
// Client connect to server which is no listening. // Client connect to server which is no listening.
@ -231,7 +231,7 @@ VOID TEST(ServiceStSRTTest, ConnectWithStreamid)
SRTSOCKET srt_client_fd = SRT_INVALID_SOCK; SRTSOCKET srt_client_fd = SRT_INVALID_SOCK;
HELPER_EXPECT_SUCCESS(srs_srt_socket_with_default_option(&srt_client_fd)); HELPER_EXPECT_SUCCESS(srs_srt_socket_with_default_option(&srt_client_fd));
HELPER_EXPECT_SUCCESS(srs_srt_set_streamid(srt_client_fd, streamid)); HELPER_EXPECT_SUCCESS(srs_srt_set_streamid(srt_client_fd, streamid));
SrsSrtSocket* srt_client_socket = new SrsSrtSocket(_srt_eventloop->get_srt_poller(), srt_client_fd); SrsSrtSocket* srt_client_socket = new SrsSrtSocket(_srt_eventloop->poller(), srt_client_fd);
HELPER_EXPECT_SUCCESS(srt_client_socket->connect("127.0.0.1", 9000)); HELPER_EXPECT_SUCCESS(srt_client_socket->connect("127.0.0.1", 9000));
@ -256,7 +256,7 @@ VOID TEST(ServiceStSRTTest, ReadWrite)
SRTSOCKET srt_client_fd = SRT_INVALID_SOCK; SRTSOCKET srt_client_fd = SRT_INVALID_SOCK;
HELPER_EXPECT_SUCCESS(srs_srt_socket_with_default_option(&srt_client_fd)); HELPER_EXPECT_SUCCESS(srs_srt_socket_with_default_option(&srt_client_fd));
SrsSrtSocket* srt_client_socket = new SrsSrtSocket(_srt_eventloop->get_srt_poller(), srt_client_fd); SrsSrtSocket* srt_client_socket = new SrsSrtSocket(_srt_eventloop->poller(), srt_client_fd);
// Client connect to server // Client connect to server
HELPER_EXPECT_SUCCESS(srt_client_socket->connect(server_ip, server_port)); HELPER_EXPECT_SUCCESS(srt_client_socket->connect(server_ip, server_port));
@ -265,7 +265,7 @@ VOID TEST(ServiceStSRTTest, ReadWrite)
SRTSOCKET srt_server_accepted_fd = SRT_INVALID_SOCK; SRTSOCKET srt_server_accepted_fd = SRT_INVALID_SOCK;
HELPER_EXPECT_SUCCESS(srt_server.accept(&srt_server_accepted_fd)); HELPER_EXPECT_SUCCESS(srt_server.accept(&srt_server_accepted_fd));
EXPECT_NE(srt_server_accepted_fd, SRT_INVALID_SOCK); EXPECT_NE(srt_server_accepted_fd, SRT_INVALID_SOCK);
SrsSrtSocket* srt_server_accepted_socket = new SrsSrtSocket(_srt_eventloop->get_srt_poller(), srt_server_accepted_fd); SrsSrtSocket* srt_server_accepted_socket = new SrsSrtSocket(_srt_eventloop->poller(), srt_server_accepted_fd);
if (true) { if (true) {
std::string content = "Hello, SRS SRT!"; std::string content = "Hello, SRS SRT!";