diff options
author | Igor Sysoev <igor@sysoev.ru> | 2003-07-01 19:00:03 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2003-07-01 19:00:03 +0400 |
commit | 6abfde65573d145325a908417d5301d4766c6af8 (patch) | |
tree | a1ac279536b8830a41dcbde437af0ac054f3050b /src/event | |
parent | f5e97c5cbe063246087f11f36fa04c48e8dba10a (diff) |
nginx-0.0.1-2003-07-01-19:00:03 import
Diffstat (limited to 'src/event')
-rw-r--r-- | src/event/modules/ngx_poll_module.c | 2 | ||||
-rw-r--r-- | src/event/modules/ngx_select_module.c | 4 | ||||
-rw-r--r-- | src/event/ngx_event.c | 16 | ||||
-rw-r--r-- | src/event/ngx_event.h | 2 | ||||
-rw-r--r-- | src/event/ngx_event_accept.c | 2 | ||||
-rw-r--r-- | src/event/ngx_event_timer.c | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c index a49afea97..b03ed1745 100644 --- a/src/event/modules/ngx_poll_module.c +++ b/src/event/modules/ngx_poll_module.c @@ -58,7 +58,7 @@ static int ngx_poll_init(ngx_log_t *log) { ngx_event_conf_t *ecf; - ecf = ngx_event_get_conf(ngx_event_module); + ecf = ngx_event_get_conf(ngx_event_core_module); ngx_test_null(event_list, ngx_alloc(sizeof(struct pollfd) * ecf->connections, log), diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index 96a5d678e..a55be3034 100644 --- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c @@ -70,7 +70,7 @@ static int ngx_select_init(ngx_log_t *log) { ngx_event_conf_t *ecf; - ecf = ngx_event_get_conf(ngx_event_module); + ecf = ngx_event_get_conf(ngx_event_core_module); FD_ZERO(&master_read_fd_set); FD_ZERO(&master_write_fd_set); @@ -376,7 +376,7 @@ static char *ngx_select_init_conf(ngx_pool_t *pool, void *conf) { ngx_event_conf_t *ecf; - ecf = ngx_event_get_conf(ngx_event_module); + ecf = ngx_event_get_conf(ngx_event_core_module); /* the default FD_SETSIZE is 1024U in FreeBSD 5.x */ diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index f6d10cc4b..263d88e36 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -65,9 +65,9 @@ ngx_module_t ngx_events_module = { }; -static ngx_str_t event_name = ngx_string("event"); +static ngx_str_t event_core_name = ngx_string("event_core"); -static ngx_command_t ngx_event_commands[] = { +static ngx_command_t ngx_event_core_commands[] = { {ngx_string("connections"), NGX_EVENT_CONF|NGX_CONF_TAKE1, @@ -94,8 +94,8 @@ static ngx_command_t ngx_event_commands[] = { }; -ngx_event_module_t ngx_event_module_ctx = { - &event_name, +ngx_event_module_t ngx_event_core_module_ctx = { + &event_core_name, ngx_event_create_conf, /* create configuration */ ngx_event_init_conf, /* init configuration */ @@ -103,10 +103,10 @@ ngx_event_module_t ngx_event_module_ctx = { }; -ngx_module_t ngx_event_module = { +ngx_module_t ngx_event_core_module = { NGX_MODULE, - &ngx_event_module_ctx, /* module context */ - ngx_event_commands, /* module directives */ + &ngx_event_core_module_ctx, /* module context */ + ngx_event_core_commands, /* module directives */ NGX_EVENT_MODULE, /* module type */ NULL /* init module */ }; @@ -125,7 +125,7 @@ int ngx_pre_thread(ngx_array_t *ls, ngx_pool_t *pool, ngx_log_t *log) ngx_iocp_conf_t *iocpcf; #endif - ecf = ngx_event_get_conf(ngx_event_module); + ecf = ngx_event_get_conf(ngx_event_core_module); ngx_log_debug(log, "CONN: %d" _ ecf->connections); ngx_log_debug(log, "TYPE: %d" _ ecf->use); diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h index 9b6dd2399..8ae2b5385 100644 --- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -345,7 +345,7 @@ typedef struct { extern ngx_module_t ngx_events_module; -extern ngx_module_t ngx_event_module; +extern ngx_module_t ngx_event_core_module; #define ngx_event_get_conf(module) \ diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c index 7e877617f..2d2eed4f4 100644 --- a/src/event/ngx_event_accept.c +++ b/src/event/ngx_event_accept.c @@ -17,7 +17,7 @@ void ngx_event_accept(ngx_event_t *ev) ngx_connection_t *c, *ls; ngx_event_conf_t *ecf; - ecf = ngx_event_get_conf(ngx_event_module); + ecf = ngx_event_get_conf(ngx_event_core_module); ls = ev->data; diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index a49cc9260..9ca3fe504 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -15,7 +15,7 @@ int ngx_event_timer_init(ngx_log_t *log) ngx_event_t *new_queue; ngx_event_conf_t *ecf; - ecf = ngx_event_get_conf(ngx_event_module); + ecf = ngx_event_get_conf(ngx_event_core_module); if (ngx_timer_queue_num < ecf->timer_queues) { ngx_test_null(new_queue, |