zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-10 22:31:08 +02:00
Code Issues Projects Releases Wiki Activity

updated pings to be used only when no i/o occurs on connection

Browse source
This commit is contained in:
Roman Arutyunyan 2012-05-26 17:47:06 +04:00
parent 49382c826b
commit 345a00f9a3
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ngx_rtmp.h
View file

@ -205,7 +205,8 @@ typedef struct {
/* ping */
ngx_event_t ping_evt;
ngx_int_t ping_pending;
unsigned ping_active:1;
unsigned ping_reset:1;
/* input stream 0 (reserved by RTMP spec)
* is used as free chain link */

15
ngx_rtmp_handler.c
View file

@ -133,7 +133,8 @@ ngx_rtmp_reset_ping(ngx_rtmp_session_t *s)
return;
}
s->ping_pending = 0;
s->ping_active = 0;
s->ping_reset = 0;
ngx_add_timer(&s->ping_evt, cscf->ping);
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
@ -153,7 +154,13 @@ ngx_rtmp_ping(ngx_event_t *pev)
cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
if (s->ping_pending) {
/* i/o event has happened; no need to ping */
if (s->ping_reset) {
ngx_rtmp_reset_ping(s);
return;
}
if (s->ping_active) {
ngx_log_error(NGX_LOG_INFO, c->log, 0,
"ping: unresponded");
ngx_rtmp_finalize_session(s);
@ -170,7 +177,7 @@ ngx_rtmp_ping(ngx_event_t *pev)
return;
}
s->ping_pending = 1;
s->ping_active = 1;
ngx_add_timer(pev, cscf->ping_timeout);
}
@ -253,6 +260,7 @@ ngx_rtmp_recv(ngx_event_t *rev)
return;
}
s->ping_reset = 1;
ngx_rtmp_update_bandwidth(&ngx_rtmp_bw_in, n);
b->last += n;
s->in_bytes += n;
@ -510,6 +518,7 @@ ngx_rtmp_send(ngx_event_t *wev)
return;
}
s->ping_reset = 1;
ngx_rtmp_update_bandwidth(&ngx_rtmp_bw_out, n);
s->out_bpos += n;
if (s->out_bpos == s->out_chain->buf->last) {