Mercurial > hg > nginx

comparison src/event/ngx_event.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 be3aaf9f0005
comparison
equal deleted inserted replaced
6125:4dc8e7b62216 6126:adba26ff70b5
15 15
16 extern ngx_module_t ngx_kqueue_module; 16 extern ngx_module_t ngx_kqueue_module;
17 extern ngx_module_t ngx_eventport_module; 17 extern ngx_module_t ngx_eventport_module;
18 extern ngx_module_t ngx_devpoll_module; 18 extern ngx_module_t ngx_devpoll_module;
19 extern ngx_module_t ngx_epoll_module; 19 extern ngx_module_t ngx_epoll_module;
20 extern ngx_module_t ngx_rtsig_module;
21 extern ngx_module_t ngx_select_module; 20 extern ngx_module_t ngx_select_module;
22 21
23 22
24 static char *ngx_event_init_conf(ngx_cycle_t *cycle, void *conf); 23 static char *ngx_event_init_conf(ngx_cycle_t *cycle, void *conf);
25 static ngx_int_t ngx_event_module_init(ngx_cycle_t *cycle); 24 static ngx_int_t ngx_event_module_init(ngx_cycle_t *cycle);
328 327
329 return NGX_OK; 328 return NGX_OK;
330 } 329 }
331 } 330 }
332 331
333 /* iocp, rtsig */ 332 /* iocp */
334 333
335 return NGX_OK; 334 return NGX_OK;
336 } 335 }
337 336
338 337
407 406
408 return NGX_OK; 407 return NGX_OK;
409 } 408 }
410 } 409 }
411 410
412 /* iocp, rtsig */ 411 /* iocp */
413 412
414 return NGX_OK; 413 return NGX_OK;
415 } 414 }
416 415
417 416
815 814
816 if (ngx_use_accept_mutex) { 815 if (ngx_use_accept_mutex) {
817 continue; 816 continue;
818 } 817 }
819 818
820 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { 819 if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
821 if (ngx_add_conn(c) == NGX_ERROR) { 820 return NGX_ERROR;
822 return NGX_ERROR;
823 }
824
825 } else {
826 if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
827 return NGX_ERROR;
828 }
829 } 821 }
830 822
831 #endif 823 #endif
832 824
833 } 825 }
1189 ngx_event_conf_t *ecf = conf; 1181 ngx_event_conf_t *ecf = conf;
1190 1182
1191 #if (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL) 1183 #if (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL)
1192 int fd; 1184 int fd;
1193 #endif 1185 #endif
1194 #if (NGX_HAVE_RTSIG)
1195 ngx_uint_t rtsig;
1196 ngx_core_conf_t *ccf;
1197 #endif
1198 ngx_int_t i; 1186 ngx_int_t i;
1199 ngx_module_t *module; 1187 ngx_module_t *module;
1200 ngx_event_module_t *event_module; 1188 ngx_event_module_t *event_module;
1201 1189
1202 module = NULL; 1190 module = NULL;
1213 module = &ngx_epoll_module; 1201 module = &ngx_epoll_module;
1214 } 1202 }
1215 1203
1216 #endif 1204 #endif
1217 1205
1218 #if (NGX_HAVE_RTSIG)
1219
1220 if (module == NULL) {
1221 module = &ngx_rtsig_module;
1222 rtsig = 1;
1223
1224 } else {
1225 rtsig = 0;
1226 }
1227
1228 #endif
1229
1230 #if (NGX_HAVE_DEVPOLL) 1206 #if (NGX_HAVE_DEVPOLL)
1231 1207
1232 module = &ngx_devpoll_module; 1208 module = &ngx_devpoll_module;
1233 1209
1234 #endif 1210 #endif
1281 1257
1282 ngx_conf_init_value(ecf->multi_accept, 0); 1258 ngx_conf_init_value(ecf->multi_accept, 0);
1283 ngx_conf_init_value(ecf->accept_mutex, 1); 1259 ngx_conf_init_value(ecf->accept_mutex, 1);
1284 ngx_conf_init_msec_value(ecf->accept_mutex_delay, 500); 1260 ngx_conf_init_msec_value(ecf->accept_mutex_delay, 500);
1285 1261
1286
1287 #if (NGX_HAVE_RTSIG)
1288
1289 if (!rtsig) {
1290 return NGX_CONF_OK;
1291 }
1292
1293 if (ecf->accept_mutex) {
1294 return NGX_CONF_OK;
1295 }
1296
1297 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
1298
1299 if (ccf->worker_processes == 0) {
1300 return NGX_CONF_OK;
1301 }
1302
1303 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
1304 "the \"rtsig\" method requires \"accept_mutex\" to be on");
1305
1306 return NGX_CONF_ERROR;
1307
1308 #else
1309
1310 return NGX_CONF_OK; 1262 return NGX_CONF_OK;
1311 1263 }
1312 #endif
1313 }