diff options
author | Sree Kuchibhotla <sreek@google.com> | 2017-12-01 10:05:45 -0800 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2017-12-01 10:05:45 -0800 |
commit | 906adfdb720bcbd9268079d664516b15b79ea485 (patch) | |
tree | daadb398482f69ebe5e338702872704aba1c9f3d /test/core/end2end | |
parent | 445c5664e0572daa7b07fdde0e4959f0deeb803f (diff) | |
download | grpc-grpc-906adfdb720bcbd9268079d664516b15b79ea485.tar.gz |
No need to explicitly zero initialize since we are doing zalloc. Some misc formatting changes
Diffstat (limited to 'test/core/end2end')
-rw-r--r-- | test/core/end2end/fixtures/http_proxy_fixture.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index f46edac6d7..31dfcd665e 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -157,12 +157,10 @@ static void proxy_connection_failed(grpc_exec_ctx* exec_ctx, const char* prefix, grpc_error* error) { const char* msg = grpc_error_string(error); gpr_log(GPR_INFO, "%s: %s", prefix, msg); - int ep_state = conn->ep_state; int new_ep_state = ep_state | failure_type; if (ep_state != new_ep_state) { conn->ep_state = new_ep_state; - // Shutdown the endpoint (client and/or server) if both read and write // failures are observed after setting the failure_type. // To prevent calling endpoint shutdown multiple times, It is important to @@ -175,14 +173,12 @@ static void proxy_connection_failed(grpc_exec_ctx* exec_ctx, GRPC_ERROR_REF(error)); } } - if (((ep_state & CLIENT_EP_FAIL) != CLIENT_EP_FAIL) && ((new_ep_state & CLIENT_EP_FAIL) == CLIENT_EP_FAIL)) { grpc_endpoint_shutdown(exec_ctx, conn->client_endpoint, GRPC_ERROR_REF(error)); } } - proxy_connection_unref(exec_ctx, conn, "conn_failed"); } @@ -491,7 +487,6 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, conn->client_endpoint = endpoint; conn->proxy = proxy; gpr_ref_init(&conn->refcount, 1); - conn->ep_state = 0; conn->pollset_set = grpc_pollset_set_create(); grpc_pollset_set_add_pollset(exec_ctx, conn->pollset_set, proxy->pollset); grpc_endpoint_add_to_pollset_set(exec_ctx, endpoint, conn->pollset_set); |