From 38bbf6b111af7d05e377c1c760dee02ba72ebc63 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 17 Apr 2019 08:23:15 +0800 Subject: [PATCH] Refine get_send_timeout in time unit --- trunk/src/libs/srs_lib_simple_socket.cpp | 4 +- trunk/src/libs/srs_lib_simple_socket.hpp | 2 +- trunk/src/protocol/srs_protocol_io.hpp | 54 +++++++++--------------- trunk/src/protocol/srs_rtmp_stack.cpp | 4 +- trunk/src/protocol/srs_rtmp_stack.hpp | 4 +- trunk/src/service/srs_service_st.cpp | 4 +- trunk/src/service/srs_service_st.hpp | 4 +- trunk/src/utest/srs_utest_protocol.cpp | 4 +- trunk/src/utest/srs_utest_protocol.hpp | 4 +- 9 files changed, 34 insertions(+), 50 deletions(-) diff --git a/trunk/src/libs/srs_lib_simple_socket.cpp b/trunk/src/libs/srs_lib_simple_socket.cpp index fd9d85e57..a810629be 100644 --- a/trunk/src/libs/srs_lib_simple_socket.cpp +++ b/trunk/src/libs/srs_lib_simple_socket.cpp @@ -402,10 +402,10 @@ void SimpleSocketStream::set_send_timeout(srs_utime_t tm) srs_hijack_io_set_send_timeout(io, srsu2ms(tm)); } -int64_t SimpleSocketStream::get_send_timeout() +srs_utime_t SimpleSocketStream::get_send_timeout() { srs_assert(io); - return srs_hijack_io_get_send_timeout(io); + return srs_hijack_io_get_send_timeout(io) * SRS_UTIME_MILLISECONDS; } int64_t SimpleSocketStream::get_send_bytes() diff --git a/trunk/src/libs/srs_lib_simple_socket.hpp b/trunk/src/libs/srs_lib_simple_socket.hpp index 594937013..c5a63bedf 100644 --- a/trunk/src/libs/srs_lib_simple_socket.hpp +++ b/trunk/src/libs/srs_lib_simple_socket.hpp @@ -60,7 +60,7 @@ public: // ISrsProtocolWriter public: virtual void set_send_timeout(srs_utime_t tm); - virtual int64_t get_send_timeout(); + virtual srs_utime_t get_send_timeout(); virtual int64_t get_send_bytes(); virtual srs_error_t writev(const iovec *iov, int iov_size, ssize_t* nwrite); // ISrsProtocolReadWriter diff --git a/trunk/src/protocol/srs_protocol_io.hpp b/trunk/src/protocol/srs_protocol_io.hpp index 4de479480..50a85dc6e 100644 --- a/trunk/src/protocol/srs_protocol_io.hpp +++ b/trunk/src/protocol/srs_protocol_io.hpp @@ -29,7 +29,7 @@ #include /** - * the system io reader/writer architecture: + * The system io reader/writer architecture: * +---------------+ +---------------+ * | IStreamWriter | | IVectorWriter | * +---------------+ +---------------+ @@ -59,22 +59,18 @@ */ /** - * get the statistic of channel. + * Get the statistic of channel. */ class ISrsProtocolStatistic { public: ISrsProtocolStatistic(); virtual ~ISrsProtocolStatistic(); -// for protocol +// For protocol public: - /** - * get the total recv bytes over underlay fd. - */ + // Get the total recv bytes over underlay fd. virtual int64_t get_recv_bytes() = 0; - /** - * get the total send bytes over underlay fd. - */ + // Get the total send bytes over underlay fd. virtual int64_t get_send_bytes() = 0; }; @@ -88,21 +84,15 @@ public: virtual ~ISrsProtocolReader(); // for protocol public: - /** - * Set the timeout tm in ms for recv bytes from peer. - * @remark Use SRS_UTIME_NO_TIMEOUT to never timeout. - */ + // Set the timeout tm in ms for recv bytes from peer. + // @remark Use SRS_UTIME_NO_TIMEOUT to never timeout. virtual void set_recv_timeout(int64_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; -// for handshake. +// For handshake. public: - /** - * read specified size bytes of data - * @param nread, the actually read size, NULL to ignore. - */ + // Read specified size bytes of data + // @param nread, the actually read size, NULL to ignore. virtual srs_error_t read_fully(void* buf, size_t size, ssize_t* nread) = 0; }; @@ -114,32 +104,26 @@ class ISrsProtocolWriter : virtual public ISrsWriter, virtual public ISrsProtoco public: ISrsProtocolWriter(); virtual ~ISrsProtocolWriter(); -// for protocol +// For protocol public: - /** - * Set the timeout tm in srs_utime_t for send bytes to peer. - * @remark Use SRS_UTIME_NO_TIMEOUT to never timeout. - */ + // Set the timeout tm in srs_utime_t for send bytes to peer. + // @remark Use SRS_UTIME_NO_TIMEOUT to never timeout. virtual void set_send_timeout(srs_utime_t tm) = 0; - /** - * Get the timeout in ms for send bytes to peer. - */ - virtual int64_t get_send_timeout() = 0; + // Get the timeout in srs_utime_t for send bytes to peer. + virtual srs_utime_t get_send_timeout() = 0; }; /** - * the reader and writer. + * The reader and writer. */ class ISrsProtocolReadWriter : virtual public ISrsProtocolReader, virtual public ISrsProtocolWriter { public: ISrsProtocolReadWriter(); virtual ~ISrsProtocolReadWriter(); -// for protocol +// For protocol 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; }; diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index 61fc93cab..928b3afa5 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -319,7 +319,7 @@ void SrsProtocol::set_send_timeout(srs_utime_t tm) return skt->set_send_timeout(tm); } -int64_t SrsProtocol::get_send_timeout() +srs_utime_t SrsProtocol::get_send_timeout() { return skt->get_send_timeout(); } @@ -2225,7 +2225,7 @@ void SrsRtmpServer::set_send_timeout(srs_utime_t tm) protocol->set_send_timeout(tm); } -int64_t SrsRtmpServer::get_send_timeout() +srs_utime_t SrsRtmpServer::get_send_timeout() { return protocol->get_send_timeout(); } diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp index 805172d0f..ec00bf9df 100644 --- a/trunk/src/protocol/srs_rtmp_stack.hpp +++ b/trunk/src/protocol/srs_rtmp_stack.hpp @@ -315,7 +315,7 @@ public: * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. */ virtual void set_send_timeout(srs_utime_t tm); - virtual int64_t get_send_timeout(); + virtual srs_utime_t get_send_timeout(); /** * get recv/send bytes. */ @@ -815,7 +815,7 @@ public: * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. */ virtual void set_send_timeout(srs_utime_t tm); - virtual int64_t get_send_timeout(); + virtual srs_utime_t get_send_timeout(); /** * get recv/send bytes. */ diff --git a/trunk/src/service/srs_service_st.cpp b/trunk/src/service/srs_service_st.cpp index cea5d3587..717bf7803 100644 --- a/trunk/src/service/srs_service_st.cpp +++ b/trunk/src/service/srs_service_st.cpp @@ -266,7 +266,7 @@ void SrsStSocket::set_send_timeout(srs_utime_t tm) stm = tm; } -int64_t SrsStSocket::get_send_timeout() +srs_utime_t SrsStSocket::get_send_timeout() { return stm; } @@ -480,7 +480,7 @@ void SrsTcpClient::set_send_timeout(srs_utime_t tm) io->set_send_timeout(tm); } -int64_t SrsTcpClient::get_send_timeout() +srs_utime_t SrsTcpClient::get_send_timeout() { return io->get_send_timeout(); } diff --git a/trunk/src/service/srs_service_st.hpp b/trunk/src/service/srs_service_st.hpp index 893bac188..f1174bdc9 100644 --- a/trunk/src/service/srs_service_st.hpp +++ b/trunk/src/service/srs_service_st.hpp @@ -129,7 +129,7 @@ public: virtual void set_recv_timeout(int64_t tm); virtual int64_t get_recv_timeout(); virtual void set_send_timeout(srs_utime_t tm); - virtual int64_t get_send_timeout(); + virtual srs_utime_t get_send_timeout(); virtual int64_t get_recv_bytes(); virtual int64_t get_send_bytes(); public: @@ -192,7 +192,7 @@ public: virtual void set_recv_timeout(int64_t tm); virtual int64_t get_recv_timeout(); virtual void set_send_timeout(srs_utime_t tm); - virtual int64_t get_send_timeout(); + virtual srs_utime_t get_send_timeout(); virtual int64_t get_recv_bytes(); virtual int64_t get_send_bytes(); virtual srs_error_t read(void* buf, size_t size, ssize_t* nread); diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index 37ab42e23..ad6187b3e 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -76,7 +76,7 @@ void MockEmptyIO::set_send_timeout(srs_utime_t /*tm*/) { } -int64_t MockEmptyIO::get_send_timeout() +srs_utime_t MockEmptyIO::get_send_timeout() { return 0; } @@ -162,7 +162,7 @@ void MockBufferIO::set_send_timeout(srs_utime_t tm) stm = tm; } -int64_t MockBufferIO::get_send_timeout() +srs_utime_t MockBufferIO::get_send_timeout() { return stm; } diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp index 77fe9e6ea..13f731624 100644 --- a/trunk/src/utest/srs_utest_protocol.hpp +++ b/trunk/src/utest/srs_utest_protocol.hpp @@ -61,7 +61,7 @@ public: // for protocol public: virtual void set_send_timeout(srs_utime_t tm); - virtual int64_t get_send_timeout(); + virtual srs_utime_t get_send_timeout(); virtual int64_t get_send_bytes(); virtual srs_error_t writev(const iovec *iov, int iov_size, ssize_t* nwrite); // for protocol/amf0/msg-codec @@ -102,7 +102,7 @@ public: // for protocol public: virtual void set_send_timeout(srs_utime_t tm); - virtual int64_t get_send_timeout(); + virtual srs_utime_t get_send_timeout(); virtual int64_t get_send_bytes(); virtual srs_error_t writev(const iovec *iov, int iov_size, ssize_t* nwrite); // for protocol/amf0/msg-codec