Make function static return values thread_safe

Funciton level statics which are being used as return values from the function are changed to thread_local. This is needed to avoid multiple threads changing the values while they are being used.
Dr15Jones · Sep 24, 2014 · 61ffa7f · 61ffa7f
1 parent 6849d19
commit 61ffa7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/cint/cint/src/Method.cxx b/cint/cint/src/Method.cxx
@@ -19,6 +19,12 @@
 
 extern "C" int G__xrefflag;
 
+#if __cplusplus >= 201103L
+#define THREAD_LOCAL thread_local
+#else
+#define THREAD_LOCAL
+#endif
+
 /*********************************************************************
 * class G__MethodInfo
 *
@@ -163,7 +169,7 @@ struct G__ifunc_table* Cint::G__MethodInfo::ifunc()
 ///////////////////////////////////////////////////////////////////////////
 const char* Cint::G__MethodInfo::Title() 
 {
-  static char buf[G__INFO_TITLELEN];
+  THREAD_LOCAL static char buf[G__INFO_TITLELEN];
   buf[0]='\0';
   if(IsValid()) {
     struct G__ifunc_table_internal *ifunc2;
@@ -594,7 +600,7 @@ int Cint::G__MethodInfo::IsBusy()
 ///////////////////////////////////////////////////////////////////////////
 char* Cint::G__MethodInfo::GetPrototype()
 {
-  static G__FastAllocString *buf_ptr = new G__FastAllocString(G__LONGLINE);
+  THREAD_LOCAL static G__FastAllocString *buf_ptr = new G__FastAllocString(G__LONGLINE);
   G__FastAllocString &buf(*buf_ptr);  // valid until the next call of GetPrototype, just like any static
 
   if (!IsValid()) return 0;

diff --git a/cint/cint/src/Type.cxx b/cint/cint/src/Type.cxx
@@ -18,6 +18,11 @@
 #include "common.h"
 #include "FastAllocString.h"
 
+#if __cplusplus >= 201103L
+#define THREAD_LOCAL thread_local
+#else
+#define THREAD_LOCAL
+#endif
 /*********************************************************************
 * class G__TypeInfo
 * 
@@ -117,7 +122,7 @@ int Cint::G__TypeInfo::operator!=(const G__TypeInfo& a)
 ///////////////////////////////////////////////////////////////////////////
 const char* Cint::G__TypeInfo::TrueName() 
 {
-   static G__FastAllocString *buf_ptr = new G__FastAllocString(G__ONELINE);
+   THREAD_LOCAL static G__FastAllocString *buf_ptr = new G__FastAllocString(G__ONELINE);
    G__FastAllocString &buf(*buf_ptr);
 
    buf = G__type2string((int)type,(int)tagnum,-1,(int)reftype,(int)isconst);
@@ -126,7 +131,7 @@ const char* Cint::G__TypeInfo::TrueName()
 ///////////////////////////////////////////////////////////////////////////
 const char* Cint::G__TypeInfo::Name() 
 {
-   static G__FastAllocString *buf_ptr = new G__FastAllocString(G__ONELINE);
+   THREAD_LOCAL static G__FastAllocString *buf_ptr = new G__FastAllocString(G__ONELINE);
    G__FastAllocString &buf(*buf_ptr);
 
    buf = G__type2string((int)type,(int)tagnum,(int)typenum,(int)reftype