diff options
| author |  apolcyn <apolcyn@google.com> | 2017-10-20 17:40:43 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-20 17:40:43 -0700 |
| commit | c563b583cb9b7fecc33971581368796d2df4759d (patch) | |
| tree | a8aed882a7e40fc553d6a9853d3c5601ad1b7a31 /src | |
| parent | 5f818c58cf95900458d1e0a52451500f8630d3a8 (diff) | |
| parent | 2004e396a3e357f71180a6b8d85172c5bd5e8023 (diff) | |
Merge pull request #13031 from apolcyn/fix_connectivity_state_data_race
Fix data race in watch connectivity state callback
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/filters/client_channel/client_channel.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index 22c2bc8880..d9695bbf8a 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -1599,8 +1599,8 @@ int grpc_client_channel_num_external_connectivity_watchers( return count; } -static void on_external_watch_complete(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_external_watch_complete_locked(grpc_exec_ctx *exec_ctx, + void *arg, grpc_error *error) { external_connectivity_watcher *w = (external_connectivity_watcher *)arg; grpc_closure *follow_up = w->on_complete; grpc_polling_entity_del_from_pollset_set(exec_ctx, &w->pollent, @@ -1619,8 +1619,8 @@ static void watch_connectivity_state_locked(grpc_exec_ctx *exec_ctx, void *arg, if (w->state != NULL) { external_connectivity_watcher_list_append(w->chand, w); GRPC_CLOSURE_RUN(exec_ctx, w->watcher_timer_init, GRPC_ERROR_NONE); - GRPC_CLOSURE_INIT(&w->my_closure, on_external_watch_complete, w, - grpc_schedule_on_exec_ctx); + GRPC_CLOSURE_INIT(&w->my_closure, on_external_watch_complete_locked, w, + grpc_combiner_scheduler(w->chand->combiner)); grpc_connectivity_state_notify_on_state_change( exec_ctx, &w->chand->state_tracker, w->state, &w->my_closure); } else { |