[nginx] Upstream: copy peer data in shared memory.
Ruslan Ermilov
ru at nginx.com
Mon Aug 7 09:06:48 UTC 2017
details: http://hg.nginx.org/nginx/rev/ac120e797d28
branches:
changeset: 7080:ac120e797d28
user: Ruslan Ermilov <ru at nginx.com>
date: Fri Aug 04 17:03:10 2017 +0300
description:
Upstream: copy peer data in shared memory.
This, in addition to 1eb753aa8e5e, fixes "upstream zone" on Windows.
diffstat:
src/http/modules/ngx_http_upstream_zone_module.c | 77 +++++++++++++++++++++--
src/stream/ngx_stream_upstream_zone_module.c | 77 +++++++++++++++++++++--
2 files changed, 138 insertions(+), 16 deletions(-)
diffs (226 lines):
diff -r 7564a919d333 -r ac120e797d28 src/http/modules/ngx_http_upstream_zone_module.c
--- a/src/http/modules/ngx_http_upstream_zone_module.c Fri Aug 04 08:01:55 2017 +0300
+++ b/src/http/modules/ngx_http_upstream_zone_module.c Fri Aug 04 17:03:10 2017 +0300
@@ -16,6 +16,8 @@ static ngx_int_t ngx_http_upstream_init_
void *data);
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);
+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[] = {
@@ -215,14 +217,11 @@ ngx_http_upstream_zone_copy_peers(ngx_sl
for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */
- peer = ngx_slab_calloc_locked(shpool,
- sizeof(ngx_http_upstream_rr_peer_t));
+ peer = ngx_http_upstream_zone_copy_peer(peers, *peerp);
if (peer == NULL) {
return NULL;
}
- ngx_memcpy(peer, *peerp, sizeof(ngx_http_upstream_rr_peer_t));
-
*peerp = peer;
}
@@ -243,14 +242,11 @@ ngx_http_upstream_zone_copy_peers(ngx_sl
for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */
- peer = ngx_slab_calloc_locked(shpool,
- sizeof(ngx_http_upstream_rr_peer_t));
+ peer = ngx_http_upstream_zone_copy_peer(backup, *peerp);
if (peer == NULL) {
return NULL;
}
- ngx_memcpy(peer, *peerp, sizeof(ngx_http_upstream_rr_peer_t));
-
*peerp = peer;
}
@@ -262,3 +258,68 @@ done:
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;
+}
diff -r 7564a919d333 -r ac120e797d28 src/stream/ngx_stream_upstream_zone_module.c
--- a/src/stream/ngx_stream_upstream_zone_module.c Fri Aug 04 08:01:55 2017 +0300
+++ b/src/stream/ngx_stream_upstream_zone_module.c Fri Aug 04 17:03:10 2017 +0300
@@ -16,6 +16,8 @@ static ngx_int_t ngx_stream_upstream_ini
void *data);
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);
+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[] = {
@@ -212,14 +214,11 @@ ngx_stream_upstream_zone_copy_peers(ngx_
for (peerp = &peers->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */
- peer = ngx_slab_calloc_locked(shpool,
- sizeof(ngx_stream_upstream_rr_peer_t));
+ peer = ngx_stream_upstream_zone_copy_peer(peers, *peerp);
if (peer == NULL) {
return NULL;
}
- ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
-
*peerp = peer;
}
@@ -240,14 +239,11 @@ ngx_stream_upstream_zone_copy_peers(ngx_
for (peerp = &backup->peer; *peerp; peerp = &peer->next) {
/* pool is unlocked */
- peer = ngx_slab_calloc_locked(shpool,
- sizeof(ngx_stream_upstream_rr_peer_t));
+ peer = ngx_stream_upstream_zone_copy_peer(backup, *peerp);
if (peer == NULL) {
return NULL;
}
- ngx_memcpy(peer, *peerp, sizeof(ngx_stream_upstream_rr_peer_t));
-
*peerp = peer;
}
@@ -259,3 +255,68 @@ done:
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;
+}
More information about the nginx-devel
mailing list