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

removed rtmp init event queue

Browse source
This commit is contained in:
Roman Arutyunyan 2013-02-05 17:52:06 +04:00
parent d59438d92d
commit 6d5986aa59
5 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ngx_rtmp.c
View file

@ -32,9 +32,6 @@ static char * ngx_rtmp_merge_applications(ngx_conf_t *cf,
ngx_uint_t ngx_rtmp_max_module;
ngx_thread_volatile ngx_event_t *ngx_rtmp_init_process_events;
static ngx_command_t ngx_rtmp_commands[] = {
{ ngx_string("rtmp"),

3
ngx_rtmp.h
View file

@ -571,9 +571,6 @@ ngx_rtmp_is_codec_header(ngx_chain_t *in)
}
extern ngx_thread_volatile ngx_event_t *ngx_rtmp_init_process_events;
extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_out;
extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in;

2
ngx_rtmp_exec_module.c
View file

@ -335,7 +335,7 @@ ngx_rtmp_exec_init_process(ngx_cycle_t *cycle)
e->respawn_evt.data = e;
e->respawn_evt.log = e->log;
e->respawn_evt.handler = ngx_rtmp_exec_respawn;
ngx_post_event((&e->respawn_evt), &ngx_rtmp_init_process_events);
ngx_post_event((&e->respawn_evt), &ngx_posted_events);
}
return NGX_OK;

2
ngx_rtmp_relay_module.c
View file

@ -1592,7 +1592,7 @@ ngx_rtmp_relay_init_process(ngx_cycle_t *cycle)
rs->cctx = *lst->ctx;
rs->cctx.app_conf = cacf->app_conf;
ngx_post_event(event, &ngx_rtmp_init_process_events);
ngx_post_event(event, &ngx_posted_events);
}
}
}

18
ngx_rtmp_stat_module.c
View file

@ -15,7 +15,6 @@ static ngx_int_t ngx_rtmp_stat_postconfiguration(ngx_conf_t *cf);
static void * ngx_rtmp_stat_create_loc_conf(ngx_conf_t *cf);
static char * ngx_rtmp_stat_merge_loc_conf(ngx_conf_t *cf,
void *parent, void *child);
static ngx_int_t ngx_rtmp_stat_init_process(ngx_cycle_t *cycle);
static time_t start_time;
@ -88,7 +87,7 @@ ngx_module_t ngx_rtmp_stat_module = {
NGX_HTTP_MODULE, /* module type */
NULL, /* init master */
NULL, /* init module */
ngx_rtmp_stat_init_process, /* init process */
NULL, /* init process */
NULL, /* init thread */
NULL, /* exit thread */
NULL, /* exit process */
@ -97,21 +96,6 @@ ngx_module_t ngx_rtmp_stat_module = {
};
static ngx_int_t
ngx_rtmp_stat_init_process(ngx_cycle_t *cycle)
{
/* Run posted events;
* HTTP module's init_process is called after event module's
* init_process. That makes is possible to use event-related
* calls. RTMP modules are core modules with early
* initializers */
ngx_event_process_posted(cycle, &ngx_rtmp_init_process_events);
return NGX_OK;
}
#define NGX_RTMP_STAT_BUFSIZE 256