Mercurial > hg > nginx

comparison src/event/modules/ngx_rtsig_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 4c36e15651f7
children 3f5f0ab59b35
comparison
equal deleted inserted replaced
5819:8e7ee4c70a3c 5820:3377f9459e99
402 if ((si.si_band & (POLLIN|POLLHUP|POLLERR)) && rev->active) { 402 if ((si.si_band & (POLLIN|POLLHUP|POLLERR)) && rev->active) {
403 403
404 rev->ready = 1; 404 rev->ready = 1;
405 405
406 if (flags & NGX_POST_EVENTS) { 406 if (flags & NGX_POST_EVENTS) {
407 queue = (ngx_event_t **) (rev->accept ? 407 queue = rev->accept ? &ngx_posted_accept_events
408 &ngx_posted_accept_events : &ngx_posted_events); 408 : &ngx_posted_events;
409 409
410 ngx_locked_post_event(rev, queue); 410 ngx_post_event(rev, queue);
411 411
412 } else { 412 } else {
413 rev->handler(rev); 413 rev->handler(rev);
414 } 414 }
415 } 415 }
419 if ((si.si_band & (POLLOUT|POLLHUP|POLLERR)) && wev->active) { 419 if ((si.si_band & (POLLOUT|POLLHUP|POLLERR)) && wev->active) {
420 420
421 wev->ready = 1; 421 wev->ready = 1;
422 422
423 if (flags & NGX_POST_EVENTS) { 423 if (flags & NGX_POST_EVENTS) {
424 ngx_locked_post_event(wev, &ngx_posted_events); 424 ngx_post_event(wev, &ngx_posted_events);
425 425
426 } else { 426 } else {
427 wev->handler(wev); 427 wev->handler(wev);
428 } 428 }
429 } 429 }
552 552
553 if (ready <= 0) { 553 if (ready <= 0) {
554 continue; 554 continue;
555 } 555 }
556 556
557 ngx_mutex_lock(ngx_posted_events_mutex);
558
559 for (i = 0; i < n; i++) { 557 for (i = 0; i < n; i++) {
560 c = cycle->files[overflow_list[i].fd]; 558 c = cycle->files[overflow_list[i].fd];
561 559
562 if (c == NULL) { 560 if (c == NULL) {
563 continue; 561 continue;
571 && (overflow_list[i].revents 569 && (overflow_list[i].revents
572 & (POLLIN|POLLERR|POLLHUP|POLLNVAL))) 570 & (POLLIN|POLLERR|POLLHUP|POLLNVAL)))
573 { 571 {
574 tested++; 572 tested++;
575 573
576 if ((flags & NGX_POST_THREAD_EVENTS) && !rev->accept) { 574 rev->ready = 1;
577 rev->posted_ready = 1;
578
579 } else {
580 rev->ready = 1;
581 }
582 575
583 if (flags & NGX_POST_EVENTS) { 576 if (flags & NGX_POST_EVENTS) {
584 queue = (ngx_event_t **) (rev->accept ? 577 queue = rev->accept ? &ngx_posted_accept_events
585 &ngx_posted_accept_events : &ngx_posted_events); 578 : &ngx_posted_events;
586 579
587 ngx_locked_post_event(rev, queue); 580 ngx_post_event(rev, queue);
588 581
589 } else { 582 } else {
590 rev->handler(rev); 583 rev->handler(rev);
591 } 584 }
592 } 585 }
599 && (overflow_list[i].revents 592 && (overflow_list[i].revents
600 & (POLLOUT|POLLERR|POLLHUP|POLLNVAL))) 593 & (POLLOUT|POLLERR|POLLHUP|POLLNVAL)))
601 { 594 {
602 tested++; 595 tested++;
603 596
604 if (flags & NGX_POST_THREAD_EVENTS) { 597 wev->ready = 1;
605 wev->posted_ready = 1;
606
607 } else {
608 wev->ready = 1;
609 }
610 598
611 if (flags & NGX_POST_EVENTS) { 599 if (flags & NGX_POST_EVENTS) {
612 ngx_locked_post_event(wev, &ngx_posted_events); 600 ngx_post_event(wev, &ngx_posted_events);
613 601
614 } else { 602 } else {
615 wev->handler(wev); 603 wev->handler(wev);
616 } 604 }
617 } 605 }
618 } 606 }
619
620 ngx_mutex_unlock(ngx_posted_events_mutex);
621 607
622 if (tested >= rtscf->overflow_test) { 608 if (tested >= rtscf->overflow_test) {
623 609
624 if (ngx_linux_rtsig_max) { 610 if (ngx_linux_rtsig_max) {
625 611