mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: copy peer data in shared memory.

Browse Source 
This, in addition to 1eb753aa8e5e, fixes "upstream zone" on Windows.
This commit is contained in:
Ruslan Ermilov 2017-08-04 17:03:10 +03:00
parent c09bba400d
commit c9a81b29b5
2 changed files with 138 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/http/modules/ngx_http_upstream_zone_module.c
View File

@ -16,6 +16,8 @@ static ngx_int_t ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone,
void *data); void *data);
static ngx_http_upstream_rr_peers_t *ngx_http_upstream_zone_copy_peers( static ngx_http_upstream_rr_peers_t *ngx_http_upstream_zone_copy_peers(
ngx_slab_pool_t *shpool, ngx_http_upstream_srv_conf_t *uscf); ngx_slab_pool_t *shpool, ngx_http_upstream_srv_conf_t *uscf);
static ngx_http_upstream_rr_peer_t *ngx_http_upstream_zone_copy_peer(
ngx_http_upstream_rr_peers_t *peers, ngx_http_upstream_rr_peer_t *src);
static ngx_command_t ngx_http_upstream_zone_commands[] = { static ngx_command_t ngx_http_upstream_zone_commands[] = {
@ -215,14 +217,11 @@ ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
for (peerp = &peers->peer; *peerp; peerp = &peer->next) { for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */ /* pool is unlocked */
peer = ngx_slab_calloc_locked(shpool, peer = ngx_http_upstream_zone_copy_peer(peers, *peerp);
sizeof(ngx_http_upstream_rr_peer_t));
if (peer == NULL) { if (peer == NULL) {
return NULL; return NULL;
} }
ngx_memcpy(peer, *peerp, sizeof(ngx_http_upstream_rr_peer_t));
*peerp = peer; *peerp = peer;
} }
@ -243,14 +242,11 @@ ngx_http_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
for (peerp = &backup->peer; *peerp; peerp = &peer->next) { for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */ /* pool is unlocked */
peer = ngx_slab_calloc_locked(shpool, peer = ngx_http_upstream_zone_copy_peer(backup, *peerp);
sizeof(ngx_http_upstream_rr_peer_t));
if (peer == NULL) { if (peer == NULL) {
return NULL; return NULL;
} }
ngx_memcpy(peer, *peerp, sizeof(ngx_http_upstream_rr_peer_t));
*peerp = peer; *peerp = peer;
} }
@ -262,3 +258,68 @@ done:
return peers; return peers;
} }
static ngx_http_upstream_rr_peer_t *
ngx_http_upstream_zone_copy_peer(ngx_http_upstream_rr_peers_t *peers,
ngx_http_upstream_rr_peer_t *src)
{
ngx_slab_pool_t *pool;
ngx_http_upstream_rr_peer_t *dst;
pool = peers->shpool;
dst = ngx_slab_calloc_locked(pool, sizeof(ngx_http_upstream_rr_peer_t));
if (dst == NULL) {
return NULL;
}
if (src) {
ngx_memcpy(dst, src, sizeof(ngx_http_upstream_rr_peer_t));
dst->sockaddr = NULL;
dst->name.data = NULL;
dst->server.data = NULL;
}
dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN);
if (dst->sockaddr == NULL) {
goto failed;
}
dst->name.data = ngx_slab_calloc_locked(pool, NGX_SOCKADDR_STRLEN);
if (dst->name.data == NULL) {
goto failed;
}
if (src) {
ngx_memcpy(dst->sockaddr, src->sockaddr, src->socklen);
ngx_memcpy(dst->name.data, src->name.data, src->name.len);
dst->server.data = ngx_slab_alloc_locked(pool, src->server.len);
if (dst->server.data == NULL) {
goto failed;
}
ngx_memcpy(dst->server.data, src->server.data, src->server.len);
}
return dst;
failed:
if (dst->server.data) {
ngx_slab_free_locked(pool, dst->server.data);
}
if (dst->name.data) {
ngx_slab_free_locked(pool, dst->name.data);
}
if (dst->sockaddr) {
ngx_slab_free_locked(pool, dst->sockaddr);
}
ngx_slab_free_locked(pool, dst);
return NULL;
}

