Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 3052:6060225e9261
FreeBSD and Linux AIO support
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 28 Aug 2009 08:12:35 +0000 |
parents | f54b02dbb12b |
children | 0d253659da12 |
comparison
equal
deleted
inserted
replaced
3051:26dfc0fa22c8 | 3052:6060225e9261 |
---|---|
381 ngx_conf_set_size_slot, | 381 ngx_conf_set_size_slot, |
382 NGX_HTTP_LOC_CONF_OFFSET, | 382 NGX_HTTP_LOC_CONF_OFFSET, |
383 offsetof(ngx_http_core_loc_conf_t, sendfile_max_chunk), | 383 offsetof(ngx_http_core_loc_conf_t, sendfile_max_chunk), |
384 NULL }, | 384 NULL }, |
385 | 385 |
386 #if (NGX_HAVE_FILE_AIO) | |
387 | |
388 { ngx_string("aio"), | |
389 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
390 ngx_conf_set_flag_slot, | |
391 NGX_HTTP_LOC_CONF_OFFSET, | |
392 offsetof(ngx_http_core_loc_conf_t, aio), | |
393 NULL }, | |
394 | |
395 #endif | |
396 | |
386 { ngx_string("directio"), | 397 { ngx_string("directio"), |
387 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 398 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
388 ngx_http_core_directio, | 399 ngx_http_core_directio, |
389 NGX_HTTP_LOC_CONF_OFFSET, | 400 NGX_HTTP_LOC_CONF_OFFSET, |
390 0, | 401 0, |
2914 lcf->client_body_in_file_only = NGX_CONF_UNSET_UINT; | 2925 lcf->client_body_in_file_only = NGX_CONF_UNSET_UINT; |
2915 lcf->client_body_in_single_buffer = NGX_CONF_UNSET; | 2926 lcf->client_body_in_single_buffer = NGX_CONF_UNSET; |
2916 lcf->internal = NGX_CONF_UNSET; | 2927 lcf->internal = NGX_CONF_UNSET; |
2917 lcf->sendfile = NGX_CONF_UNSET; | 2928 lcf->sendfile = NGX_CONF_UNSET; |
2918 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE; | 2929 lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE; |
2930 #if (NGX_HAVE_FILE_AIO) | |
2931 lcf->aio = NGX_CONF_UNSET; | |
2932 #endif | |
2919 lcf->directio = NGX_CONF_UNSET; | 2933 lcf->directio = NGX_CONF_UNSET; |
2920 lcf->tcp_nopush = NGX_CONF_UNSET; | 2934 lcf->tcp_nopush = NGX_CONF_UNSET; |
2921 lcf->tcp_nodelay = NGX_CONF_UNSET; | 2935 lcf->tcp_nodelay = NGX_CONF_UNSET; |
2922 lcf->send_timeout = NGX_CONF_UNSET_MSEC; | 2936 lcf->send_timeout = NGX_CONF_UNSET_MSEC; |
2923 lcf->send_lowat = NGX_CONF_UNSET_SIZE; | 2937 lcf->send_lowat = NGX_CONF_UNSET_SIZE; |
3111 prev->client_body_in_single_buffer, 0); | 3125 prev->client_body_in_single_buffer, 0); |
3112 ngx_conf_merge_value(conf->internal, prev->internal, 0); | 3126 ngx_conf_merge_value(conf->internal, prev->internal, 0); |
3113 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 3127 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
3114 ngx_conf_merge_size_value(conf->sendfile_max_chunk, | 3128 ngx_conf_merge_size_value(conf->sendfile_max_chunk, |
3115 prev->sendfile_max_chunk, 0); | 3129 prev->sendfile_max_chunk, 0); |
3130 #if (NGX_HAVE_FILE_AIO) | |
3131 ngx_conf_merge_value(conf->aio, prev->aio, 0); | |
3132 #endif | |
3116 ngx_conf_merge_off_value(conf->directio, prev->directio, | 3133 ngx_conf_merge_off_value(conf->directio, prev->directio, |
3117 NGX_MAX_OFF_T_VALUE); | 3134 NGX_MAX_OFF_T_VALUE); |
3118 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); | 3135 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); |
3119 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); | 3136 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); |
3120 | 3137 |