diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-22 07:24:21 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-22 07:24:21 -0700 |
| commit | 40cd820fd6fee53c270c115617107100c6c18ece (patch) | |
| tree | ece9083bfdc23a741f302f875f1d0c1df2ea97a1 | |
| parent | 4fc085fcbb80e9a5f018c9d6186ce8ce35c764de (diff) | |
Fix list iteration
| -rw-r--r-- | src/core/client_config/subchannel.c | 2 | ||||
| -rw-r--r-- | test/core/end2end/fixtures/proxy.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 48df4bbd31..c570c55267 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -597,7 +597,7 @@ static void publish_transport(grpc_subchannel *c, grpc_call_list *call_list) { gpr_mu_unlock(&c->mu); while (w4c != NULL) { - waiting_for_connect *next = w4c; + waiting_for_connect *next = w4c->next; grpc_call_list_add(call_list, &w4c->continuation, 1); w4c = next; } diff --git a/test/core/end2end/fixtures/proxy.c b/test/core/end2end/fixtures/proxy.c index 0090cf42f2..b793358653 100644 --- a/test/core/end2end/fixtures/proxy.c +++ b/test/core/end2end/fixtures/proxy.c @@ -100,6 +100,10 @@ grpc_end2end_proxy *grpc_end2end_proxy_create( gpr_join_host_port(&proxy->proxy_port, "localhost", proxy_port); gpr_join_host_port(&proxy->server_port, "localhost", server_port); + + gpr_log(GPR_DEBUG, "PROXY ADDR:%s BACKEND:%s", proxy->proxy_port, + proxy->server_port); + proxy->cq = grpc_completion_queue_create(NULL); proxy->server = def->create_server(proxy->proxy_port); proxy->client = def->create_client(proxy->server_port); @@ -142,8 +146,6 @@ void grpc_end2end_proxy_destroy(grpc_end2end_proxy *proxy) { } static void unrefpc(proxy_call *pc, const char *reason) { - gpr_log(GPR_DEBUG, "unref %p: %s %d -> %d", pc, reason, pc->refs.count, - pc->refs.count - 1); if (gpr_unref(&pc->refs)) { grpc_call_destroy(pc->c2p); grpc_call_destroy(pc->p2s); @@ -156,8 +158,6 @@ static void unrefpc(proxy_call *pc, const char *reason) { } static void refpc(proxy_call *pc, const char *reason) { - gpr_log(GPR_DEBUG, "ref %p: %s %d -> %d", pc, reason, pc->refs.count, - pc->refs.count + 1); gpr_ref(&pc->refs); } |