Mercurial > hg > nginx

comparison src/event/modules/ngx_epoll_module.c @ 3902:159b58f9c0bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix building by gcc 4.6 without --with-debug
author Igor Sysoev <igor@sysoev.ru>
date Sat, 23 Apr 2011 17:25:06 +0000
parents ab353d7dc182
children 6903dac6ad19 c48662671609
comparison
equal deleted inserted replaced
3901:c8b9f58c392b 3902:159b58f9c0bd
516 int events; 516 int events;
517 uint32_t revents; 517 uint32_t revents;
518 ngx_int_t instance, i; 518 ngx_int_t instance, i;
519 ngx_uint_t level; 519 ngx_uint_t level;
520 ngx_err_t err; 520 ngx_err_t err;
521 ngx_log_t *log;
522 ngx_event_t *rev, *wev, **queue; 521 ngx_event_t *rev, *wev, **queue;
523 ngx_connection_t *c; 522 ngx_connection_t *c;
524 523
525 /* NGX_TIMER_INFINITE == INFTIM */ 524 /* NGX_TIMER_INFINITE == INFTIM */
526 525
563 return NGX_ERROR; 562 return NGX_ERROR;
564 } 563 }
565 564
566 ngx_mutex_lock(ngx_posted_events_mutex); 565 ngx_mutex_lock(ngx_posted_events_mutex);
567 566
568 log = cycle->log;
569
570 for (i = 0; i < events; i++) { 567 for (i = 0; i < events; i++) {
571 c = event_list[i].data.ptr; 568 c = event_list[i].data.ptr;
572 569
573 instance = (uintptr_t) c & 1; 570 instance = (uintptr_t) c & 1;
574 c = (ngx_connection_t *) ((uintptr_t) c & (uintptr_t) ~1); 571 c = (ngx_connection_t *) ((uintptr_t) c & (uintptr_t) ~1);
585 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, 582 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
586 "epoll: stale event %p", c); 583 "epoll: stale event %p", c);
587 continue; 584 continue;
588 } 585 }
589 586
590 #if (NGX_DEBUG0)
591 log = c->log ? c->log : cycle->log;
592 #endif
593
594 revents = event_list[i].events; 587 revents = event_list[i].events;
595 588
596 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0, 589 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
597 "epoll: fd:%d ev:%04XD d:%p", 590 "epoll: fd:%d ev:%04XD d:%p",
598 c->fd, revents, event_list[i].data.ptr); 591 c->fd, revents, event_list[i].data.ptr);
599 592
600 if (revents & (EPOLLERR|EPOLLHUP)) { 593 if (revents & (EPOLLERR|EPOLLHUP)) {
601 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, 594 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
602 "epoll_wait() error on fd:%d ev:%04XD", 595 "epoll_wait() error on fd:%d ev:%04XD",
603 c->fd, revents); 596 c->fd, revents);
604 } 597 }
605 598
606 #if 0 599 #if 0
607 if (revents & ~(EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)) { 600 if (revents & ~(EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)) {
608 ngx_log_error(NGX_LOG_ALERT, log, 0, 601 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
609 "strange epoll_wait() events fd:%d ev:%04XD", 602 "strange epoll_wait() events fd:%d ev:%04XD",
610 c->fd, revents); 603 c->fd, revents);
611 } 604 }
612 #endif 605 #endif
613 606