Mercurial > hg > nginx

comparison src/event/ngx_event_accept.c @ 6126:adba26ff70b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the obsolete rtsig module.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 23 Apr 2015 14:17:40 +0300
parents 4dc8e7b62216
children 4f6efabcb09b
comparison
equal deleted inserted replaced
6125:4dc8e7b62216 6126:adba26ff70b5
40 ev->timedout = 0; 40 ev->timedout = 0;
41 } 41 }
42 42
43 ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module); 43 ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module);
44 44
45 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { 45 if (!(ngx_event_flags & NGX_USE_KQUEUE_EVENT)) {
46 ev->available = 1;
47
48 } else if (!(ngx_event_flags & NGX_USE_KQUEUE_EVENT)) {
49 ev->available = ecf->multi_accept; 46 ev->available = ecf->multi_accept;
50 } 47 }
51 48
52 lc = ev->data; 49 lc = ev->data;
53 ls = lc->listening; 50 ls = lc->listening;
187 return; 184 return;
188 } 185 }
189 } 186 }
190 187
191 } else { 188 } else {
192 if (!(ngx_event_flags & (NGX_USE_IOCP_EVENT|NGX_USE_RTSIG_EVENT))) { 189 if (!(ngx_event_flags & NGX_USE_IOCP_EVENT)) {
193 if (ngx_nonblocking(s) == -1) { 190 if (ngx_nonblocking(s) == -1) {
194 ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno, 191 ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno,
195 ngx_nonblocking_n " failed"); 192 ngx_nonblocking_n " failed");
196 ngx_close_accepted_connection(c); 193 ngx_close_accepted_connection(c);
197 return; 194 return;
230 rev = c->read; 227 rev = c->read;
231 wev = c->write; 228 wev = c->write;
232 229
233 wev->ready = 1; 230 wev->ready = 1;
234 231
235 if (ngx_event_flags & (NGX_USE_IOCP_EVENT|NGX_USE_RTSIG_EVENT)) { 232 if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
236 rev->ready = 1; 233 rev->ready = 1;
237 } 234 }
238 235
239 if (ev->deferred_accept) { 236 if (ev->deferred_accept) {
240 rev->ready = 1; 237 rev->ready = 1;
372 if (ngx_shmtx_trylock(&ngx_accept_mutex)) { 369 if (ngx_shmtx_trylock(&ngx_accept_mutex)) {
373 370
374 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, 371 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
375 "accept mutex locked"); 372 "accept mutex locked");
376 373
377 if (ngx_accept_mutex_held 374 if (ngx_accept_mutex_held && ngx_accept_events == 0) {
378 && ngx_accept_events == 0
379 && !(ngx_event_flags & NGX_USE_RTSIG_EVENT))
380 {
381 return NGX_OK; 375 return NGX_OK;
382 } 376 }
383 377
384 if (ngx_enable_accept_events(cycle) == NGX_ERROR) { 378 if (ngx_enable_accept_events(cycle) == NGX_ERROR) {
385 ngx_shmtx_unlock(&ngx_accept_mutex); 379 ngx_shmtx_unlock(&ngx_accept_mutex);
421 415
422 if (c->read->active) { 416 if (c->read->active) {
423 continue; 417 continue;
424 } 418 }
425 419
426 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { 420 if (ngx_add_event(c->read, NGX_READ_EVENT, 0) == NGX_ERROR) {
427 421 return NGX_ERROR;
428 if (ngx_add_conn(c) == NGX_ERROR) {
429 return NGX_ERROR;
430 }
431
432 } else {
433 if (ngx_add_event(c->read, NGX_READ_EVENT, 0) == NGX_ERROR) {
434 return NGX_ERROR;
435 }
436 } 422 }
437 } 423 }
438 424
439 return NGX_OK; 425 return NGX_OK;
440 } 426 }
454 440
455 if (!c->read->active) { 441 if (!c->read->active) {
456 continue; 442 continue;
457 } 443 }
458 444
459 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { 445 if (ngx_del_event(c->read, NGX_READ_EVENT, NGX_DISABLE_EVENT)
460 if (ngx_del_conn(c, NGX_DISABLE_EVENT) == NGX_ERROR) { 446 == NGX_ERROR)
461 return NGX_ERROR; 447 {
462 } 448 return NGX_ERROR;
463
464 } else {
465 if (ngx_del_event(c->read, NGX_READ_EVENT, NGX_DISABLE_EVENT)
466 == NGX_ERROR)
467 {
468 return NGX_ERROR;
469 }
470 } 449 }
471 } 450 }
472 451
473 return NGX_OK; 452 return NGX_OK;
474 } 453 }