diff options
| author |  Vijay Pai <vpai@google.com> | 2016-02-24 11:11:39 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-02-24 11:11:39 -0800 |
| commit | cbff80e0fe8b056048037d5b8dec812725630647 (patch) | |
| tree | 9517a3245c6de76babdace349a53b1c078142f4c | |
| parent | 86b258c462c68a4efa66d3ad0eeacb5f7c7e9992 (diff) | |
| parent | 7c0715af6c5ee47fe786e9b63400961f0c3ae220 (diff) | |
Merge pull request #5390 from ctiller/tls_init
Properly initialize TLS var
| -rw-r--r-- | src/core/client_config/subchannel_index.c | 2 | ||||
| m--------- | third_party/nanopb | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/core/client_config/subchannel_index.c b/src/core/client_config/subchannel_index.c index f78a7fd588..3f948998f9 100644 --- a/src/core/client_config/subchannel_index.c +++ b/src/core/client_config/subchannel_index.c @@ -149,11 +149,13 @@ static const gpr_avl_vtable subchannel_avl_vtable = { void grpc_subchannel_index_init(void) { g_subchannel_index = gpr_avl_create(&subchannel_avl_vtable); gpr_mu_init(&g_mu); + gpr_tls_init(&subchannel_index_exec_ctx); } void grpc_subchannel_index_shutdown(void) { gpr_mu_destroy(&g_mu); gpr_avl_unref(g_subchannel_index); + gpr_tls_destroy(&subchannel_index_exec_ctx); } grpc_subchannel *grpc_subchannel_index_find(grpc_exec_ctx *exec_ctx, diff --git a/third_party/nanopb b/third_party/nanopb -Subproject f8ac463766281625ad710900479130c7fcb4d63 +Subproject 5497a1dfc91a86965383cdd1652e34834540043 |