Mercurial > hg > nginx

comparison src/event/ngx_event.c @ 4593:834049edae24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed grammar in error messages.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 12 Apr 2012 19:35:41 +0000
parents d620f497c50f
children f947296f6b2b
comparison
equal deleted inserted replaced
4592:ab1649495d30 4593:834049edae24
469 { 469 {
470 limit = (ccf->rlimit_nofile == NGX_CONF_UNSET) ? 470 limit = (ccf->rlimit_nofile == NGX_CONF_UNSET) ?
471 (ngx_int_t) rlmt.rlim_cur : ccf->rlimit_nofile; 471 (ngx_int_t) rlmt.rlim_cur : ccf->rlimit_nofile;
472 472
473 ngx_log_error(NGX_LOG_WARN, cycle->log, 0, 473 ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
474 "%ui worker_connections are more than " 474 "%ui worker_connections exceed "
475 "open file resource limit: %i", 475 "open file resource limit: %i",
476 ecf->connections, limit); 476 ecf->connections, limit);
477 } 477 }
478 } 478 }
479 } 479 }
487 if (ngx_accept_mutex_ptr) { 487 if (ngx_accept_mutex_ptr) {
488 return NGX_OK; 488 return NGX_OK;
489 } 489 }
490 490
491 491
492 /* cl should be equal or bigger than cache line size */ 492 /* cl should be equal to or greater than cache line size */
493 493
494 cl = 128; 494 cl = 128;
495 495
496 size = cl /* ngx_accept_mutex */ 496 size = cl /* ngx_accept_mutex */
497 + cl /* ngx_connection_counter */ 497 + cl /* ngx_connection_counter */