diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2014-09-01 18:20:03 +0400 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2014-09-01 18:20:03 +0400 |
| commit | 2a81e0556611188a1b9b3e1240a06928dcebc1a2 (patch) | |
| tree | 59f0296dff877b77b7f22c0c5955f31014d3c164 /src/os/unix/ngx_process_cycle.c | |
| parent | 3ca3f609cb7d9bc5576bf9fb77998cf110b688cb (diff) | |
| download | nginx-2a81e0556611188a1b9b3e1240a06928dcebc1a2.tar.gz nginx-2a81e0556611188a1b9b3e1240a06928dcebc1a2.zip | |
Events: removed broken thread support from posted events.
It's mostly dead code. And the idea of thread support for this task has
been deprecated.
Diffstat (limited to 'src/os/unix/ngx_process_cycle.c')
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 3205aa555..6c84ba8bd 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -1214,7 +1214,6 @@ ngx_wakeup_worker_threads(ngx_cycle_t *cycle) /* STUB */ ngx_done_events(cycle); ngx_mutex_destroy(ngx_event_timer_mutex); - ngx_mutex_destroy(ngx_posted_events_mutex); return; } @@ -1265,20 +1264,18 @@ ngx_worker_thread_cycle(void *data) return (ngx_thread_value_t) 1; } - ngx_mutex_lock(ngx_posted_events_mutex); - for ( ;; ) { thr->state = NGX_THREAD_FREE; +#if 0 if (ngx_cond_wait(thr->cv, ngx_posted_events_mutex) == NGX_ERROR) { return (ngx_thread_value_t) 1; } +#endif if (ngx_terminate) { thr->state = NGX_THREAD_EXIT; - ngx_mutex_unlock(ngx_posted_events_mutex); - ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, "thread " NGX_TID_T_FMT " is done", ngx_thread_self()); @@ -1288,6 +1285,7 @@ ngx_worker_thread_cycle(void *data) thr->state = NGX_THREAD_BUSY; +#if 0 if (ngx_event_thread_process_posted(cycle) == NGX_ERROR) { return (ngx_thread_value_t) 1; } @@ -1295,6 +1293,7 @@ ngx_worker_thread_cycle(void *data) if (ngx_event_thread_process_posted(cycle) == NGX_ERROR) { return (ngx_thread_value_t) 1; } +#endif if (ngx_process_changes) { if (ngx_process_changes(cycle, 1) == NGX_ERROR) { |