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

Refine get_recv_timeout and is_never_timeout in time unit

Browse source
This commit is contained in:
winlin 2019-04-17 08:38:34 +08:00
parent d3dc45f357
commit 5a45fd98c3
9 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -377,16 +377,16 @@ srs_error_t SimpleSocketStream::read(void* buf, size_t size, ssize_t* nread)
} }
// ISrsProtocolReader // ISrsProtocolReader
void SimpleSocketStream::set_recv_timeout(SrsQueueRecvThread tm) void SimpleSocketStream::set_recv_timeout(srs_utime_t tm)
{ {
srs_assert(io); srs_assert(io);
srs_hijack_io_set_recv_timeout(io, srsu2ms(tm)); srs_hijack_io_set_recv_timeout(io, srsu2ms(tm));
} }
int64_t SimpleSocketStream::get_recv_timeout() srs_utime_t SimpleSocketStream::get_recv_timeout()
{ {
srs_assert(io); srs_assert(io);
return srs_hijack_io_get_recv_timeout(io); return srs_hijack_io_get_recv_timeout(io) * SRS_UTIME_MILLISECONDS;
} }
int64_t SimpleSocketStream::get_recv_bytes() int64_t SimpleSocketStream::get_recv_bytes()
@ -425,7 +425,7 @@ srs_error_t SimpleSocketStream::writev(const iovec *iov, int iov_size, ssize_t*
} }
// ISrsProtocolReadWriter // ISrsProtocolReadWriter
bool SimpleSocketStream::is_never_timeout(int64_t tm) bool SimpleSocketStream::is_never_timeout(srs_utime_t tm)
{ {
srs_assert(io); srs_assert(io);
return srs_hijack_io_is_never_timeout(io, tm); return srs_hijack_io_is_never_timeout(io, tm);

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

@ -55,7 +55,7 @@ public:
// ISrsProtocolReader // ISrsProtocolReader
public: public:
virtual void set_recv_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);
virtual int64_t get_recv_timeout(); virtual srs_utime_t get_recv_timeout();
virtual int64_t get_recv_bytes(); virtual int64_t get_recv_bytes();
// ISrsProtocolWriter // ISrsProtocolWriter
public: public:
@ -65,7 +65,7 @@ public:
virtual srs_error_t writev(const iovec *iov, int iov_size, ssize_t* nwrite); virtual srs_error_t writev(const iovec *iov, int iov_size, ssize_t* nwrite);
// ISrsProtocolReadWriter // ISrsProtocolReadWriter
public: public:
virtual bool is_never_timeout(int64_t tm); 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 read_fully(void* buf, size_t size, ssize_t* nread);
virtual srs_error_t write(void* buf, size_t size, ssize_t* nwrite); virtual srs_error_t write(void* buf, size_t size, ssize_t* nwrite);
}; };

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

@ -88,7 +88,7 @@ public:
// @remark Use SRS_UTIME_NO_TIMEOUT to never timeout. // @remark Use SRS_UTIME_NO_TIMEOUT to never timeout.
virtual void set_recv_timeout(srs_utime_t tm) = 0; virtual void set_recv_timeout(srs_utime_t tm) = 0;
// Get the timeout in ms for recv bytes from peer. // Get the timeout in ms for recv bytes from peer.
virtual int64_t get_recv_timeout() = 0; virtual srs_utime_t get_recv_timeout() = 0;
// For handshake. // For handshake.
public: public:
// Read specified size bytes of data // Read specified size bytes of data
@ -124,7 +124,7 @@ public:
// For protocol // For protocol
public: public:
// Whether the specified tm in ms is never timeout. // Whether the specified tm in ms is never timeout.
virtual bool is_never_timeout(int64_t tm) = 0; virtual bool is_never_timeout(srs_utime_t tm) = 0;
}; };
#endif #endif

4
trunk/src/protocol/srs_rtmp_stack.cpp
View file

@ -309,7 +309,7 @@ void SrsProtocol::set_recv_timeout(srs_utime_t tm)
return skt->set_recv_timeout(tm); return skt->set_recv_timeout(tm);
} }
int64_t SrsProtocol::get_recv_timeout() srs_utime_t SrsProtocol::get_recv_timeout()
{ {
return skt->get_recv_timeout(); return skt->get_recv_timeout();
} }
@ -2215,7 +2215,7 @@ void SrsRtmpServer::set_recv_timeout(srs_utime_t tm)
protocol->set_recv_timeout(tm); protocol->set_recv_timeout(tm);
} }
int64_t SrsRtmpServer::get_recv_timeout() srs_utime_t SrsRtmpServer::get_recv_timeout()
{ {
return protocol->get_recv_timeout(); return protocol->get_recv_timeout();
} }

4
trunk/src/protocol/srs_rtmp_stack.hpp
View file

