Mercurial > hg > nginx-vendor-current
diff src/event/modules/ngx_devpoll_module.c @ 324:f7cd062ee035 NGINX_0_6_6
nginx 0.6.6
*) Feature: the --sysconfdir=PATH option in configure.
*) Feature: named locations.
*) Feature: the $args variable can be set with the "set" directive.
*) Feature: the $is_args variable.
*) Bugfix: fair big weight upstream balancer.
*) Bugfix: if a client has closed connection to mail proxy then nginx
might not close connection to backend.
*) Bugfix: if the same host without specified port was used as backend
for HTTP and HTTPS, then nginx used only one port - 80 or 443.
*) Bugfix: fix building on Solaris/amd64 by Sun Studio 11 and early
versions; bug appeared in 0.6.4.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 30 Jul 2007 00:00:00 +0400 |
parents | 92402f034b28 |
children | 3a91bfeffaba |
line wrap: on
line diff
--- a/src/event/modules/ngx_devpoll_module.c +++ b/src/event/modules/ngx_devpoll_module.c @@ -13,8 +13,8 @@ /* Solaris declarations */ -#define POLLREMOVE 0x0800 -#define DP_POLL 0xD001 +#define POLLREMOVE 0x0800 +#define DP_POLL 0xD001 struct dvpoll { struct pollfd *dp_fds; @@ -26,16 +26,19 @@ struct dvpoll { typedef struct { - u_int changes; - u_int events; + ngx_uint_t changes; + ngx_uint_t events; } ngx_devpoll_conf_t; static ngx_int_t ngx_devpoll_init(ngx_cycle_t *cycle, ngx_msec_t timer); static void ngx_devpoll_done(ngx_cycle_t *cycle); -static ngx_int_t ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags); -static ngx_int_t ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags); -static ngx_int_t ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags); +static ngx_int_t ngx_devpoll_add_event(ngx_event_t *ev, ngx_int_t event, + ngx_uint_t flags); +static ngx_int_t ngx_devpoll_del_event(ngx_event_t *ev, ngx_int_t event, + ngx_uint_t flags); +static ngx_int_t ngx_devpoll_set_event(ngx_event_t *ev, ngx_int_t event, + ngx_uint_t flags); static ngx_int_t ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags); @@ -44,7 +47,7 @@ static char *ngx_devpoll_init_conf(ngx_c static int dp = -1; static struct pollfd *change_list, *event_list; -static u_int nchanges, max_changes, nevents; +static ngx_uint_t nchanges, max_changes, nevents; static ngx_event_t **change_index; @@ -208,7 +211,7 @@ ngx_devpoll_done(ngx_cycle_t *cycle) static ngx_int_t -ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags) +ngx_devpoll_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) { #if (NGX_DEBUG) ngx_connection_t *c; @@ -221,7 +224,7 @@ ngx_devpoll_add_event(ngx_event_t *ev, i #if (NGX_DEBUG) c = ev->data; ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "devpoll add event: fd:%d ev:%04Xd", c->fd, event); + "devpoll add event: fd:%d ev:%04Xi", c->fd, event); #endif ev->active = 1; @@ -231,7 +234,7 @@ ngx_devpoll_add_event(ngx_event_t *ev, i static ngx_int_t -ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags) +ngx_devpoll_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) { ngx_event_t *e; ngx_connection_t *c; @@ -243,7 +246,7 @@ ngx_devpoll_del_event(ngx_event_t *ev, i #endif ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "devpoll del event: fd:%d ev:%04Xd", c->fd, event); + "devpoll del event: fd:%d ev:%04Xi", c->fd, event); if (ngx_devpoll_set_event(ev, POLLREMOVE, flags) == NGX_ERROR) { return NGX_ERROR; @@ -275,7 +278,7 @@ ngx_devpoll_del_event(ngx_event_t *ev, i static ngx_int_t -ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags) +ngx_devpoll_set_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) { size_t n; ngx_connection_t *c; @@ -283,7 +286,7 @@ ngx_devpoll_set_event(ngx_event_t *ev, i c = ev->data; ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0, - "devpoll fd:%d ev:%04Xd fl:%04Xd", c->fd, event, flags); + "devpoll fd:%d ev:%04Xi fl:%04Xi", c->fd, event, flags); if (nchanges >= max_changes) { ngx_log_error(NGX_LOG_WARN, ev->log, 0, @@ -300,7 +303,7 @@ ngx_devpoll_set_event(ngx_event_t *ev, i } change_list[nchanges].fd = c->fd; - change_list[nchanges].events = event; + change_list[nchanges].events = (short) event; change_list[nchanges].revents = 0; change_index[nchanges] = ev; @@ -353,7 +356,7 @@ ngx_devpoll_process_events(ngx_cycle_t * } dvp.dp_fds = event_list; - dvp.dp_nfds = nevents; + dvp.dp_nfds = (int) nevents; dvp.dp_timeout = timer; events = ioctl(dp, DP_POLL, &dvp);