Mercurial > hg > nginx

comparison src/event/modules/ngx_kqueue_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 67653855682e
children 3f5f0ab59b35
comparison
equal deleted inserted replaced
5819:8e7ee4c70a3c 5820:3377f9459e99
571 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, 571 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
572 "kevent() returned no events without timeout"); 572 "kevent() returned no events without timeout");
573 return NGX_ERROR; 573 return NGX_ERROR;
574 } 574 }
575 575
576 ngx_mutex_lock(ngx_posted_events_mutex);
577
578 for (i = 0; i < events; i++) { 576 for (i = 0; i < events; i++) {
579 577
580 ngx_kqueue_dump_event(cycle->log, &event_list[i]); 578 ngx_kqueue_dump_event(cycle->log, &event_list[i]);
581 579
582 if (event_list[i].flags & EV_ERROR) { 580 if (event_list[i].flags & EV_ERROR) {
624 622
625 if (ev->oneshot) { 623 if (ev->oneshot) {
626 ev->active = 0; 624 ev->active = 0;
627 } 625 }
628 626
629 #if (NGX_THREADS)
630
631 if ((flags & NGX_POST_THREAD_EVENTS) && !ev->accept) {
632 ev->posted_ready = 1;
633 ev->posted_available = event_list[i].data;
634
635 if (event_list[i].flags & EV_EOF) {
636 ev->posted_eof = 1;
637 ev->posted_errno = event_list[i].fflags;
638 }
639
640 ngx_locked_post_event(ev, &ngx_posted_events);
641
642 continue;
643 }
644
645 #endif
646
647 ev->available = event_list[i].data; 627 ev->available = event_list[i].data;
648 628
649 if (event_list[i].flags & EV_EOF) { 629 if (event_list[i].flags & EV_EOF) {
650 ev->pending_eof = 1; 630 ev->pending_eof = 1;
651 ev->kq_errno = event_list[i].fflags; 631 ev->kq_errno = event_list[i].fflags;
672 event_list[i].filter); 652 event_list[i].filter);
673 continue; 653 continue;
674 } 654 }
675 655
676 if (flags & NGX_POST_EVENTS) { 656 if (flags & NGX_POST_EVENTS) {
677 queue = (ngx_event_t **) (ev->accept ? &ngx_posted_accept_events: 657 queue = ev->accept ? &ngx_posted_accept_events
678 &ngx_posted_events); 658 : &ngx_posted_events;
679 ngx_locked_post_event(ev, queue); 659
660 ngx_post_event(ev, queue);
680 661
681 continue; 662 continue;
682 } 663 }
683 664
684 ev->handler(ev); 665 ev->handler(ev);
685 } 666 }
686
687 ngx_mutex_unlock(ngx_posted_events_mutex);
688 667
689 return NGX_OK; 668 return NGX_OK;
690 } 669 }
691 670
692 671