diff options
author | yashkt <yashkt@google.com> | 2017-12-04 09:41:12 -0800 |
---|---|---|
committer | yashkt <yashkt@google.com> | 2017-12-04 09:41:12 -0800 |
commit | d9f640719057ab008b493076fadd9ab773ead10c (patch) | |
tree | ee674026030ce124037c1a887e53ddc1cfe76659 /src/core/ext | |
parent | 36522e9f8008cade840b75f53164602719577bc6 (diff) | |
parent | c1b64d9c17aed4d3a055b33fd3f210ba1aaf0f8d (diff) |
Merge master into execctx after removal of assert in tls_gcc
Diffstat (limited to 'src/core/ext')
-rw-r--r-- | src/core/ext/filters/client_channel/client_channel.cc | 2 | ||||
-rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.cc | 1 | ||||
-rw-r--r-- | src/core/ext/transport/chttp2/transport/writing.cc | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index b80be2b651..727210bbd4 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -426,7 +426,7 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { // once at any given time. lb_policy_name_changed = chand->info_lb_policy_name == nullptr || - strcmp(chand->info_lb_policy_name, lb_policy_name) != 0; + gpr_stricmp(chand->info_lb_policy_name, lb_policy_name) != 0; if (chand->lb_policy != nullptr && !lb_policy_name_changed) { // Continue using the same LB policy. Update with new addresses. lb_policy_updated = true; diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index bebacf1eda..1380b3756d 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -517,6 +517,7 @@ static void init_transport(grpc_chttp2_transport* t, /* No pings allowed before receiving a header or data frame. */ t->ping_state.pings_before_data_required = 0; t->ping_state.is_delayed_ping_timer_set = false; + t->ping_state.last_ping_sent_time = GRPC_MILLIS_INF_PAST; t->ping_recv_state.last_ping_recv_time = GRPC_MILLIS_INF_PAST; t->ping_recv_state.ping_strikes = 0; diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 33c2707ac4..3310f35f5f 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -79,8 +79,11 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { /* not enough elapsed time between successive pings */ if (grpc_http_trace.enabled() || grpc_bdp_estimator_trace.enabled()) { gpr_log(GPR_DEBUG, - "%s: Ping delayed [%p]: not enough time elapsed since last ping", - t->is_client ? "CLIENT" : "SERVER", t->peer_string); + "%s: Ping delayed [%p]: not enough time elapsed since last ping. " + " Last ping %f: Next ping %f: Now %f", + t->is_client ? "CLIENT" : "SERVER", t->peer_string, + (double)t->ping_state.last_ping_sent_time, + (double)next_allowed_ping, (double)now); } if (!t->ping_state.is_delayed_ping_timer_set) { t->ping_state.is_delayed_ping_timer_set = true; @@ -89,6 +92,7 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { } return; } + pq->inflight_id = t->ping_ctr; t->ping_ctr++; GRPC_CLOSURE_LIST_SCHED(&pq->lists[GRPC_CHTTP2_PCL_INITIATE]); |