external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 20:31:56 +00:00
Code Issues Releases Wiki Activity

Migrate is_never_timeout to utility.

Browse source
This commit is contained in:
winlin 2019-05-09 08:42:53 +08:00
parent 1b37b90b8f
commit ccba55cdd8
8 changed files with 8 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/libs/srs_lib_simple_socket.cpp
View file

@ -424,13 +424,6 @@ srs_error_t SimpleSocketStream::writev(const iovec *iov, int iov_size, ssize_t*
return srs_success;
}
// Interface ISrsProtocolReadWriter
bool SimpleSocketStream::is_never_timeout(srs_utime_t tm)
{
srs_assert(io);
return srs_hijack_io_is_never_timeout(io, tm);
}
srs_error_t SimpleSocketStream::read_fully(void* buf, size_t size, ssize_t* nread)
{
srs_assert(io);

1
trunk/src/libs/srs_lib_simple_socket.hpp
View file

@ -65,7 +65,6 @@ public:
virtual srs_error_t writev(const iovec *iov, int iov_size, ssize_t* nwrite);
// Interface ISrsProtocolReadWriter
public:
virtual bool is_never_timeout(srs_utime_t tm);
virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread);
virtual srs_error_t write(void* buf, size_t size, ssize_t* nwrite);
};

6
trunk/src/protocol/srs_protocol_io.hpp
View file

@ -54,8 +54,6 @@
* +--+-----------------------------+-+
* | IProtocolReadWriter |
* +----------------------------------+
* | + is_never_timeout() |
* +----------------------------------+
*/
/**
@ -121,10 +119,6 @@ class ISrsProtocolReadWriter : virtual public ISrsProtocolReader, virtual public
public:
ISrsProtocolReadWriter();
virtual ~ISrsProtocolReadWriter();
// For protocol
public:
// Whether the specified tm in srs_utime_t is never timeout.
virtual bool is_never_timeout(srs_utime_t tm) = 0;
};
#endif

15
trunk/src/service/srs_service_st.cpp
View file

@ -362,6 +362,11 @@ ssize_t srs_read(srs_netfd_t stfd, void *buf, size_t nbyte, srs_utime_t timeout)
return st_read((st_netfd_t)stfd, buf, nbyte, (st_utime_t)timeout);
}
bool srs_is_never_timeout(srs_utime_t tm)
{
return tm == SRS_UTIME_NO_TIMEOUT;
}
SrsStSocket::SrsStSocket()
{
stfd = NULL;
@ -379,11 +384,6 @@ srs_error_t SrsStSocket::initialize(srs_netfd_t fd)
return srs_success;
}
bool SrsStSocket::is_never_timeout(srs_utime_t tm)
{
return tm == SRS_UTIME_NO_TIMEOUT;
}
void SrsStSocket::set_recv_timeout(srs_utime_t tm)
{
rtm = tm;
@ -593,11 +593,6 @@ void SrsTcpClient::close()
srs_close_stfd(stfd);
}
bool SrsTcpClient::is_never_timeout(srs_utime_t tm)
{
return io->is_never_timeout(tm);
}
void SrsTcpClient::set_recv_timeout(srs_utime_t tm)
{
io->set_recv_timeout(tm);

2
trunk/src/service/srs_service_st.hpp
View file

@ -130,7 +130,6 @@ public:
// Initialize the socket with stfd, user must manage it.
virtual srs_error_t initialize(srs_netfd_t fd);
public:
virtual bool is_never_timeout(srs_utime_t tm);
virtual void set_recv_timeout(srs_utime_t tm);
virtual srs_utime_t get_recv_timeout();
virtual void set_send_timeout(srs_utime_t tm);
@ -181,7 +180,6 @@ private:
virtual void close();
// Interface ISrsProtocolReadWriter
public:
virtual bool is_never_timeout(srs_utime_t tm);
virtual void set_recv_timeout(srs_utime_t tm);
virtual srs_utime_t get_recv_timeout();
virtual void set_send_timeout(srs_utime_t tm);

10
trunk/src/utest/srs_utest_protocol.cpp
View file

@ -43,11 +43,6 @@ MockEmptyIO::~MockEmptyIO()
{
}
bool MockEmptyIO::is_never_timeout(srs_utime_t /*tm*/)
{
return true;
}
srs_error_t MockEmptyIO::read_fully(void* /*buf*/, size_t /*size*/, ssize_t* /*nread*/)
{
return srs_success;
@ -112,11 +107,6 @@ MockBufferIO* MockBufferIO::append(string data)
return this;
}
bool MockBufferIO::is_never_timeout(srs_utime_t tm)
{
return tm == SRS_UTIME_NO_TIMEOUT;
}
srs_error_t MockBufferIO::read_fully(void* buf, size_t size, ssize_t* nread)
{
if (in_buffer.length() < (int)size) {

6
trunk/src/utest/srs_utest_protocol.hpp
View file

@ -46,9 +46,6 @@ class MockEmptyIO : public ISrsProtocolReadWriter
public:
MockEmptyIO();
virtual ~MockEmptyIO();
// for protocol
public:
virtual bool is_never_timeout(srs_utime_t tm);
// for handshake.
public:
virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread);
@ -87,9 +84,6 @@ public:
virtual ~MockBufferIO();
public:
virtual MockBufferIO* append(std::string data);
// for protocol
public:
virtual bool is_never_timeout(srs_utime_t tm);
// for handshake.
public:
virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread);

3
trunk/src/utest/srs_utest_service.cpp
View file

@ -39,6 +39,9 @@ VOID TEST(ServiceTimeTest, TimeUnit)
EXPECT_EQ(1000*1000, SRS_UTIME_SECONDS);
EXPECT_EQ(60*1000*1000, SRS_UTIME_MINUTES);
EXPECT_EQ(3600*1000*1000LL, SRS_UTIME_HOURS);
EXPECT_TRUE(srs_is_never_timeout(SRS_UTIME_NO_TIMEOUT));
EXPECT_FALSE(srs_is_never_timeout(0));
}
#define MOCK_LISTEN_HOST "127.0.0.1"