nginx: src/stream/ngx_stream_upstream_zone

annotate src/stream/ngx_stream_upstream_zone_module.c @ 7078:1eb753aa8e5e

Upstream zone: store peers->name and its data in shared memory. The shared objects should generally be allocated from shared memory. While peers->name and the data it points to allocated from cf->pool happened to work on UNIX, it broke on Windows. On UNIX this worked only because the shared memory zone for upstreams is re-created for every new configuration. But on Windows, a worker process does not inherit the address space of the master process, so the peers->name pointed to data allocated from cf->pool by the master process, and was invalid.

author	Ruslan Ermilov <ru@nginx.com>
date	Tue, 01 Aug 2017 19:12:10 +0300
parents	8ed51b02f655
children	ac120e797d28

rev	line source
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	1
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	2 /*
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	3 * Copyright (C) Ruslan Ermilov
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	4 * Copyright (C) Nginx, Inc.
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	5 */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	6
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	7
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	8 #include <ngx_config.h>
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	9 #include <ngx_core.h>
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	10 #include <ngx_stream.h>
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	11
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	12
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	13 static char ngx_stream_upstream_zone(ngx_conf_t cf, ngx_command_t *cmd,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	14 void *conf);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	15 static ngx_int_t ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	16 void *data);
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	17 static ngx_stream_upstream_rr_peers_t *ngx_stream_upstream_zone_copy_peers(
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	18 ngx_slab_pool_t shpool, ngx_stream_upstream_srv_conf_t uscf);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	19
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	20
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	21 static ngx_command_t ngx_stream_upstream_zone_commands[] = {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	22
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	23 { ngx_string("zone"),
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	24 NGX_STREAM_UPS_CONF\|NGX_CONF_TAKE12,
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	25 ngx_stream_upstream_zone,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	26 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	27 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	28 NULL },
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	29
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	30 ngx_null_command
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	31 };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	32
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	33
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	34 static ngx_stream_module_t ngx_stream_upstream_zone_module_ctx = {
6606 2f41d383c9c7 Stream: added preconfiguration step. Vladimir Homutov <vl@nginx.com> parents: 6214 diff changeset	35 NULL, /* preconfiguration */
6174 68c106e6fa0a Stream: added postconfiguration method to stream modules. Vladimir Homutov <vl@nginx.com> parents: 6123 diff changeset	36 NULL, /* postconfiguration */
68c106e6fa0a Stream: added postconfiguration method to stream modules. Vladimir Homutov <vl@nginx.com> parents: 6123 diff changeset	37
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	38 NULL, /* create main configuration */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	39 NULL, /* init main configuration */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	40
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	41 NULL, /* create server configuration */
6629 8ed51b02f655 Stream: style. Vladimir Homutov <vl@nginx.com> parents: 6606 diff changeset	42 NULL /* merge server configuration */
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	43 };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	44
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	45
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	46 ngx_module_t ngx_stream_upstream_zone_module = {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	47 NGX_MODULE_V1,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	48 &ngx_stream_upstream_zone_module_ctx, /* module context */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	49 ngx_stream_upstream_zone_commands, /* module directives */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	50 NGX_STREAM_MODULE, /* module type */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	51 NULL, /* init master */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	52 NULL, /* init module */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	53 NULL, /* init process */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	54 NULL, /* init thread */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	55 NULL, /* exit thread */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	56 NULL, /* exit process */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	57 NULL, /* exit master */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	58 NGX_MODULE_V1_PADDING
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	59 };
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	60
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	61
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	62 static char *
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	63 ngx_stream_upstream_zone(ngx_conf_t cf, ngx_command_t cmd, void *conf)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	64 {
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	65 ssize_t size;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	66 ngx_str_t *value;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	67 ngx_stream_upstream_srv_conf_t *uscf;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	68 ngx_stream_upstream_main_conf_t *umcf;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	69
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	70 uscf = ngx_stream_conf_get_module_srv_conf(cf, ngx_stream_upstream_module);
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	71 umcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_upstream_module);
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	72
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	73 value = cf->args->elts;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	74
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	75 if (!value[1].len) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	76 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	77 "invalid zone name \"%V\"", &value[1]);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	78 return NGX_CONF_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	79 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	80
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	81 if (cf->args->nelts == 3) {
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	82 size = ngx_parse_size(&value[2]);
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	83
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	84 if (size == NGX_ERROR) {
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	85 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	86 "invalid zone size \"%V\"", &value[2]);
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	87 return NGX_CONF_ERROR;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	88 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	89
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	90 if (size < (ssize_t) (8 * ngx_pagesize)) {
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	91 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	92 "zone \"%V\" is too small", &value[1]);
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	93 return NGX_CONF_ERROR;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	94 }
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	95
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	96 } else {
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	97 size = 0;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	98 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	99
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	100 uscf->shm_zone = ngx_shared_memory_add(cf, &value[1], size,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	101 &ngx_stream_upstream_module);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	102 if (uscf->shm_zone == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	103 return NGX_CONF_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	104 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	105
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	106 uscf->shm_zone->init = ngx_stream_upstream_init_zone;
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	107 uscf->shm_zone->data = umcf;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	108
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	109 uscf->shm_zone->noreuse = 1;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	110
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	111 return NGX_CONF_OK;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	112 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	113
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	114
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	115 static ngx_int_t
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	116 ngx_stream_upstream_init_zone(ngx_shm_zone_t shm_zone, void data)
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	117 {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	118 size_t len;
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	119 ngx_uint_t i;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	120 ngx_slab_pool_t *shpool;
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	121 ngx_stream_upstream_rr_peers_t peers, *peersp;
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	122 ngx_stream_upstream_srv_conf_t uscf, *uscfp;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	123 ngx_stream_upstream_main_conf_t *umcf;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	124
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	125 shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	126 umcf = shm_zone->data;
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	127 uscfp = umcf->upstreams.elts;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	128
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	129 if (shm_zone->shm.exists) {
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	130 peers = shpool->data;
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	131
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	132 for (i = 0; i < umcf->upstreams.nelts; i++) {
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	133 uscf = uscfp[i];
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	134
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	135 if (uscf->shm_zone != shm_zone) {
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	136 continue;
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	137 }
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	138
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	139 uscf->peer.data = peers;
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	140 peers = peers->zone_next;
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	141 }
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	142
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	143 return NGX_OK;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	144 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	145
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	146 len = sizeof(" in upstream zone \"\"") + shm_zone->shm.name.len;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	147
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	148 shpool->log_ctx = ngx_slab_alloc(shpool, len);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	149 if (shpool->log_ctx == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	150 return NGX_ERROR;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	151 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	152
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	153 ngx_sprintf(shpool->log_ctx, " in upstream zone \"%V\"%Z",
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	154 &shm_zone->shm.name);
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	155
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	156
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	157 /* copy peers to shared memory */
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	158
6214 341e4303d25b Fixed strict aliasing warnings with old GCC versions. Ruslan Ermilov <ru@nginx.com> parents: 6198 diff changeset	159 peersp = (ngx_stream_upstream_rr_peers_t *) (void ) &shpool->data;
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	160
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	161 for (i = 0; i < umcf->upstreams.nelts; i++) {
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	162 uscf = uscfp[i];
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	163
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	164 if (uscf->shm_zone != shm_zone) {
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	165 continue;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	166 }
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	167
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	168 peers = ngx_stream_upstream_zone_copy_peers(shpool, uscf);
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	169 if (peers == NULL) {
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	170 return NGX_ERROR;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	171 }
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	172
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	173 *peersp = peers;
311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	174 peersp = &peers->zone_next;
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	175 }
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	176
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	177 return NGX_OK;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	178 }
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	179
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	180
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	181 static ngx_stream_upstream_rr_peers_t *
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	182 ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	183 ngx_stream_upstream_srv_conf_t *uscf)
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	184 {
7078 1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	185 ngx_str_t *name;
6123 caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	186 ngx_stream_upstream_rr_peer_t peer, *peerp;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	187 ngx_stream_upstream_rr_peers_t peers, backup;
caa103acf180 Upstream: allow multiple upstreams to use the same shared zone. Ruslan Ermilov <ru@nginx.com> parents: 6115 diff changeset	188
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	189 peers = ngx_slab_alloc(shpool, sizeof(ngx_stream_upstream_rr_peers_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	190 if (peers == NULL) {
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	191 return NULL;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	192 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	193
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	194 ngx_memcpy(peers, uscf->peer.data, sizeof(ngx_stream_upstream_rr_peers_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	195
7078 1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	196 name = ngx_slab_alloc(shpool, sizeof(ngx_str_t));
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	197 if (name == NULL) {
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	198 return NULL;
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	199 }
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	200
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	201 name->data = ngx_slab_alloc(shpool, peers->name->len);
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	202 if (name->data == NULL) {
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	203 return NULL;
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	204 }
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	205
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	206 ngx_memcpy(name->data, peers->name->data, peers->name->len);
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	207 name->len = peers->name->len;
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	208
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	209 peers->name = name;
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	210
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	211 peers->shpool = shpool;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	212
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	213 for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	214 /* pool is unlocked */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	215 peer = ngx_slab_calloc_locked(shpool,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	216 sizeof(ngx_stream_upstream_rr_peer_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	217 if (peer == NULL) {
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	218 return NULL;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	219 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	220
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	221 ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	222
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	223 *peerp = peer;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	224 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	225
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	226 if (peers->next == NULL) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	227 goto done;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	228 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	229
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	230 backup = ngx_slab_alloc(shpool, sizeof(ngx_stream_upstream_rr_peers_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	231 if (backup == NULL) {
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	232 return NULL;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	233 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	234
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	235 ngx_memcpy(backup, peers->next, sizeof(ngx_stream_upstream_rr_peers_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	236
7078 1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	237 backup->name = name;
1eb753aa8e5e Upstream zone: store peers->name and its data in shared memory. Ruslan Ermilov <ru@nginx.com> parents: 6629 diff changeset	238
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	239 backup->shpool = shpool;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	240
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	241 for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	242 /* pool is unlocked */
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	243 peer = ngx_slab_calloc_locked(shpool,
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	244 sizeof(ngx_stream_upstream_rr_peer_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	245 if (peer == NULL) {
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	246 return NULL;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	247 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	248
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	249 ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	250
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	251 *peerp = peer;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	252 }
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	253
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	254 peers->next = backup;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	255
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	256 done:
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	257
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	258 uscf->peer.data = peers;
61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	259
6198 311d232ad803 Upstream: fixed shared upstreams on win32. Ruslan Ermilov <ru@nginx.com> parents: 6174 diff changeset	260 return peers;
6115 61d7ae76647d Stream: port from NGINX+. Ruslan Ermilov <ru@nginx.com> parents: diff changeset	261 }

Mercurial > hg > nginx

annotate src/stream/ngx_stream_upstream_zone_module.c @ 7078:1eb753aa8e5e