77
src/stream/ngx_stream_upstream_zone_module.c
View File

@ -16,6 +16,8 @@ static ngx_int_t ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone,
void *data); void *data);
static ngx_stream_upstream_rr_peers_t *ngx_stream_upstream_zone_copy_peers( static ngx_stream_upstream_rr_peers_t *ngx_stream_upstream_zone_copy_peers(
ngx_slab_pool_t *shpool, ngx_stream_upstream_srv_conf_t *uscf); ngx_slab_pool_t *shpool, ngx_stream_upstream_srv_conf_t *uscf);
static ngx_stream_upstream_rr_peer_t *ngx_stream_upstream_zone_copy_peer(
ngx_stream_upstream_rr_peers_t *peers, ngx_stream_upstream_rr_peer_t *src);
static ngx_command_t ngx_stream_upstream_zone_commands[] = { static ngx_command_t ngx_stream_upstream_zone_commands[] = {
@ -212,14 +214,11 @@ ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
for (peerp = &peers->peer; *peerp; peerp = &peer->next) { for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */ /* pool is unlocked */
peer = ngx_slab_calloc_locked(shpool, peer = ngx_stream_upstream_zone_copy_peer(peers, *peerp);
sizeof(ngx_stream_upstream_rr_peer_t));
if (peer == NULL) { if (peer == NULL) {
return NULL; return NULL;
} }
ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
*peerp = peer; *peerp = peer;
} }
@ -240,14 +239,11 @@ ngx_stream_upstream_zone_copy_peers(ngx_slab_pool_t *shpool,
for (peerp = &backup->peer; *peerp; peerp = &peer->next) { for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */ /* pool is unlocked */
peer = ngx_slab_calloc_locked(shpool, peer = ngx_stream_upstream_zone_copy_peer(backup, *peerp);
sizeof(ngx_stream_upstream_rr_peer_t));
if (peer == NULL) { if (peer == NULL) {
return NULL; return NULL;
} }
ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
*peerp = peer; *peerp = peer;
} }
@ -259,3 +255,68 @@ done:
return peers; return peers;
} }
static ngx_stream_upstream_rr_peer_t *
ngx_stream_upstream_zone_copy_peer(ngx_stream_upstream_rr_peers_t *peers,
ngx_stream_upstream_rr_peer_t *src)
{
ngx_slab_pool_t *pool;
ngx_stream_upstream_rr_peer_t *dst;
pool = peers->shpool;
dst = ngx_slab_calloc_locked(pool, sizeof(ngx_stream_upstream_rr_peer_t));
if (dst == NULL) {
return NULL;
}
if (src) {
ngx_memcpy(dst, src, sizeof(ngx_stream_upstream_rr_peer_t));
dst->sockaddr = NULL;
dst->name.data = NULL;
dst->server.data = NULL;
}
dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN);
if (dst->sockaddr == NULL) {
goto failed;
}
dst->name.data = ngx_slab_calloc_locked(pool, NGX_SOCKADDR_STRLEN);
if (dst->name.data == NULL) {
goto failed;
}
if (src) {
ngx_memcpy(dst->sockaddr, src->sockaddr, src->socklen);
ngx_memcpy(dst->name.data, src->name.data, src->name.len);
dst->server.data = ngx_slab_alloc_locked(pool, src->server.len);
if (dst->server.data == NULL) {
goto failed;
}
ngx_memcpy(dst->server.data, src->server.data, src->server.len);
}
return dst;
failed:
if (dst->server.data) {
ngx_slab_free_locked(pool, dst->server.data);
}
if (dst->name.data) {
ngx_slab_free_locked(pool, dst->name.data);
}
if (dst->sockaddr) {
ngx_slab_free_locked(pool, dst->sockaddr);
}
ngx_slab_free_locked(pool, dst);
return NULL;
}