@ -308,7 +308,7 @@ public:
* if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
*/ */
virtual void set_recv_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);
virtual int64_t get_recv_timeout(); virtual srs_utime_t get_recv_timeout();
/** /**
* set/get the send timeout in srs_utime_t. * set/get the send timeout in srs_utime_t.
* if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
@ -808,7 +808,7 @@ public:
* if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
*/ */
virtual void set_recv_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);
virtual int64_t get_recv_timeout(); virtual srs_utime_t get_recv_timeout();
/** /**
* set/get the send timeout in srs_utime_t. * set/get the send timeout in srs_utime_t.
* if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.

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

@ -246,7 +246,7 @@ srs_error_t SrsStSocket::initialize(srs_netfd_t fd)
return srs_success; return srs_success;
} }
bool SrsStSocket::is_never_timeout(int64_t tm) bool SrsStSocket::is_never_timeout(srs_utime_t tm)
{ {
return tm == SRS_UTIME_NO_TIMEOUT; return tm == SRS_UTIME_NO_TIMEOUT;
} }
@ -256,7 +256,7 @@ void SrsStSocket::set_recv_timeout(srs_utime_t tm)
rtm = tm; rtm = tm;
} }
int64_t SrsStSocket::get_recv_timeout() srs_utime_t SrsStSocket::get_recv_timeout()
{ {
return rtm; return rtm;
} }
@ -460,7 +460,7 @@ void SrsTcpClient::close()
srs_close_stfd(stfd); srs_close_stfd(stfd);
} }
bool SrsTcpClient::is_never_timeout(int64_t tm) bool SrsTcpClient::is_never_timeout(srs_utime_t tm)
{ {
return io->is_never_timeout(tm); return io->is_never_timeout(tm);
} }
@ -470,7 +470,7 @@ void SrsTcpClient::set_recv_timeout(srs_utime_t tm)
io->set_recv_timeout(tm); io->set_recv_timeout(tm);
} }
int64_t SrsTcpClient::get_recv_timeout() srs_utime_t SrsTcpClient::get_recv_timeout()
{ {
return io->get_recv_timeout(); return io->get_recv_timeout();
} }

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

@ -125,9 +125,9 @@ public:
// Initialize the socket with stfd, user must manage it. // Initialize the socket with stfd, user must manage it.
virtual srs_error_t initialize(srs_netfd_t fd); virtual srs_error_t initialize(srs_netfd_t fd);
public: public:
virtual bool is_never_timeout(int64_t tm); virtual bool is_never_timeout(srs_utime_t tm);
virtual void set_recv_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);
virtual int64_t get_recv_timeout(); virtual srs_utime_t get_recv_timeout();
virtual void set_send_timeout(srs_utime_t tm); virtual void set_send_timeout(srs_utime_t tm);
virtual srs_utime_t get_send_timeout(); virtual srs_utime_t get_send_timeout();
virtual int64_t get_recv_bytes(); virtual int64_t get_recv_bytes();
@ -188,9 +188,9 @@ private:
virtual void close(); virtual void close();
// interface ISrsProtocolReadWriter // interface ISrsProtocolReadWriter
public: public:
virtual bool is_never_timeout(int64_t tm); virtual bool is_never_timeout(srs_utime_t tm);
virtual void set_recv_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);
virtual int64_t get_recv_timeout(); virtual srs_utime_t get_recv_timeout();
virtual void set_send_timeout(srs_utime_t tm); virtual void set_send_timeout(srs_utime_t tm);
virtual srs_utime_t get_send_timeout(); virtual srs_utime_t get_send_timeout();
virtual int64_t get_recv_bytes(); virtual int64_t get_recv_bytes();

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

@ -43,7 +43,7 @@ MockEmptyIO::~MockEmptyIO()
{ {
} }
bool MockEmptyIO::is_never_timeout(int64_t /*tm*/) bool MockEmptyIO::is_never_timeout(srs_utime_t /*tm*/)
{ {
return true; return true;
} }
@ -62,7 +62,7 @@ void MockEmptyIO::set_recv_timeout(srs_utime_t /*tm*/)
{ {
} }
int64_t MockEmptyIO::get_recv_timeout() srs_utime_t MockEmptyIO::get_recv_timeout()
{ {
return -1; return -1;
} }
@ -112,7 +112,7 @@ MockBufferIO* MockBufferIO::append(string data)
return this; return this;
} }
bool MockBufferIO::is_never_timeout(int64_t tm) bool MockBufferIO::is_never_timeout(srs_utime_t tm)
{ {
return tm == SRS_UTIME_NO_TIMEOUT; return tm == SRS_UTIME_NO_TIMEOUT;
} }
@ -147,7 +147,7 @@ void MockBufferIO::set_recv_timeout(srs_utime_t tm)
rtm = tm; rtm = tm;
} }
int64_t MockBufferIO::get_recv_timeout() srs_utime_t MockBufferIO::get_recv_timeout()
{ {
return rtm; return rtm;
} }

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

@ -48,7 +48,7 @@ public:
virtual ~MockEmptyIO(); virtual ~MockEmptyIO();
// for protocol // for protocol
public: public:
virtual bool is_never_timeout(int64_t tm); virtual bool is_never_timeout(srs_utime_t tm);
// for handshake. // for handshake.
public: public:
virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread); virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread);
@ -56,7 +56,7 @@ public:
// for protocol // for protocol
public: public:
virtual void set_recv_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);
virtual int64_t get_recv_timeout(); virtual srs_utime_t get_recv_timeout();
virtual int64_t get_recv_bytes(); virtual int64_t get_recv_bytes();
// for protocol // for protocol
public: public:
@ -89,7 +89,7 @@ public:
virtual MockBufferIO* append(std::string data); virtual MockBufferIO* append(std::string data);
// for protocol // for protocol
public: public:
virtual bool is_never_timeout(int64_t tm); virtual bool is_never_timeout(srs_utime_t tm);
// for handshake. // for handshake.
public: public:
virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread); virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread);
@ -97,7 +97,7 @@ public:
// for protocol // for protocol
public: public:
virtual void set_recv_timeout(srs_utime_t tm); virtual void set_recv_timeout(srs_utime_t tm);
virtual int64_t get_recv_timeout(); virtual srs_utime_t get_recv_timeout();
virtual int64_t get_recv_bytes(); virtual int64_t get_recv_bytes();
// for protocol // for protocol
public: public: