Mercurial > hg > nginx
comparison src/os/unix/ngx_process_cycle.c @ 5820:3377f9459e99
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.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Mon, 01 Sep 2014 18:20:03 +0400 |
parents | f8764e20fcd7 |
children | 1f513d7f1b45 |
comparison
equal
deleted
inserted
replaced
5819:8e7ee4c70a3c | 5820:3377f9459e99 |
---|---|
1212 "all worker threads are joined"); | 1212 "all worker threads are joined"); |
1213 | 1213 |
1214 /* STUB */ | 1214 /* STUB */ |
1215 ngx_done_events(cycle); | 1215 ngx_done_events(cycle); |
1216 ngx_mutex_destroy(ngx_event_timer_mutex); | 1216 ngx_mutex_destroy(ngx_event_timer_mutex); |
1217 ngx_mutex_destroy(ngx_posted_events_mutex); | |
1218 | 1217 |
1219 return; | 1218 return; |
1220 } | 1219 } |
1221 | 1220 |
1222 ngx_sched_yield(); | 1221 ngx_sched_yield(); |
1263 ngx_log_error(NGX_LOG_ALERT, cycle->log, err, | 1262 ngx_log_error(NGX_LOG_ALERT, cycle->log, err, |
1264 ngx_thread_set_tls_n " failed"); | 1263 ngx_thread_set_tls_n " failed"); |
1265 return (ngx_thread_value_t) 1; | 1264 return (ngx_thread_value_t) 1; |
1266 } | 1265 } |
1267 | 1266 |
1268 ngx_mutex_lock(ngx_posted_events_mutex); | |
1269 | |
1270 for ( ;; ) { | 1267 for ( ;; ) { |
1271 thr->state = NGX_THREAD_FREE; | 1268 thr->state = NGX_THREAD_FREE; |
1272 | 1269 |
1270 #if 0 | |
1273 if (ngx_cond_wait(thr->cv, ngx_posted_events_mutex) == NGX_ERROR) { | 1271 if (ngx_cond_wait(thr->cv, ngx_posted_events_mutex) == NGX_ERROR) { |
1274 return (ngx_thread_value_t) 1; | 1272 return (ngx_thread_value_t) 1; |
1275 } | 1273 } |
1274 #endif | |
1276 | 1275 |
1277 if (ngx_terminate) { | 1276 if (ngx_terminate) { |
1278 thr->state = NGX_THREAD_EXIT; | 1277 thr->state = NGX_THREAD_EXIT; |
1279 | |
1280 ngx_mutex_unlock(ngx_posted_events_mutex); | |
1281 | 1278 |
1282 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, | 1279 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, |
1283 "thread " NGX_TID_T_FMT " is done", | 1280 "thread " NGX_TID_T_FMT " is done", |
1284 ngx_thread_self()); | 1281 ngx_thread_self()); |
1285 | 1282 |
1286 return (ngx_thread_value_t) 0; | 1283 return (ngx_thread_value_t) 0; |
1287 } | 1284 } |
1288 | 1285 |
1289 thr->state = NGX_THREAD_BUSY; | 1286 thr->state = NGX_THREAD_BUSY; |
1290 | 1287 |
1288 #if 0 | |
1291 if (ngx_event_thread_process_posted(cycle) == NGX_ERROR) { | 1289 if (ngx_event_thread_process_posted(cycle) == NGX_ERROR) { |
1292 return (ngx_thread_value_t) 1; | 1290 return (ngx_thread_value_t) 1; |
1293 } | 1291 } |
1294 | 1292 |
1295 if (ngx_event_thread_process_posted(cycle) == NGX_ERROR) { | 1293 if (ngx_event_thread_process_posted(cycle) == NGX_ERROR) { |
1296 return (ngx_thread_value_t) 1; | 1294 return (ngx_thread_value_t) 1; |
1297 } | 1295 } |
1296 #endif | |
1298 | 1297 |
1299 if (ngx_process_changes) { | 1298 if (ngx_process_changes) { |
1300 if (ngx_process_changes(cycle, 1) == NGX_ERROR) { | 1299 if (ngx_process_changes(cycle, 1) == NGX_ERROR) { |
1301 return (ngx_thread_value_t) 1; | 1300 return (ngx_thread_value_t) 1; |
1302 } | 1301 } |