diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-09-28 13:08:51 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-09-28 13:08:51 -0700 |
| commit | 15292db696bb1d1b2ca29a6109581be3ad61d6c5 (patch) | |
| tree | 97e4840e2faa03cab8451df9c0d3bd89af7aee96 | |
| parent | 9fce8e13b3b83756a1658472aafa1cff4a97880d (diff) | |
| parent | 129bb463c31c287a1ea8565ea3fa99c97c9aac7c (diff) | |
Merge pull request #8221 from dgquintas/grpclb_server_name_const
Add comments documenting ownership semantics
| -rw-r--r-- | src/core/ext/lb_policy/pick_first/pick_first.c | 2 | ||||
| -rw-r--r-- | src/core/ext/lb_policy/round_robin/round_robin.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/core/ext/lb_policy/pick_first/pick_first.c b/src/core/ext/lb_policy/pick_first/pick_first.c index 466a0fdede..5af484eccf 100644 --- a/src/core/ext/lb_policy/pick_first/pick_first.c +++ b/src/core/ext/lb_policy/pick_first/pick_first.c @@ -466,6 +466,8 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx, } memset(&sc_args, 0, sizeof(grpc_subchannel_args)); + /* server_name will be copied as part of the subchannel creation. This makes + * the copying of args->server_name (a borrowed pointer) OK. */ sc_args.server_name = args->server_name; sc_args.addr = (struct sockaddr *)(&args->addresses->addresses[i].address.addr); diff --git a/src/core/ext/lb_policy/round_robin/round_robin.c b/src/core/ext/lb_policy/round_robin/round_robin.c index 037f180a9e..dfd4b1929c 100644 --- a/src/core/ext/lb_policy/round_robin/round_robin.c +++ b/src/core/ext/lb_policy/round_robin/round_robin.c @@ -629,6 +629,8 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx, if (args->addresses->addresses[i].is_balancer) continue; memset(&sc_args, 0, sizeof(grpc_subchannel_args)); + /* server_name will be copied as part of the subchannel creation. This makes + * the copying of args->server_name (a borrowed pointer) OK. */ sc_args.server_name = args->server_name; sc_args.addr = (struct sockaddr *)(&args->addresses->addresses[i].address.addr); |