From 83ba5ed2ecc1ca06971639e4e2c7325aaa8e5101 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Wed, 4 Mar 2015 18:26:25 +0300 Subject: Renamed NGX_THREADS to NGX_OLD_THREADS because of deprecation. It's mostly dead code and the original idea of worker threads has been rejected. --- src/event/modules/ngx_kqueue_module.c | 6 +++--- src/event/modules/ngx_poll_module.c | 2 +- src/event/modules/ngx_select_module.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/event/modules') diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c index 9e7a1bdb6..17214c5fb 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -48,7 +48,7 @@ static struct kevent *change_list, *change_list0, *change_list1; static struct kevent *event_list; static ngx_uint_t max_changes, nchanges, nevents; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) static ngx_mutex_t *list_mutex; static ngx_mutex_t *kevent_mutex; #endif @@ -133,7 +133,7 @@ ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer) return NGX_ERROR; } -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) list_mutex = ngx_mutex_init(cycle->log, 0); if (list_mutex == NULL) { @@ -257,7 +257,7 @@ ngx_kqueue_done(ngx_cycle_t *cycle) ngx_kqueue = -1; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_mutex_destroy(kevent_mutex); ngx_mutex_destroy(list_mutex); #endif diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c index bad1a7d2a..3617afb95 100644 --- a/src/event/modules/ngx_poll_module.c +++ b/src/event/modules/ngx_poll_module.c @@ -413,7 +413,7 @@ ngx_poll_init_conf(ngx_cycle_t *cycle, void *conf) return NGX_CONF_OK; } -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "poll() is not supported in the threaded mode"); diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index fa2d55ae2..e83744431 100644 --- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c @@ -419,7 +419,7 @@ ngx_select_init_conf(ngx_cycle_t *cycle, void *conf) return NGX_CONF_ERROR; } -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "select() is not supported in the threaded mode"); -- cgit