Mercurial > hg > nginx-quic

comparison src/event/modules/ngx_poll_module.c @ 5820:3377f9459e99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 92490a725fef
children 3f5f0ab59b35
comparison
equal deleted inserted replaced
5819:8e7ee4c70a3c 5820:3377f9459e99
295 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, 295 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
296 "poll() returned no events without timeout"); 296 "poll() returned no events without timeout");
297 return NGX_ERROR; 297 return NGX_ERROR;
298 } 298 }
299 299
300 ngx_mutex_lock(ngx_posted_events_mutex);
301
302 for (i = 0; i < nevents && ready; i++) { 300 for (i = 0; i < nevents && ready; i++) {
303 301
304 revents = event_list[i].revents; 302 revents = event_list[i].revents;
305 303
306 #if 1 304 #if 1
370 368
371 if ((revents & POLLIN) && c->read->active) { 369 if ((revents & POLLIN) && c->read->active) {
372 found = 1; 370 found = 1;
373 371
374 ev = c->read; 372 ev = c->read;
375 373 ev->ready = 1;
376 if ((flags & NGX_POST_THREAD_EVENTS) && !ev->accept) { 374
377 ev->posted_ready = 1; 375 queue = ev->accept ? &ngx_posted_accept_events
378 376 : &ngx_posted_events;
379 } else { 377
380 ev->ready = 1; 378 ngx_post_event(ev, queue);
381 }
382
383 queue = (ngx_event_t **) (ev->accept ? &ngx_posted_accept_events:
384 &ngx_posted_events);
385 ngx_locked_post_event(ev, queue);
386 } 379 }
387 380
388 if ((revents & POLLOUT) && c->write->active) { 381 if ((revents & POLLOUT) && c->write->active) {
389 found = 1; 382 found = 1;
383
390 ev = c->write; 384 ev = c->write;
391 385 ev->ready = 1;
392 if (flags & NGX_POST_THREAD_EVENTS) { 386
393 ev->posted_ready = 1; 387 ngx_post_event(ev, &ngx_posted_events);
394
395 } else {
396 ev->ready = 1;
397 }
398
399 ngx_locked_post_event(ev, &ngx_posted_events);
400 } 388 }
401 389
402 if (found) { 390 if (found) {
403 ready--; 391 ready--;
404 continue; 392 continue;
405 } 393 }
406 } 394 }
407 395
408 ngx_mutex_unlock(ngx_posted_events_mutex);
409
410 if (ready != 0) { 396 if (ready != 0) {
411 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "poll ready != events"); 397 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "poll ready != events");
412 } 398 }
413 399
414 return NGX_OK; 400 return NGX_OK;