From b2f598dedea9fb3fbd46347cfb6d1e9d035c5043 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 22 Apr 2019 08:07:37 +0800 Subject: [PATCH] Refine SrsStSocket in time unit. --- trunk/src/service/srs_service_st.cpp | 8 ++++---- trunk/src/service/srs_service_st.hpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/trunk/src/service/srs_service_st.cpp b/trunk/src/service/srs_service_st.cpp index d99517c68..debd9422d 100644 --- a/trunk/src/service/srs_service_st.cpp +++ b/trunk/src/service/srs_service_st.cpp @@ -302,7 +302,7 @@ srs_error_t SrsStSocket::read(void* buf, size_t size, ssize_t* nread) if (nb_read <= 0) { // @see https://github.com/ossrs/srs/issues/200 if (nb_read < 0 && errno == ETIME) { - return srs_error_new(ERROR_SOCKET_TIMEOUT, "timeout %d ms", (int)rtm); + return srs_error_new(ERROR_SOCKET_TIMEOUT, "timeout %d ms", srsu2msi(rtm)); } if (nb_read == 0) { @@ -338,7 +338,7 @@ srs_error_t SrsStSocket::read_fully(void* buf, size_t size, ssize_t* nread) if (nb_read != (ssize_t)size) { // @see https://github.com/ossrs/srs/issues/200 if (nb_read < 0 && errno == ETIME) { - return srs_error_new(ERROR_SOCKET_TIMEOUT, "timeout %d ms", (int)rtm); + return srs_error_new(ERROR_SOCKET_TIMEOUT, "timeout %d ms", srsu2msi(rtm)); } if (nb_read >= 0) { @@ -373,7 +373,7 @@ srs_error_t SrsStSocket::write(void* buf, size_t size, ssize_t* nwrite) if (nb_write <= 0) { // @see https://github.com/ossrs/srs/issues/200 if (nb_write < 0 && errno == ETIME) { - return srs_error_new(ERROR_SOCKET_TIMEOUT, "write timeout %d ms", stm); + return srs_error_new(ERROR_SOCKET_TIMEOUT, "write timeout %d ms", srsu2msi(stm)); } return srs_error_new(ERROR_SOCKET_WRITE, "write"); @@ -404,7 +404,7 @@ srs_error_t SrsStSocket::writev(const iovec *iov, int iov_size, ssize_t* nwrite) if (nb_write <= 0) { // @see https://github.com/ossrs/srs/issues/200 if (nb_write < 0 && errno == ETIME) { - return srs_error_new(ERROR_SOCKET_TIMEOUT, "writev timeout %d ms", stm); + return srs_error_new(ERROR_SOCKET_TIMEOUT, "writev timeout %d ms", srsu2msi(stm)); } return srs_error_new(ERROR_SOCKET_WRITE, "writev"); diff --git a/trunk/src/service/srs_service_st.hpp b/trunk/src/service/srs_service_st.hpp index 8dbf36bb5..87d8bde17 100644 --- a/trunk/src/service/srs_service_st.hpp +++ b/trunk/src/service/srs_service_st.hpp @@ -109,10 +109,10 @@ public: class SrsStSocket : public ISrsProtocolReadWriter { private: - // The recv/send timeout in ms. - // @remark Use SRS_UTIME_NO_TIMEOUT for never timeout in ms. - int64_t rtm; - int64_t stm; + // The recv/send timeout in srs_utime_t. + // @remark Use SRS_UTIME_NO_TIMEOUT for never timeout. + srs_utime_t rtm; + srs_utime_t stm; // The recv/send data in bytes int64_t rbytes; int64_t sbytes;