external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

Refine get_send_timeout in time unit

Browse source
This commit is contained in:
winlin 2019-04-17 08:23:15 +08:00
parent f4bee37e76
commit 38bbf6b111
9 changed files with 34 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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()

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

@ -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

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

@ -29,7 +29,7 @@
#include <srs_kernel_io.hpp>
/**
* 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;
};

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

@ -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();
}

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

@ -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.
*/

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

@ -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();
}

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

@ -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);

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

@ -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;
}

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

@ -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