From a33eca933247e1184ced5f035c46817f75776a0b Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Thu, 14 May 2015 16:03:27 -0700
Subject: [PATCH] Guarantee tls_set returns the new value
---
include/grpc/support/tls.h | 2 +-
include/grpc/support/tls_pthread.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/grpc/support/tls.h b/include/grpc/support/tls.h
index 7a7143c6d1..156280e47d 100644
--- a/include/grpc/support/tls.h
+++ b/include/grpc/support/tls.h
@@ -54,7 +54,7 @@
Destroying a thread local:
gpr_tls_destroy(&foo);
- Setting a thread local:
+ Setting a thread local (returns new_value):
gpr_tls_set(&foo, new_value);
Accessing a thread local:
diff --git a/include/grpc/support/tls_pthread.h b/include/grpc/support/tls_pthread.h
index 249c4d1cab..07eb12e5bf 100644
--- a/include/grpc/support/tls_pthread.h
+++ b/include/grpc/support/tls_pthread.h
@@ -47,7 +47,7 @@ struct gpr_pthread_thread_local {
#define gpr_tls_init(tls) GPR_ASSERT(0 == pthread_key_create(&(tls)->key, NULL))
#define gpr_tls_destroy(tls) pthread_key_delete((tls)->key)
#define gpr_tls_set(tls, new_value) \
- GPR_ASSERT(pthread_setspecific((tls)->key, (void*)(new_value)) == 0)
+ (GPR_ASSERT(pthread_setspecific((tls)->key, (void*)(new_value)) == 0), (new_value))
#define gpr_tls_get(tls) ((gpr_intptr)pthread_getspecific((tls)->key))
#endif
--
GitLab