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

refine the recv buffer for mr.

Browse source
This commit is contained in:
winlin 2014-12-04 21:50:23 +08:00
parent 09101b8d5e
commit 76af04c55d
2 changed files with 58 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
trunk/src/app/srs_app_recv_thread.cpp
View file

@ -300,8 +300,14 @@ void SrsPublishRecvThread::on_thread_start()
// for the main thread never send message. // for the main thread never send message.
#ifdef SRS_PERF_MERGED_READ #ifdef SRS_PERF_MERGED_READ
// for mr. if (mr) {
update_buffer(mr, mr_sleep); // set underlayer buffer size
set_socket_buffer(mr_sleep);
// disable the merge read
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241
rtmp->set_merge_read(true, this);
}
#endif #endif
} }
@ -315,9 +321,11 @@ void SrsPublishRecvThread::on_thread_stop()
st_cond_signal(error); st_cond_signal(error);
#ifdef SRS_PERF_MERGED_READ #ifdef SRS_PERF_MERGED_READ
// disable the merge read if (mr) {
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241 // disable the merge read
rtmp->set_merge_read(false, NULL); // @see https://github.com/winlinvip/simple-rtmp-server/issues/241
rtmp->set_merge_read(false, NULL);
}
#endif #endif
} }
@ -383,41 +391,24 @@ int SrsPublishRecvThread::on_reload_vhost_mr(string vhost)
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241 // @see https://github.com/winlinvip/simple-rtmp-server/issues/241
bool mr_enabled = _srs_config->get_mr_enabled(req->vhost); bool mr_enabled = _srs_config->get_mr_enabled(req->vhost);
int sleep_ms = _srs_config->get_mr_sleep_ms(req->vhost); int sleep_ms = _srs_config->get_mr_sleep_ms(req->vhost);
update_buffer(mr_enabled, sleep_ms);
return ret; // update buffer when sleep ms changed.
} if (mr_sleep != sleep_ms) {
set_socket_buffer(sleep_ms);
void SrsPublishRecvThread::update_buffer(bool mr_enabled, int sleep_ms) }
{
// TODO: FIXME: refine it.
#ifdef SRS_PERF_MERGED_READ #ifdef SRS_PERF_MERGED_READ
// update the buffer. // mr enabled=>disabled
if (true) { if (mr && !mr_enabled) {
// the underlayer api will set to SRS_MR_SOCKET_BUFFER bytes. // disable the merge read
// 4KB=4096, 8KB=8192, 16KB=16384, 32KB=32768, 64KB=65536, // @see https://github.com/winlinvip/simple-rtmp-server/issues/241
// 128KB=131072, 256KB=262144, 512KB=524288 rtmp->set_merge_read(false, NULL);
// the buffer should set to SRS_MR_MAX_SLEEP_MS*kbps/8, }
// for example, your system delivery stream in 1000kbps, // mr disabled=>enabled
// sleep 800ms for small bytes, the buffer should set to: if (!mr && mr_enabled) {
// 800*1000/8=100000B(about 128KB). // enable the merge read
// 2000*3000/8=750000B(about 732KB). // @see https://github.com/winlinvip/simple-rtmp-server/issues/241
int kbps = 3000; rtmp->set_merge_read(true, this);
int socket_buffer_size = mr_sleep * kbps / 8;
// socket recv buffer, system will double it.
int nb_rbuf = socket_buffer_size / 2;
socklen_t sock_buf_size = sizeof(int);
if (setsockopt(mr_fd, SOL_SOCKET, SO_RCVBUF, &nb_rbuf, sock_buf_size) < 0) {
srs_warn("set sock SO_RCVBUF=%d failed.", nb_rbuf);
}
getsockopt(mr_fd, SOL_SOCKET, SO_RCVBUF, &nb_rbuf, &sock_buf_size);
srs_trace("merged read sockbuf=%d, actual=%d, sleep %d when nread<=%d",
socket_buffer_size, nb_rbuf, mr_sleep, SRS_MR_SMALL_BYTES);
rtmp->set_recv_buffer(nb_rbuf);
} }
#endif #endif
@ -425,17 +416,33 @@ void SrsPublishRecvThread::update_buffer(bool mr_enabled, int sleep_ms)
mr = mr_enabled; mr = mr_enabled;
mr_sleep = sleep_ms; mr_sleep = sleep_ms;
#ifdef SRS_PERF_MERGED_READ return ret;
// apply new state. }
if (mr) {
// enable the merge read void SrsPublishRecvThread::set_socket_buffer(int sleep_ms)
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241 {
rtmp->set_merge_read(true, this); // the underlayer api will set to SRS_MR_SOCKET_BUFFER bytes.
} else { // 4KB=4096, 8KB=8192, 16KB=16384, 32KB=32768, 64KB=65536,
// disable the merge read // 128KB=131072, 256KB=262144, 512KB=524288
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241 // the buffer should set to SRS_MR_MAX_SLEEP_MS*kbps/8,
rtmp->set_merge_read(false, NULL); // for example, your system delivery stream in 1000kbps,
} // sleep 800ms for small bytes, the buffer should set to:
#endif // 800*1000/8=100000B(about 128KB).
// 2000*3000/8=750000B(about 732KB).
int kbps = 3000;
int socket_buffer_size = sleep_ms * kbps / 8;
// socket recv buffer, system will double it.
int nb_rbuf = socket_buffer_size / 2;
socklen_t sock_buf_size = sizeof(int);
if (setsockopt(mr_fd, SOL_SOCKET, SO_RCVBUF, &nb_rbuf, sock_buf_size) < 0) {
srs_warn("set sock SO_RCVBUF=%d failed.", nb_rbuf);
}
getsockopt(mr_fd, SOL_SOCKET, SO_RCVBUF, &nb_rbuf, &sock_buf_size);
srs_trace("merged read sockbuf=%d, actual=%d, sleep %d when nread<=%d",
socket_buffer_size, nb_rbuf, sleep_ms, SRS_MR_SMALL_BYTES);
rtmp->set_recv_buffer(nb_rbuf);
} }

2
trunk/src/app/srs_app_recv_thread.hpp
View file

@ -194,7 +194,7 @@ public:
public: public:
virtual int on_reload_vhost_mr(std::string vhost); virtual int on_reload_vhost_mr(std::string vhost);
private: private:
virtual void update_buffer(bool mr_enabled, int sleep_ms); virtual void set_socket_buffer(int sleep_ms);
}; };
#endif #endif