From 5a45fd98c3a997f534fbe137969a8c17b9092050 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 17 Apr 2019 08:38:34 +0800 Subject: [PATCH] Refine get_recv_timeout and is_never_timeout in time unit --- trunk/src/libs/srs_lib_simple_socket.cpp | 8 ++++---- trunk/src/libs/srs_lib_simple_socket.hpp | 4 ++-- trunk/src/protocol/srs_protocol_io.hpp | 4 ++-- trunk/src/protocol/srs_rtmp_stack.cpp | 4 ++-- trunk/src/protocol/srs_rtmp_stack.hpp | 4 ++-- trunk/src/service/srs_service_st.cpp | 8 ++++---- trunk/src/service/srs_service_st.hpp | 8 ++++---- trunk/src/utest/srs_utest_protocol.cpp | 8 ++++---- trunk/src/utest/srs_utest_protocol.hpp | 8 ++++---- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/trunk/src/libs/srs_lib_simple_socket.cpp b/trunk/src/libs/srs_lib_simple_socket.cpp index fb4b0449b..ac3d173f6 100644 --- a/trunk/src/libs/srs_lib_simple_socket.cpp +++ b/trunk/src/libs/srs_lib_simple_socket.cpp @@ -377,16 +377,16 @@ srs_error_t SimpleSocketStream::read(void* buf, size_t size, ssize_t* nread) } // ISrsProtocolReader -void SimpleSocketStream::set_recv_timeout(SrsQueueRecvThread tm) +void SimpleSocketStream::set_recv_timeout(srs_utime_t tm) { srs_assert(io); 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); - 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() @@ -425,7 +425,7 @@ srs_error_t SimpleSocketStream::writev(const iovec *iov, int iov_size, ssize_t* } // ISrsProtocolReadWriter -bool SimpleSocketStream::is_never_timeout(int64_t tm) +bool SimpleSocketStream::is_never_timeout(srs_utime_t tm) { srs_assert(io); return srs_hijack_io_is_never_timeout(io, tm); diff --git a/trunk/src/libs/srs_lib_simple_socket.hpp b/trunk/src/libs/srs_lib_simple_socket.hpp index c86daeada..16685eadf 100644 --- a/trunk/src/libs/srs_lib_simple_socket.hpp +++ b/trunk/src/libs/srs_lib_simple_socket.hpp @@ -55,7 +55,7 @@ public: // ISrsProtocolReader public: 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(); // ISrsProtocolWriter public: @@ -65,7 +65,7 @@ public: virtual srs_error_t writev(const iovec *iov, int iov_size, ssize_t* nwrite); // ISrsProtocolReadWriter 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 write(void* buf, size_t size, ssize_t* nwrite); }; diff --git a/trunk/src/protocol/srs_protocol_io.hpp b/trunk/src/protocol/srs_protocol_io.hpp index 97c33a756..5e003df64 100644 --- a/trunk/src/protocol/srs_protocol_io.hpp +++ b/trunk/src/protocol/srs_protocol_io.hpp @@ -88,7 +88,7 @@ public: // @remark Use SRS_UTIME_NO_TIMEOUT to never timeout. virtual void set_recv_timeout(srs_utime_t tm) = 0; // 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. public: // Read specified size bytes of data @@ -124,7 +124,7 @@ public: // For protocol public: // 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 diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index b9ca8d32a..bcdda9d5e 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -309,7 +309,7 @@ void SrsProtocol::set_recv_timeout(srs_utime_t 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(); } @@ -2215,7 +2215,7 @@ void SrsRtmpServer::set_recv_timeout(srs_utime_t tm) protocol->set_recv_timeout(tm); } -int64_t SrsRtmpServer::get_recv_timeout() +srs_utime_t SrsRtmpServer::get_recv_timeout() { return protocol->get_recv_timeout(); } diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp index 67ba4cdd9..c931625be 100644 --- a/trunk/src/protocol/srs_rtmp_stack.hpp +++ b/trunk/src/protocol/srs_rtmp_stack.hpp @@ -308,7 +308,7 @@ public: * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. */ 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. * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. @@ -808,7 +808,7 @@ public: * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. */ 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. * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. diff --git a/trunk/src/service/srs_service_st.cpp b/trunk/src/service/srs_service_st.cpp index 6f5c8e6d1..2869f13cb 100644 --- a/trunk/src/service/srs_service_st.cpp +++ b/trunk/src/service/srs_service_st.cpp @@ -246,7 +246,7 @@ srs_error_t SrsStSocket::initialize(srs_netfd_t fd) 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; } @@ -256,7 +256,7 @@ void SrsStSocket::set_recv_timeout(srs_utime_t tm) rtm = tm; } -int64_t SrsStSocket::get_recv_timeout() +srs_utime_t SrsStSocket::get_recv_timeout() { return rtm; } @@ -460,7 +460,7 @@ void SrsTcpClient::close() 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); } @@ -470,7 +470,7 @@ void SrsTcpClient::set_recv_timeout(srs_utime_t tm) io->set_recv_timeout(tm); } -int64_t SrsTcpClient::get_recv_timeout() +srs_utime_t SrsTcpClient::get_recv_timeout() { return io->get_recv_timeout(); } diff --git a/trunk/src/service/srs_service_st.hpp b/trunk/src/service/srs_service_st.hpp index 2a4b4e788..8dbf36bb5 100644 --- a/trunk/src/service/srs_service_st.hpp +++ b/trunk/src/service/srs_service_st.hpp @@ -125,9 +125,9 @@ 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(int64_t tm); + virtual bool is_never_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 srs_utime_t get_send_timeout(); virtual int64_t get_recv_bytes(); @@ -188,9 +188,9 @@ private: virtual void close(); // interface ISrsProtocolReadWriter 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 int64_t get_recv_timeout(); + virtual srs_utime_t get_recv_timeout(); virtual void set_send_timeout(srs_utime_t tm); virtual srs_utime_t get_send_timeout(); virtual int64_t get_recv_bytes(); diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index 59f26ebcc..e86ebd98d 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -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; } @@ -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; } @@ -112,7 +112,7 @@ MockBufferIO* MockBufferIO::append(string data) 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; } @@ -147,7 +147,7 @@ void MockBufferIO::set_recv_timeout(srs_utime_t tm) rtm = tm; } -int64_t MockBufferIO::get_recv_timeout() +srs_utime_t MockBufferIO::get_recv_timeout() { return rtm; } diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp index 3dc980ca6..57416a3bb 100644 --- a/trunk/src/utest/srs_utest_protocol.hpp +++ b/trunk/src/utest/srs_utest_protocol.hpp @@ -48,7 +48,7 @@ public: virtual ~MockEmptyIO(); // for protocol public: - virtual bool is_never_timeout(int64_t tm); + 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); @@ -56,7 +56,7 @@ public: // for protocol public: 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(); // for protocol public: @@ -89,7 +89,7 @@ public: virtual MockBufferIO* append(std::string data); // for protocol public: - virtual bool is_never_timeout(int64_t tm); + 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); @@ -97,7 +97,7 @@ public: // for protocol public: 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(); // for protocol public: