Merge pull request #5390 from ctiller/tls_init

Properly initialize TLS var
pull/5396/head
Vijay Pai 9 years ago
commit cbff80e0fe
  1. 2
      src/core/client_config/subchannel_index.c
  2. 2
      third_party/nanopb

@ -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,

@ -1 +1 @@
Subproject commit f8ac463766281625ad710900479130c7fcb4d63b
Subproject commit 5497a1dfc91a86965383cdd1652e348345400435
Loading…
Cancel
Save