Mercurial > hg > nginx

comparison src/event/modules/ngx_epoll_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 31dd63dcb9ea
children 3f5f0ab59b35
comparison
equal deleted inserted replaced
5819:8e7ee4c70a3c 5820:3377f9459e99
610 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, 610 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
611 "epoll_wait() returned no events without timeout"); 611 "epoll_wait() returned no events without timeout");
612 return NGX_ERROR; 612 return NGX_ERROR;
613 } 613 }
614 614
615 ngx_mutex_lock(ngx_posted_events_mutex);
616
617 for (i = 0; i < events; i++) { 615 for (i = 0; i < events; i++) {
618 c = event_list[i].data.ptr; 616 c = event_list[i].data.ptr;
619 617
620 instance = (uintptr_t) c & 1; 618 instance = (uintptr_t) c & 1;
621 c = (ngx_connection_t *) ((uintptr_t) c & (uintptr_t) ~1); 619 c = (ngx_connection_t *) ((uintptr_t) c & (uintptr_t) ~1);
672 if (revents & EPOLLRDHUP) { 670 if (revents & EPOLLRDHUP) {
673 rev->pending_eof = 1; 671 rev->pending_eof = 1;
674 } 672 }
675 #endif 673 #endif
676 674
677 if ((flags & NGX_POST_THREAD_EVENTS) && !rev->accept) { 675 rev->ready = 1;
678 rev->posted_ready = 1;
679
680 } else {
681 rev->ready = 1;
682 }
683 676
684 if (flags & NGX_POST_EVENTS) { 677 if (flags & NGX_POST_EVENTS) {
685 queue = (ngx_event_t **) (rev->accept ? 678 queue = rev->accept ? &ngx_posted_accept_events
686 &ngx_posted_accept_events : &ngx_posted_events); 679 : &ngx_posted_events;
687 680
688 ngx_locked_post_event(rev, queue); 681 ngx_post_event(rev, queue);
689 682
690 } else { 683 } else {
691 rev->handler(rev); 684 rev->handler(rev);
692 } 685 }
693 } 686 }
706 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, 699 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
707 "epoll: stale event %p", c); 700 "epoll: stale event %p", c);
708 continue; 701 continue;
709 } 702 }
710 703
711 if (flags & NGX_POST_THREAD_EVENTS) { 704 wev->ready = 1;
712 wev->posted_ready = 1;
713
714 } else {
715 wev->ready = 1;
716 }
717 705
718 if (flags & NGX_POST_EVENTS) { 706 if (flags & NGX_POST_EVENTS) {
719 ngx_locked_post_event(wev, &ngx_posted_events); 707 ngx_post_event(wev, &ngx_posted_events);
720 708
721 } else { 709 } else {
722 wev->handler(wev); 710 wev->handler(wev);
723 } 711 }
724 } 712 }
725 } 713 }
726
727 ngx_mutex_unlock(ngx_posted_events_mutex);
728 714
729 return NGX_OK; 715 return NGX_OK;
730 } 716 }
731 717
732 718