nginx: src/http/ngx_http_copy_filter

annotate src/http/ngx_http_copy_filter_module.c @ 5980:ccad84a174e0

Refactored sendfile() AIO preload. This reduces layering violation and simplifies the logic of AIO preread, since it's now triggered by the send chain function itself without falling back to the copy filter. The context of AIO operation is now stored per file buffer, which makes it possible to properly handle cases when multiple buffers come from different locations, each with its own configuration.

author	Valentin Bartenev <vbart@nginx.com>
date	Wed, 11 Feb 2015 17:52:15 +0300
parents	d39a69427056
children	2dac6ae6d703

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 386 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 386 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4195 diff changeset	4 * Copyright (C) Nginx, Inc.
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 386 diff changeset	5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 386 diff changeset	6
3 34a521b1a148 nginx-0.0.1-2002-08-20-18:48:28 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
33 b2e039840718 nginx-0.0.1-2002-12-19-20:49:51 import Igor Sysoev <igor@sysoev.ru> parents: 32 diff changeset	8 #include <ngx_config.h>
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: 98 diff changeset	9 #include <ngx_core.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: 98 diff changeset	10 #include <ngx_http.h>
43 53cd05892261 nginx-0.0.1-2002-12-27-19:22:50 import Igor Sysoev <igor@sysoev.ru> parents: 42 diff changeset	11
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: 98 diff changeset	12
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: 98 diff changeset	13 typedef struct {
141 656d468f4ead nginx-0.0.1-2003-10-08-19:32:54 import Igor Sysoev <igor@sysoev.ru> parents: 135 diff changeset	14 ngx_bufs_t bufs;
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	15 } ngx_http_copy_filter_conf_t;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: 98 diff changeset	16
43 53cd05892261 nginx-0.0.1-2002-12-27-19:22:50 import Igor Sysoev <igor@sysoev.ru> parents: 42 diff changeset	17
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	18 #if (NGX_HAVE_FILE_AIO)
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	19 static void ngx_http_copy_aio_handler(ngx_output_chain_ctx_t *ctx,
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	20 ngx_file_t *file);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	21 static void ngx_http_copy_aio_event_handler(ngx_event_t *ev);
3065 113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	22 #if (NGX_HAVE_AIO_SENDFILE)
5980 ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	23 static ssize_t ngx_http_copy_aio_sendfile_preload(ngx_buf_t *file);
3065 113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	24 static void ngx_http_copy_aio_sendfile_event_handler(ngx_event_t *ev);
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	25 #endif
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	26 #endif
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	27
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	28 static void ngx_http_copy_filter_create_conf(ngx_conf_t cf);
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	29 static char ngx_http_copy_filter_merge_conf(ngx_conf_t cf,
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	30 void parent, void child);
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	31 static ngx_int_t ngx_http_copy_filter_init(ngx_conf_t *cf);
10 4f3879d9b6f6 nginx-0.0.1-2002-09-11-19:18:33 import Igor Sysoev <igor@sysoev.ru> parents: 9 diff changeset	32
4f3879d9b6f6 nginx-0.0.1-2002-09-11-19:18:33 import Igor Sysoev <igor@sysoev.ru> parents: 9 diff changeset	33
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	34 static ngx_command_t ngx_http_copy_filter_commands[] = {
10 4f3879d9b6f6 nginx-0.0.1-2002-09-11-19:18:33 import Igor Sysoev <igor@sysoev.ru> parents: 9 diff changeset	35
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	36 { ngx_string("output_buffers"),
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	37 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE2,
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	38 ngx_conf_set_bufs_slot,
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	39 NGX_HTTP_LOC_CONF_OFFSET,
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	40 offsetof(ngx_http_copy_filter_conf_t, bufs),
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	41 NULL },
10 4f3879d9b6f6 nginx-0.0.1-2002-09-11-19:18:33 import Igor Sysoev <igor@sysoev.ru> parents: 9 diff changeset	42
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	43 ngx_null_command
9 6f58641241bb nginx-0.0.1-2002-09-07-14:14:25 import Igor Sysoev <igor@sysoev.ru> parents: 8 diff changeset	44 };
3 34a521b1a148 nginx-0.0.1-2002-08-20-18:48:28 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	45
8 708f8bb772ec nginx-0.0.1-2002-09-02-18:48:24 import Igor Sysoev <igor@sysoev.ru> parents: 7 diff changeset	46
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	47 static ngx_http_module_t ngx_http_copy_filter_module_ctx = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	48 NULL, /* preconfiguration */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	49 ngx_http_copy_filter_init, /* postconfiguration */
177 4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 160 diff changeset	50
91 637625a2acdb nginx-0.0.1-2003-05-19-20:39:14 import Igor Sysoev <igor@sysoev.ru> parents: 90 diff changeset	51 NULL, /* create main configuration */
637625a2acdb nginx-0.0.1-2003-05-19-20:39:14 import Igor Sysoev <igor@sysoev.ru> parents: 90 diff changeset	52 NULL, /* init main configuration */
69 e43f406e4525 nginx-0.0.1-2003-03-20-19:09:44 import Igor Sysoev <igor@sysoev.ru> parents: 67 diff changeset	53
91 637625a2acdb nginx-0.0.1-2003-05-19-20:39:14 import Igor Sysoev <igor@sysoev.ru> parents: 90 diff changeset	54 NULL, /* create server configuration */
637625a2acdb nginx-0.0.1-2003-05-19-20:39:14 import Igor Sysoev <igor@sysoev.ru> parents: 90 diff changeset	55 NULL, /* merge server configuration */
637625a2acdb nginx-0.0.1-2003-05-19-20:39:14 import Igor Sysoev <igor@sysoev.ru> parents: 90 diff changeset	56
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	57 ngx_http_copy_filter_create_conf, /* create location configuration */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	58 ngx_http_copy_filter_merge_conf /* merge location configuration */
26 53cb81681040 nginx-0.0.1-2002-12-15-09:25:09 import Igor Sysoev <igor@sysoev.ru> parents: 24 diff changeset	59 };
53cb81681040 nginx-0.0.1-2002-12-15-09:25:09 import Igor Sysoev <igor@sysoev.ru> parents: 24 diff changeset	60
53cb81681040 nginx-0.0.1-2002-12-15-09:25:09 import Igor Sysoev <igor@sysoev.ru> parents: 24 diff changeset	61
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	62 ngx_module_t ngx_http_copy_filter_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	63 NGX_MODULE_V1,
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	64 &ngx_http_copy_filter_module_ctx, /* module context */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	65 ngx_http_copy_filter_commands, /* module directives */
96 a23d010f356d nginx-0.0.1-2003-05-27-16:18:54 import Igor Sysoev <igor@sysoev.ru> parents: 95 diff changeset	66 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	67 NULL, /* init master */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	68 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	69 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	70 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	71 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	72 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	73 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	74 NGX_MODULE_V1_PADDING
40 d5d4f3bba6f0 nginx-0.0.1-2002-12-26-10:24:21 import Igor Sysoev <igor@sysoev.ru> parents: 33 diff changeset	75 };
8 708f8bb772ec nginx-0.0.1-2002-09-02-18:48:24 import Igor Sysoev <igor@sysoev.ru> parents: 7 diff changeset	76
3 34a521b1a148 nginx-0.0.1-2002-08-20-18:48:28 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	77
4542 586969d972b9 Local variable "ngx_http_next_filter" renamed to "ngx_http_next_body_filter" Ruslan Ermilov <ru@nginx.com> parents: 4415 diff changeset	78 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
141 656d468f4ead nginx-0.0.1-2003-10-08-19:32:54 import Igor Sysoev <igor@sysoev.ru> parents: 135 diff changeset	79
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	80
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	81 static ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	82 ngx_http_copy_filter(ngx_http_request_t r, ngx_chain_t in)
60 50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	83 {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	84 ngx_int_t rc;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	85 ngx_connection_t *c;
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	86 ngx_output_chain_ctx_t *ctx;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	87 ngx_http_core_loc_conf_t *clcf;
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	88 ngx_http_copy_filter_conf_t *conf;
60 50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	89
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	90 c = r->connection;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	91
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	92 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
3062 aa720192937b use local variable and fix debug log message Igor Sysoev <igor@sysoev.ru> parents: 3053 diff changeset	93 "http copy filter: \"%V?%V\"", &r->uri, &r->args);
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	94
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	95 ctx = ngx_http_get_module_ctx(r, ngx_http_copy_filter_module);
60 50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	96
50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	97 if (ctx == NULL) {
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	98 ctx = ngx_pcalloc(r->pool, sizeof(ngx_output_chain_ctx_t));
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	99 if (ctx == NULL) {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	100 return NGX_ERROR;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	101 }
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	102
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	103 ngx_http_set_ctx(r, ctx, ngx_http_copy_filter_module);
60 50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	104
3053 0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	105 conf = ngx_http_get_module_loc_conf(r, ngx_http_copy_filter_module);
0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	106 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	107
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	108 ctx->sendfile = c->sendfile;
513 fbbf16224844 nginx-0.1.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	109 ctx->need_in_memory = r->main_filter_need_in_memory
fbbf16224844 nginx-0.1.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	110 \|\| r->filter_need_in_memory;
346 55e496a8ece3 nginx-0.0.3-2004-06-06-23:49:18 import Igor Sysoev <igor@sysoev.ru> parents: 343 diff changeset	111 ctx->need_in_temp = r->filter_need_temporary;
60 50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	112
3053 0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	113 ctx->alignment = clcf->directio_alignment;
0d253659da12 directio_alignment Igor Sysoev <igor@sysoev.ru> parents: 3052 diff changeset	114
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	115 ctx->pool = r->pool;
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	116 ctx->bufs = conf->bufs;
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 334 diff changeset	117 ctx->tag = (ngx_buf_tag_t) &ngx_http_copy_filter_module;
60 50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	118
4542 586969d972b9 Local variable "ngx_http_next_filter" renamed to "ngx_http_next_body_filter" Ruslan Ermilov <ru@nginx.com> parents: 4415 diff changeset	119 ctx->output_filter = (ngx_output_chain_filter_pt)
586969d972b9 Local variable "ngx_http_next_filter" renamed to "ngx_http_next_body_filter" Ruslan Ermilov <ru@nginx.com> parents: 4415 diff changeset	120 ngx_http_next_body_filter;
294 5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	121 ctx->filter_ctx = r;
60 50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	122
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	123 #if (NGX_HAVE_FILE_AIO)
3778 d29e8060ca0c always update an aio_senfile connection flag accodring to a current Igor Sysoev <igor@sysoev.ru> parents: 3776 diff changeset	124 if (ngx_file_aio) {
d29e8060ca0c always update an aio_senfile connection flag accodring to a current Igor Sysoev <igor@sysoev.ru> parents: 3776 diff changeset	125 if (clcf->aio) {
d29e8060ca0c always update an aio_senfile connection flag accodring to a current Igor Sysoev <igor@sysoev.ru> parents: 3776 diff changeset	126 ctx->aio_handler = ngx_http_copy_aio_handler;
d29e8060ca0c always update an aio_senfile connection flag accodring to a current Igor Sysoev <igor@sysoev.ru> parents: 3776 diff changeset	127 }
3065 113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	128 #if (NGX_HAVE_AIO_SENDFILE)
5980 ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	129 if (clcf->aio == NGX_HTTP_AIO_SENDFILE) {
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	130 ctx->aio_preload = ngx_http_copy_aio_sendfile_preload;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	131 }
3065 113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	132 #endif
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	133 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	134 #endif
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	135
3518 eb3aaf8bd2a9 fix SSI include stub for valid empty responses Igor Sysoev <igor@sysoev.ru> parents: 3294 diff changeset	136 if (in && in->buf && ngx_buf_size(in->buf)) {
eb3aaf8bd2a9 fix SSI include stub for valid empty responses Igor Sysoev <igor@sysoev.ru> parents: 3294 diff changeset	137 r->request_output = 1;
eb3aaf8bd2a9 fix SSI include stub for valid empty responses Igor Sysoev <igor@sysoev.ru> parents: 3294 diff changeset	138 }
60 50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	139 }
50186b49f2ad nginx-0.0.1-2003-02-11-10:14:40 import Igor Sysoev <igor@sysoev.ru> parents: 59 diff changeset	140
3119 4c90c9129a82 fix case when the output filter should add incoming buffers Igor Sysoev <igor@sysoev.ru> parents: 3110 diff changeset	141 #if (NGX_HAVE_FILE_AIO)
4c90c9129a82 fix case when the output filter should add incoming buffers Igor Sysoev <igor@sysoev.ru> parents: 3110 diff changeset	142 ctx->aio = r->aio;
4c90c9129a82 fix case when the output filter should add incoming buffers Igor Sysoev <igor@sysoev.ru> parents: 3110 diff changeset	143 #endif
4c90c9129a82 fix case when the output filter should add incoming buffers Igor Sysoev <igor@sysoev.ru> parents: 3110 diff changeset	144
5980 ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	145 rc = ngx_output_chain(ctx, in);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	146
5980 ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	147 if (ctx->in == NULL) {
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	148 r->buffered &= ~NGX_HTTP_COPY_BUFFERED;
3071 ffc270f696ed retry aio sendfile if data are ready Igor Sysoev <igor@sysoev.ru> parents: 3070 diff changeset	149
5980 ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	150 } else {
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	151 r->buffered \|= NGX_HTTP_COPY_BUFFERED;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	152 }
3065 113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	153
5980 ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	154 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	155 "http copy filter: %i \"%V?%V\"", rc, &r->uri, &r->args);
3071 ffc270f696ed retry aio sendfile if data are ready Igor Sysoev <igor@sysoev.ru> parents: 3070 diff changeset	156
5980 ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	157 return rc;
4 c5f071d376e5 nginx-0.0.1-2002-08-22-19:24:03 import Igor Sysoev <igor@sysoev.ru> parents: 3 diff changeset	158 }
9 6f58641241bb nginx-0.0.1-2002-09-07-14:14:25 import Igor Sysoev <igor@sysoev.ru> parents: 8 diff changeset	159
6f58641241bb nginx-0.0.1-2002-09-07-14:14:25 import Igor Sysoev <igor@sysoev.ru> parents: 8 diff changeset	160
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	161 #if (NGX_HAVE_FILE_AIO)
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	162
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	163 static void
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	164 ngx_http_copy_aio_handler(ngx_output_chain_ctx_t ctx, ngx_file_t file)
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	165 {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	166 ngx_http_request_t *r;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	167
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	168 r = ctx->filter_ctx;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	169
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	170 file->aio->data = r;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	171 file->aio->handler = ngx_http_copy_aio_event_handler;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	172
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	173 r->main->blocked++;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	174 r->aio = 1;
3776 7450029ff51e file AIO read may be posted inside loop Igor Sysoev <igor@sysoev.ru> parents: 3518 diff changeset	175 ctx->aio = 1;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	176 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	177
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	178
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	179 static void
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	180 ngx_http_copy_aio_event_handler(ngx_event_t *ev)
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	181 {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	182 ngx_event_aio_t *aio;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	183 ngx_http_request_t *r;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	184
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	185 aio = ev->data;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	186 r = aio->data;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	187
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	188 r->main->blocked--;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	189 r->aio = 0;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	190
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	191 r->connection->write->handler(r->connection->write);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	192 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	193
3065 113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	194
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	195 #if (NGX_HAVE_AIO_SENDFILE)
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	196
5980 ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	197 static ssize_t
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	198 ngx_http_copy_aio_sendfile_preload(ngx_buf_t *file)
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	199 {
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	200 ssize_t n;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	201 static u_char buf[1];
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	202 ngx_event_aio_t *aio;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	203 ngx_http_request_t *r;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	204
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	205 n = ngx_file_aio_read(file->file, buf, 1, file->file_pos, NULL);
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	206
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	207 if (n == NGX_AGAIN) {
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	208 aio = file->file->aio;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	209 aio->handler = ngx_http_copy_aio_sendfile_event_handler;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	210
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	211 r = aio->data;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	212 r->main->blocked++;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	213 r->aio = 1;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	214 }
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	215
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	216 return n;
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	217 }
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	218
ccad84a174e0 Refactored sendfile() AIO preload. Valentin Bartenev <vbart@nginx.com> parents: 5498 diff changeset	219
3065 113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	220 static void
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	221 ngx_http_copy_aio_sendfile_event_handler(ngx_event_t *ev)
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	222 {
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	223 ngx_event_aio_t *aio;
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	224 ngx_http_request_t *r;
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	225
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	226 aio = ev->data;
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	227 r = aio->data;
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	228
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	229 r->main->blocked--;
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	230 r->aio = 0;
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	231 ev->complete = 0;
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	232
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	233 r->connection->write->handler(r->connection->write);
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	234 }
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	235
113cd532b328 aio sendfile Igor Sysoev <igor@sysoev.ru> parents: 3062 diff changeset	236 #endif
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	237 #endif
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	238
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3050 diff changeset	239
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	240 static void *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	241 ngx_http_copy_filter_create_conf(ngx_conf_t *cf)
9 6f58641241bb nginx-0.0.1-2002-09-07-14:14:25 import Igor Sysoev <igor@sysoev.ru> parents: 8 diff changeset	242 {
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	243 ngx_http_copy_filter_conf_t *conf;
9 6f58641241bb nginx-0.0.1-2002-09-07-14:14:25 import Igor Sysoev <igor@sysoev.ru> parents: 8 diff changeset	244
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	245 conf = ngx_palloc(cf->pool, sizeof(ngx_http_copy_filter_conf_t));
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	246 if (conf == NULL) {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	247 return NULL;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	248 }
9 6f58641241bb nginx-0.0.1-2002-09-07-14:14:25 import Igor Sysoev <igor@sysoev.ru> parents: 8 diff changeset	249
141 656d468f4ead nginx-0.0.1-2003-10-08-19:32:54 import Igor Sysoev <igor@sysoev.ru> parents: 135 diff changeset	250 conf->bufs.num = 0;
10 4f3879d9b6f6 nginx-0.0.1-2002-09-11-19:18:33 import Igor Sysoev <igor@sysoev.ru> parents: 9 diff changeset	251
4f3879d9b6f6 nginx-0.0.1-2002-09-11-19:18:33 import Igor Sysoev <igor@sysoev.ru> parents: 9 diff changeset	252 return conf;
9 6f58641241bb nginx-0.0.1-2002-09-07-14:14:25 import Igor Sysoev <igor@sysoev.ru> parents: 8 diff changeset	253 }
44 0e81ac0bb3e2 nginx-0.0.1-2003-01-09-08:36:00 import Igor Sysoev <igor@sysoev.ru> parents: 43 diff changeset	254
0e81ac0bb3e2 nginx-0.0.1-2003-01-09-08:36:00 import Igor Sysoev <igor@sysoev.ru> parents: 43 diff changeset	255
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	256 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	257 ngx_http_copy_filter_merge_conf(ngx_conf_t cf, void parent, void *child)
44 0e81ac0bb3e2 nginx-0.0.1-2003-01-09-08:36:00 import Igor Sysoev <igor@sysoev.ru> parents: 43 diff changeset	258 {
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	259 ngx_http_copy_filter_conf_t *prev = parent;
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	260 ngx_http_copy_filter_conf_t *conf = child;
44 0e81ac0bb3e2 nginx-0.0.1-2003-01-09-08:36:00 import Igor Sysoev <igor@sysoev.ru> parents: 43 diff changeset	261
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	262 ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 1, 32768);
44 0e81ac0bb3e2 nginx-0.0.1-2003-01-09-08:36:00 import Igor Sysoev <igor@sysoev.ru> parents: 43 diff changeset	263
0e81ac0bb3e2 nginx-0.0.1-2003-01-09-08:36:00 import Igor Sysoev <igor@sysoev.ru> parents: 43 diff changeset	264 return NULL;
0e81ac0bb3e2 nginx-0.0.1-2003-01-09-08:36:00 import Igor Sysoev <igor@sysoev.ru> parents: 43 diff changeset	265 }
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	266
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	267
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 452 diff changeset	268 static ngx_int_t
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	269 ngx_http_copy_filter_init(ngx_conf_t *cf)
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	270 {
4542 586969d972b9 Local variable "ngx_http_next_filter" renamed to "ngx_http_next_body_filter" Ruslan Ermilov <ru@nginx.com> parents: 4415 diff changeset	271 ngx_http_next_body_filter = ngx_http_top_body_filter;
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	272 ngx_http_top_body_filter = ngx_http_copy_filter;
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	273
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	274 return NGX_OK;
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	275 }
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 327 diff changeset	276

Mercurial > hg > nginx

annotate src/http/ngx_http_copy_filter_module.c @ 5980:ccad84a174e0