Removed "worker_threads" and "thread_stack_size" directives.

This commit is contained in:
Ruslan Ermilov
2015-03-26 14:15:17 +03:00
parent 324e389e17
commit 64c5df4b62
5 changed files with 1 additions and 78 deletions

View File

@@ -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 *cycle)
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);
@@ -250,22 +247,6 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
}
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)
{
@@ -1016,8 +997,6 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
{
ngx_tid_t tid;
ngx_process_init(cycle);
ngx_console_init(cycle);
if (ngx_create_signal_events(cycle) != NGX_OK) {

View File

@@ -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;
}

View File

@@ -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_ */