Properly initialize TLS var

tomy145 · Feb 24, 2016 · 7c0715a · 7c0715a
1 parent 91edc13
commit 7c0715a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
+0 −54		.travis.yml
+1 −10		CHANGELOG.txt
+8 −14		README.txt
+2 −1		examples/cmake_simple/CMakeLists.txt
+3 −6		examples/cmake_simple/simple.c
+0 −2		examples/cmake_simple/simple.proto
+0 −2		examples/network_server/fileproto.proto
+3 −6		examples/simple/simple.c
+0 −2		examples/simple/simple.proto
+0 −2		examples/using_double_on_avr/doubleproto.proto
+0 −2		examples/using_union_messages/unionproto.proto
+24 −33		extra/FindNanopb.cmake
+434 −537		generator/nanopb_generator.py
+0 −3		generator/proto/nanopb.proto
+2 −1		generator/protoc-gen-nanopb
+2 −3		pb.h
+1 −2		pb_decode.c
+0 −3		tests/alltypes/alltypes.proto
+0 −2		tests/backwards_compatibility/alltypes_legacy.proto
+0 −2		tests/callbacks/callbacks.proto
+0 −2		tests/common/person.proto
+0 −2		tests/common/unittestproto.proto
+0 −2		tests/cyclic_messages/cyclic.proto
+0 −12		tests/enum_sizes/SConscript
+0 −86		tests/enum_sizes/enumsizes.proto
+0 −72		tests/enum_sizes/enumsizes_unittests.c
+0 −2		tests/extensions/extensions.proto
+0 −2		tests/field_size_16/alltypes.proto
+0 −2		tests/field_size_32/alltypes.proto
+6 −13		tests/fuzztest/SConscript
+1 −1		tests/fuzztest/fuzzstub.c
+0 −101		tests/fuzztest/generate_message.c
+0 −2		tests/intsizes/intsizes.proto
+0 −2		tests/message_sizes/messages1.proto
+0 −2		tests/message_sizes/messages2.proto
+0 −2		tests/missing_fields/missing_fields.proto
+3 −3		tests/multiple_files/SConscript
+0 −18		tests/multiple_files/callbacks.proto
+9 −0		tests/multiple_files/callbacks2.proto
+0 −1		tests/multiple_files/multifile1.options
+0 −22		tests/multiple_files/multifile2.proto
+2 −12		tests/multiple_files/test_multiple_files.c
+0 −2		tests/no_messages/no_messages.proto
+0 −2		tests/oneof/oneof.proto
+0 −2		tests/options/options.proto
+7 −9		tests/package_name/SConscript
+0 −2		tests/regression/issue_118/enumdef.proto
+0 −2		tests/regression/issue_118/enumuse.proto
+0 −2		tests/regression/issue_125/extensionbug.proto
+0 −2		tests/regression/issue_141/testproto.proto
+0 −2		tests/regression/issue_145/comments.proto
+0 −13		tests/regression/issue_166/SConscript
+0 −43		tests/regression/issue_166/enum_encoded_size.c
+0 −18		tests/regression/issue_166/enums.proto
+0 −16		tests/regression/issue_172/SConscript
+0 −9		tests/regression/issue_172/msg_size.c
+0 −1		tests/regression/issue_172/submessage/submessage.options
+0 −4		tests/regression/issue_172/submessage/submessage.proto
+0 −6		tests/regression/issue_172/test.proto
+0 −1		tests/special_characters/funny-proto+name has.characters.proto