From 4d20a666850b732cf1562487fb5f46ab9654105f Mon Sep 17 00:00:00 2001 From: Noah Eisen Date: Fri, 9 Feb 2018 09:34:04 -0800 Subject: Run clang fmt --- test/core/util/cmdline.cc | 3 ++- test/core/util/debugger_macros.cc | 3 ++- test/core/util/histogram.cc | 6 ++++-- test/core/util/mock_endpoint.cc | 3 ++- test/core/util/parse_hexstring.cc | 3 ++- test/core/util/passthru_endpoint.cc | 12 +++++++----- test/core/util/port.cc | 4 ++-- test/core/util/port_server_client.cc | 12 ++++++++---- test/core/util/reconnect_server.cc | 4 ++-- test/core/util/slice_splitter.cc | 7 ++++--- test/core/util/subprocess_posix.cc | 3 ++- test/core/util/test_config.cc | 10 ++++++---- test/core/util/test_tcp_server.cc | 3 ++- test/core/util/trickle_endpoint.cc | 3 ++- 14 files changed, 47 insertions(+), 29 deletions(-) (limited to 'test/core/util') diff --git a/test/core/util/cmdline.cc b/test/core/util/cmdline.cc index fd3959bfe9..e76acb5e2b 100644 --- a/test/core/util/cmdline.cc +++ b/test/core/util/cmdline.cc @@ -287,7 +287,8 @@ static int normal_state(gpr_cmdline* cl, char* str) { eq = strchr(str, '='); if (eq != nullptr) { /* copy the string into a temp buffer and extract the name */ - tmp = arg_name = static_cast(gpr_malloc(static_cast(eq - str + 1))); + tmp = arg_name = + static_cast(gpr_malloc(static_cast(eq - str + 1))); memcpy(arg_name, str, static_cast(eq - str)); arg_name[eq - str] = 0; } else { diff --git a/test/core/util/debugger_macros.cc b/test/core/util/debugger_macros.cc index 0ec5f1db6b..05fb146173 100644 --- a/test/core/util/debugger_macros.cc +++ b/test/core/util/debugger_macros.cc @@ -54,5 +54,6 @@ grpc_stream* grpc_transport_stream_from_call(grpc_call* call) { } grpc_chttp2_stream* grpc_chttp2_stream_from_call(grpc_call* call) { - return reinterpret_cast(grpc_transport_stream_from_call(call)); + return reinterpret_cast( + grpc_transport_stream_from_call(call)); } diff --git a/test/core/util/histogram.cc b/test/core/util/histogram.cc index 6eb0342ede..f028ac404e 100644 --- a/test/core/util/histogram.cc +++ b/test/core/util/histogram.cc @@ -74,7 +74,8 @@ static double bucket_start(grpc_histogram* h, double x) { grpc_histogram* grpc_histogram_create(double resolution, double max_bucket_start) { - grpc_histogram* h = static_cast(gpr_malloc(sizeof(grpc_histogram))); + grpc_histogram* h = + static_cast(gpr_malloc(sizeof(grpc_histogram))); GPR_ASSERT(resolution > 0.0); GPR_ASSERT(max_bucket_start > resolution); h->sum = 0.0; @@ -88,7 +89,8 @@ grpc_histogram* grpc_histogram_create(double resolution, h->num_buckets = bucket_for_unchecked(h, max_bucket_start) + 1; GPR_ASSERT(h->num_buckets > 1); GPR_ASSERT(h->num_buckets < 100000000); - h->buckets = static_cast(gpr_zalloc(sizeof(uint32_t) * h->num_buckets)); + h->buckets = + static_cast(gpr_zalloc(sizeof(uint32_t) * h->num_buckets)); return h; } diff --git a/test/core/util/mock_endpoint.cc b/test/core/util/mock_endpoint.cc index 37a1b622e4..adeff18ef0 100644 --- a/test/core/util/mock_endpoint.cc +++ b/test/core/util/mock_endpoint.cc @@ -118,7 +118,8 @@ static const grpc_endpoint_vtable vtable = { grpc_endpoint* grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), grpc_resource_quota* resource_quota) { - grpc_mock_endpoint* m = static_cast(gpr_malloc(sizeof(*m))); + grpc_mock_endpoint* m = + static_cast(gpr_malloc(sizeof(*m))); m->base.vtable = &vtable; char* name; gpr_asprintf(&name, "mock_endpoint_%" PRIxPTR, (intptr_t)m); diff --git a/test/core/util/parse_hexstring.cc b/test/core/util/parse_hexstring.cc index 7ba6776bc2..cd64843bd3 100644 --- a/test/core/util/parse_hexstring.cc +++ b/test/core/util/parse_hexstring.cc @@ -42,7 +42,8 @@ grpc_slice parse_hexstring(const char* hexstring) { temp = static_cast(temp << 4) | static_cast(*p - '0'); nibbles++; } else if (*p >= 'a' && *p <= 'f') { - temp = static_cast(temp << 4) | static_cast(*p - 'a' + 10); + temp = + static_cast(temp << 4) | static_cast(*p - 'a' + 10); nibbles++; } if (nibbles == 2) { diff --git a/test/core/util/passthru_endpoint.cc b/test/core/util/passthru_endpoint.cc index 38c23aa978..5958216747 100644 --- a/test/core/util/passthru_endpoint.cc +++ b/test/core/util/passthru_endpoint.cc @@ -148,8 +148,9 @@ static void me_destroy(grpc_endpoint* ep) { static char* me_get_peer(grpc_endpoint* ep) { passthru_endpoint* p = (reinterpret_cast(ep))->parent; - return (reinterpret_cast(ep)) == &p->client ? gpr_strdup("fake:mock_client_endpoint") - : gpr_strdup("fake:mock_server_endpoint"); + return (reinterpret_cast(ep)) == &p->client + ? gpr_strdup("fake:mock_client_endpoint") + : gpr_strdup("fake:mock_server_endpoint"); } static int me_get_fd(grpc_endpoint* ep) { return -1; } @@ -190,7 +191,8 @@ void grpc_passthru_endpoint_create(grpc_endpoint** client, grpc_endpoint** server, grpc_resource_quota* resource_quota, grpc_passthru_endpoint_stats* stats) { - passthru_endpoint* m = static_cast(gpr_malloc(sizeof(*m))); + passthru_endpoint* m = + static_cast(gpr_malloc(sizeof(*m))); m->halves = 2; m->shutdown = 0; if (stats == nullptr) { @@ -208,8 +210,8 @@ void grpc_passthru_endpoint_create(grpc_endpoint** client, grpc_passthru_endpoint_stats* grpc_passthru_endpoint_stats_create() { grpc_passthru_endpoint_stats* stats = - static_cast(gpr_malloc( - sizeof(grpc_passthru_endpoint_stats))); + static_cast( + gpr_malloc(sizeof(grpc_passthru_endpoint_stats))); memset(stats, 0, sizeof(*stats)); gpr_ref_init(&stats->refs, 1); return stats; diff --git a/test/core/util/port.cc b/test/core/util/port.cc index 4690727337..303306de45 100644 --- a/test/core/util/port.cc +++ b/test/core/util/port.cc @@ -75,8 +75,8 @@ static void chose_port(int port) { atexit(free_chosen_ports); } num_chosen_ports++; - chosen_ports = - static_cast(gpr_realloc(chosen_ports, sizeof(int) * num_chosen_ports)); + chosen_ports = static_cast( + gpr_realloc(chosen_ports, sizeof(int) * num_chosen_ports)); chosen_ports[num_chosen_ports - 1] = port; } diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 886951c20d..9a4159944b 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -41,7 +41,8 @@ typedef struct freereq { } freereq; static void destroy_pops_and_shutdown(void* p, grpc_error* error) { - grpc_pollset* pollset = grpc_polling_entity_pollset(static_cast(p)); + grpc_pollset* pollset = + grpc_polling_entity_pollset(static_cast(p)); grpc_pollset_destroy(pollset); gpr_free(pollset); } @@ -71,7 +72,8 @@ void grpc_free_port_using_server(int port) { memset(&req, 0, sizeof(req)); memset(&rsp, 0, sizeof(rsp)); - grpc_pollset* pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset* pollset = + static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(pollset, &pr.mu); pr.pops = grpc_polling_entity_create_from_pollset(pollset); shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, @@ -158,7 +160,8 @@ static void got_port_from_server(void* arg, grpc_error* error) { gpr_sleep_until(gpr_time_add( gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis( - static_cast(1000.0 * (1 + pow(1.3, pr->retries) * rand() / RAND_MAX)), + static_cast( + 1000.0 * (1 + pow(1.3, pr->retries) * rand() / RAND_MAX)), GPR_TIMESPAN))); pr->retries++; req.host = pr->server; @@ -201,7 +204,8 @@ int grpc_pick_port_using_server(void) { grpc_core::ExecCtx exec_ctx; memset(&pr, 0, sizeof(pr)); memset(&req, 0, sizeof(req)); - grpc_pollset* pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset* pollset = + static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(pollset, &pr.mu); pr.pops = grpc_polling_entity_create_from_pollset(pollset); shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, diff --git a/test/core/util/reconnect_server.cc b/test/core/util/reconnect_server.cc index ea8fee499c..ad7cf42f71 100644 --- a/test/core/util/reconnect_server.cc +++ b/test/core/util/reconnect_server.cc @@ -76,8 +76,8 @@ static void on_connect(void* arg, grpc_endpoint* tcp, } else { if (last_colon == nullptr) { gpr_log(GPR_ERROR, "peer does not contain a ':'"); - } else if (strncmp(server->peer, peer, static_cast(last_colon - peer)) != - 0) { + } else if (strncmp(server->peer, peer, + static_cast(last_colon - peer)) != 0) { gpr_log(GPR_ERROR, "mismatched peer! %s vs %s", server->peer, peer); } gpr_free(peer); diff --git a/test/core/util/slice_splitter.cc b/test/core/util/slice_splitter.cc index e766c1982c..1f81d03d96 100644 --- a/test/core/util/slice_splitter.cc +++ b/test/core/util/slice_splitter.cc @@ -45,8 +45,8 @@ void grpc_split_slices(grpc_slice_split_mode mode, grpc_slice* src_slices, switch (mode) { case GRPC_SLICE_SPLIT_IDENTITY: *dst_slice_count = src_slice_count; - *dst_slices = - static_cast(gpr_malloc(sizeof(grpc_slice) * src_slice_count)); + *dst_slices = static_cast( + gpr_malloc(sizeof(grpc_slice) * src_slice_count)); for (i = 0; i < src_slice_count; i++) { (*dst_slices)[i] = src_slices[i]; grpc_slice_ref((*dst_slices)[i]); @@ -74,7 +74,8 @@ void grpc_split_slices(grpc_slice_split_mode mode, grpc_slice* src_slices, length += GRPC_SLICE_LENGTH(src_slices[i]); } *dst_slice_count = length; - *dst_slices = static_cast(gpr_malloc(sizeof(grpc_slice) * length)); + *dst_slices = + static_cast(gpr_malloc(sizeof(grpc_slice) * length)); length = 0; for (i = 0; i < src_slice_count; i++) { for (j = 0; j < GRPC_SLICE_LENGTH(src_slices[i]); j++) { diff --git a/test/core/util/subprocess_posix.cc b/test/core/util/subprocess_posix.cc index bb42ccbdeb..ab288d777f 100644 --- a/test/core/util/subprocess_posix.cc +++ b/test/core/util/subprocess_posix.cc @@ -52,7 +52,8 @@ gpr_subprocess* gpr_subprocess_create(int argc, const char** argv) { if (pid == -1) { return nullptr; } else if (pid == 0) { - exec_args = static_cast(gpr_malloc((static_cast(argc) + 1) * sizeof(char*))); + exec_args = static_cast( + gpr_malloc((static_cast(argc) + 1) * sizeof(char*))); memcpy(exec_args, argv, static_cast(argc) * sizeof(char*)); exec_args[argc] = nullptr; execv(exec_args[0], exec_args); diff --git a/test/core/util/test_config.cc b/test/core/util/test_config.cc index 5c01cfd070..53a6297d6e 100644 --- a/test/core/util/test_config.cc +++ b/test/core/util/test_config.cc @@ -365,15 +365,17 @@ int64_t grpc_test_slowdown_factor() { gpr_timespec grpc_timeout_seconds_to_deadline(int64_t time_s) { return gpr_time_add( gpr_now(GPR_CLOCK_MONOTONIC), - gpr_time_from_millis(grpc_test_slowdown_factor() * static_cast(1e3) * time_s, - GPR_TIMESPAN)); + gpr_time_from_millis( + grpc_test_slowdown_factor() * static_cast(1e3) * time_s, + GPR_TIMESPAN)); } gpr_timespec grpc_timeout_milliseconds_to_deadline(int64_t time_ms) { return gpr_time_add( gpr_now(GPR_CLOCK_MONOTONIC), - gpr_time_from_micros(grpc_test_slowdown_factor() * static_cast(1e3) * time_ms, - GPR_TIMESPAN)); + gpr_time_from_micros( + grpc_test_slowdown_factor() * static_cast(1e3) * time_ms, + GPR_TIMESPAN)); } void grpc_test_init(int argc, char** argv) { diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index 1216934630..cb2bc701fa 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -54,7 +54,8 @@ void test_tcp_server_init(test_tcp_server* server, void test_tcp_server_start(test_tcp_server* server, int port) { grpc_resolved_address resolved_addr; - struct sockaddr_in* addr = reinterpret_cast(resolved_addr.addr); + struct sockaddr_in* addr = + reinterpret_cast(resolved_addr.addr); int port_added; grpc_core::ExecCtx exec_ctx; diff --git a/test/core/util/trickle_endpoint.cc b/test/core/util/trickle_endpoint.cc index 87a8d9c216..f2efb049b4 100644 --- a/test/core/util/trickle_endpoint.cc +++ b/test/core/util/trickle_endpoint.cc @@ -152,7 +152,8 @@ static const grpc_endpoint_vtable vtable = {te_read, grpc_endpoint* grpc_trickle_endpoint_create(grpc_endpoint* wrap, double bytes_per_second) { - trickle_endpoint* te = static_cast(gpr_malloc(sizeof(*te))); + trickle_endpoint* te = + static_cast(gpr_malloc(sizeof(*te))); te->base.vtable = &vtable; te->wrapped = wrap; te->bytes_per_second = bytes_per_second; -- cgit v1.2.3