details: http://hg.nginx.org/nginx/rev/537259db5af4
branches:
changeset: 6111:537259db5af4
user: Ruslan Ermilov <ru@nginx.com>
date: Thu Mar 26 14:15:17 2015 +0300
description:
Removed "worker_threads" and "thread_stack_size" directives.

diffstat:

src/core/nginx.c | 31 -------------------------------
src/core/ngx_cycle.h | 6 ------
src/os/win32/ngx_process_cycle.c | 21 ---------------------
src/os/win32/ngx_thread.c | 17 +----------------
src/os/win32/ngx_thread.h | 4 ----
5 files changed, 1 insertions(+), 78 deletions(-)

diffs (178 lines):

diff -r 16c51e80128c -r 537259db5af4 src/core/nginx.c
--- a/src/core/nginx.c Thu Mar 26 14:15:15 2015 +0300
+++ b/src/core/nginx.c Thu Mar 26 14:15:17 2015 +0300
@@ -139,24 +139,6 @@ static ngx_command_t ngx_core_commands[
0,
NULL },

-#if (NGX_OLD_THREADS)
-
- { ngx_string("worker_threads"),
- NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_core_conf_t, worker_threads),
- NULL },
-
- { ngx_string("thread_stack_size"),
- NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_size_slot,
- 0,
- offsetof(ngx_core_conf_t, thread_stack_size),
- NULL },
-
-#endif
-
ngx_null_command
};

@@ -971,11 +953,6 @@ ngx_core_module_create_conf(ngx_cycle_t
ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT;
ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT;

-#if (NGX_OLD_THREADS)
- ccf->worker_threads = NGX_CONF_UNSET;
- ccf->thread_stack_size = NGX_CONF_UNSET_SIZE;
-#endif
-
if (ngx_array_init(&ccf->env, cycle->pool, 1, sizeof(ngx_str_t))
!= NGX_OK)
{
@@ -1012,14 +989,6 @@ ngx_core_module_init_conf(ngx_cycle_t *c

#endif

-#if (NGX_OLD_THREADS)
-
- ngx_conf_init_value(ccf->worker_threads, 0);
- ngx_threads_n = ccf->worker_threads;
- ngx_conf_init_size_value(ccf->thread_stack_size, 2 * 1024 * 1024);
-
-#endif
-

if (ccf->pid.len == 0) {
ngx_str_set(&ccf->pid, NGX_PID_PATH);
diff -r 16c51e80128c -r 537259db5af4 src/core/ngx_cycle.h
--- a/src/core/ngx_cycle.h Thu Mar 26 14:15:15 2015 +0300
+++ b/src/core/ngx_cycle.h Thu Mar 26 14:15:17 2015 +0300
@@ -103,12 +103,6 @@ typedef struct {

ngx_array_t env;
char **environment;
-
-#if (NGX_OLD_THREADS)
- ngx_int_t worker_threads;
- size_t thread_stack_size;
-#endif
-
} ngx_core_conf_t;


diff -r 16c51e80128c -r 537259db5af4 src/os/win32/ngx_process_cycle.c
--- a/src/os/win32/ngx_process_cycle.c Thu Mar 26 14:15:15 2015 +0300
+++ b/src/os/win32/ngx_process_cycle.c Thu Mar 26 14:15:17 2015 +0300
@@ -11,7 +11,6 @@
#include <nginx.h>


-static void ngx_process_init(ngx_cycle_t *cycle);
static void ngx_console_init(ngx_cycle_t *cycle);
static int __stdcall ngx_console_handler(u_long type);
static ngx_int_t ngx_create_signal_events(ngx_cycle_t *cycle);
@@ -69,8 +68,6 @@ ngx_master_process_cycle(ngx_cycle_t *cy
ngx_uint_t live;
HANDLE events[MAXIMUM_WAIT_OBJECTS];

- ngx_process_init(cycle);
-
ngx_sprintf((u_char *) ngx_master_process_event_name,
"ngx_master_%s%Z", ngx_unique);

@@ -251,22 +248,6 @@ ngx_master_process_cycle(ngx_cycle_t *cy


static void
-ngx_process_init(ngx_cycle_t *cycle)
-{
- ngx_core_conf_t *ccf;
-
- ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-
- if (ngx_init_threads(ngx_threads_n, ccf->thread_stack_size, cycle)
- != NGX_OK)
- {
- /* fatal */
- exit(2);
- }
-}
-
-
-static void
ngx_console_init(ngx_cycle_t *cycle)
{
ngx_core_conf_t *ccf;
@@ -1016,8 +997,6 @@ ngx_single_process_cycle(ngx_cycle_t *cy
{
ngx_tid_t tid;

- ngx_process_init(cycle);
-
ngx_console_init(cycle);

if (ngx_create_signal_events(cycle) != NGX_OK) {
diff -r 16c51e80128c -r 537259db5af4 src/os/win32/ngx_thread.c
--- a/src/os/win32/ngx_thread.c Thu Mar 26 14:15:15 2015 +0300
+++ b/src/os/win32/ngx_thread.c Thu Mar 26 14:15:17 2015 +0300
@@ -9,12 +9,6 @@
#include <ngx_core.h>


-ngx_int_t ngx_threads_n;
-
-
-static size_t stack_size;
-
-
ngx_err_t
ngx_create_thread(ngx_tid_t *tid,
ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log)
@@ -22,7 +16,7 @@ ngx_create_thread(ngx_tid_t *tid,
u_long id;
ngx_err_t err;

- *tid = CreateThread(NULL, stack_size, func, arg, 0, &id);
+ *tid = CreateThread(NULL, 0, func, arg, 0, &id);

if (*tid != NULL) {
ngx_log_error(NGX_LOG_NOTICE, log, 0,
@@ -34,12 +28,3 @@ ngx_create_thread(ngx_tid_t *tid,
ngx_log_error(NGX_LOG_ALERT, log, err, "CreateThread() failed");
return err;
}
-
-
-ngx_int_t
-ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle)
-{
- stack_size = size;
-
- return NGX_OK;
-}
diff -r 16c51e80128c -r 537259db5af4 src/os/win32/ngx_thread.h
--- a/src/os/win32/ngx_thread.h Thu Mar 26 14:15:15 2015 +0300
+++ b/src/os/win32/ngx_thread.h Thu Mar 26 14:15:17 2015 +0300
@@ -19,13 +19,9 @@ typedef DWORD ngx_thread_value_t;

ngx_err_t ngx_create_thread(ngx_tid_t *tid,
ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log);
-ngx_int_t ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle);

#define ngx_log_tid GetCurrentThreadId()
#define NGX_TID_T_FMT "%ud"


-extern ngx_int_t ngx_threads_n;
-
-
#endif /* _NGX_THREAD_H_INCLUDED_ */

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel