diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-07-20 21:15:59 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-07-20 21:15:59 +0000 |
| commit | 890fc9659609396f9df4dff47a2be77cd652fe55 (patch) | |
| tree | b6694fd45d26bc9607ceb41608619dbbf4ccb23c /src/event/modules/ngx_select_module.c | |
| parent | 8e1fbe61b69562d838aafda8d75798993f022d4a (diff) | |
| download | nginx-890fc9659609396f9df4dff47a2be77cd652fe55.tar.gz nginx-890fc9659609396f9df4dff47a2be77cd652fe55.zip | |
nginx-0.0.1-2003-07-21-01:15:59 import
Diffstat (limited to 'src/event/modules/ngx_select_module.c')
| -rw-r--r-- | src/event/modules/ngx_select_module.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index 3bf42efcb..ff9bdbf21 100644 --- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c @@ -263,7 +263,11 @@ static int ngx_select_process_events(ngx_log_t *log) tv.tv_sec = timer / 1000; tv.tv_usec = (timer % 1000) * 1000; tp = &tv; +#if (HAVE_SELECT_CHANGE_TIMEOUT) + delta = 0; +#else delta = ngx_msec(); +#endif } else { timer = 0; @@ -313,8 +317,11 @@ static int ngx_select_process_events(ngx_log_t *log) #endif if (timer) { - /* TODO: Linux returns time in tv */ +#if (HAVE_SELECT_CHANGE_TIMEOUT) + delta = timer - (tv.tv_sec * 1000 + tv.tv_usec / 1000); +#else delta = ngx_msec() - delta; +#endif #if (NGX_DEBUG_EVENT) ngx_log_debug(log, "select timer: %d, delta: %d" _ timer _ delta); @@ -324,7 +331,7 @@ static int ngx_select_process_events(ngx_log_t *log) } else { if (ready == 0) { ngx_log_error(NGX_LOG_ALERT, log, 0, - "select() returns no events without timeout"); + "select() returned no events without timeout"); return NGX_ERROR; } @@ -408,7 +415,7 @@ static char *ngx_select_init_conf(ngx_cycle_t *cycle, void *conf) ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module); - /* the default FD_SETSIZE is 1024U in FreeBSD 5.x */ + /* disable warnings: the default FD_SETSIZE is 1024U in FreeBSD 5.x */ if ((unsigned) ecf->connections > FD_SETSIZE) { return "maximum number of connections " |