Unify cint root mutex

cint/cintex/src/Cintex.cxx

@@ -25,6 +25,8 @@
 #include <iostream>
 
 #include "TROOT.h"
+#include "TInterpreter.h" //gCINTMutex
+#include "TVirtualMutex.h"
 
 using namespace ROOT::Reflex;
 using namespace ROOT::Cintex;
@@ -187,6 +189,7 @@ namespace ROOT {
       }
 
       void Callback::operator () ( const Type& t ) {
+         R__LOCKGUARD2(gCINTMutex);
          ArtificialSourceFile asf;
          int autoload = G__set_class_autoloading(0); // To avoid recursive loads
          if ( t.IsClass() || t.IsStruct() ) {
@@ -205,6 +208,7 @@ namespace ROOT {
       }
 
       void Callback::operator () ( const Member& m ) {
+         R__LOCKGUARD2(gCINTMutex);
          ArtificialSourceFile asf;
          int autoload = G__set_class_autoloading(0); // To avoid recursive loads
          if ( m.IsFunctionMember() ) {

cint/cintex/src/ROOTClassEnhancer.cxx

@@ -21,6 +21,7 @@
 #include "TClassStreamer.h"
 #include "TCollectionProxyInfo.h"
 #include "TVirtualCollectionProxy.h"
+#include "TVirtualMutex.h"
 #include "TMemberInspector.h"
 #include "RVersion.h"
 #include "Reflex/Reflex.h"
@@ -35,6 +36,9 @@
 #include <sstream>
 #include <memory>
 #include <string>
+#if __cplusplus > 199711L
+#include <atomic>
+#endif
 
 #if ROOT_VERSION_CODE >= ROOT_VERSION(5,1,1)
 #include "TVirtualIsAProxy.h"
@@ -44,6 +48,8 @@ using namespace ROOT::Reflex;
 using namespace ROOT::Cintex;
 using namespace std;
 
+static TVirtualMutex* gCintexMutex = 0;
+
 namespace ROOT { namespace Cintex {
 
    class IsAProxy;
@@ -52,7 +58,11 @@ namespace ROOT { namespace Cintex {
 
       Type                     fType;
       string                   fName;
+#if __cplusplus > 199711L
+     std::atomic<TClass*>      fTclass;
+#else
       TClass*                  fTclass;
+#endif
       TClass*                  fLastClass;
       std::map<const std::type_info*,TClass*> fSub_types;
       const  std::type_info*   fLastType;
@@ -174,7 +184,10 @@ namespace ROOT { namespace Cintex {
       // Constructor.
       fType = CleanType(t);
       fName = CintName(fType);
-      rootEnhancerInfos().push_back(this);
+      {
+	R__LOCKGUARD2(gCintexMutex);
+	rootEnhancerInfos().push_back(this);
+      }
       fMyType = &t.TypeInfo();
       fIsVirtual = TypeGet().IsVirtual();
       fClassInfo = 0;
@@ -361,37 +374,46 @@ namespace ROOT { namespace Cintex {
       if ( ! obj || ! fIsVirtual )  {
          return Tclass();
       }
-      else  {
-         // Avoid the case that the first word is a virtual_base_offset_table instead of
-         // a virtual_function_table
-         long Offset = **(long**)obj;
-         if ( Offset == 0 ) return Tclass();
 
-         DynamicStruct_t* p = (DynamicStruct_t*)obj;
-         const std::type_info& typ = typeid(*p);
+      // Avoid the case that the first word is a virtual_base_offset_table instead of
+      // a virtual_function_table
+      long Offset = **(long**)obj;
+      if ( Offset == 0 ) return Tclass();
 
-         if ( &typ == fMyType )  {
-            return Tclass();
-         }
-         else if ( &typ == fLastType )  {
+      DynamicStruct_t* p = (DynamicStruct_t*)obj;
+      const std::type_info& typ = typeid(*p);
+
+      if ( &typ == fMyType )  {
+	return Tclass();
+      }
+      {
+	 R__LOCKGUARD2(gCintexMutex);
+         if ( &typ == fLastType )  {
             return fLastClass;
          }
+
          // Check if TypeNth is already in sub-class cache
-         else if ( 0 != (fLastClass=fSub_types[&typ]) )  {
+	 TClass* findClass = fSub_types[&typ];
+         if ( 0 != findClass )  {
+ 	    fLastClass = findClass;
             fLastType = &typ;
+	    return fLastClass;
          }
-         // Last resort: lookup root class
-         else   {
-            std::string nam;
-            Type t = Type::ByTypeInfo(typ);
-            if (t) nam = CintName(t);
-            else   nam = CintName(Tools::Demangle(typ));
-            fLastClass = ROOT::GetROOT()->GetClass(nam.c_str());
-            fSub_types[fLastType=&typ] = fLastClass;
-         }
+      }
+      // Last resort: lookup root class
+      TClass* returnValue;
+      std::string nam;
+      Type t = Type::ByTypeInfo(typ);
+      if (t) nam = CintName(t);
+      else   nam = CintName(Tools::Demangle(typ));
+      returnValue = ROOT::GetROOT()->GetClass(nam.c_str());
+      {
+         R__LOCKGUARD2(gCintexMutex);
+	 fLastClass = returnValue;
+	 fSub_types[fLastType=&typ] = fLastClass;
       }
       //std::cout << "Cintex: IsA:" << TypeNth.Name(SCOPED) << " dynamic:" << dtype.Name(SCOPED) << std::endl;
-      return fLastClass;
+      return returnValue;
    }
 
    TClass* ROOTClassEnhancerInfo::Default_CreateClass( Type typ, ROOT::TGenericClassInfo* info)  {

cint/reflex/python/genreflex/gendict.py

@@ -2654,6 +2654,8 @@ def ClassDefImplementation(selclasses, self) :
   returnValue += '#endif\n'
   returnValue += '#include "TClass.h"\n'
   returnValue += '#include "TMemberInspector.h"\n'
+  returnValue += '#include "TInterpreter.h"\n'
+  returnValue += '#include "TVirtualMutex.h"\n'
   returnValue += '#include "RtypesImp.h"\n' # for GenericShowMembers etc
   returnValue += '#include "TIsAProxy.h"\n'
   haveClassDef = 0
@@ -2725,8 +2727,11 @@ def ClassDefImplementation(selclasses, self) :
         specclname = clname
 
       returnValue += template + 'TClass* ' + specclname + '::Class() {\n'
-      returnValue += '   if (!fgIsA)\n'
-      returnValue += '      fgIsA = TClass::GetClass("' + clname[2:] + '");\n'
+      returnValue += '   if (!fgIsA) {\n'
+      returnValue += '      R__LOCKGUARD2(gCINTMutex);'
+      returnValue += '      if (!fgIsA)\n'
+      returnValue += '         fgIsA = TClass::GetClass("' + clname[2:] + '");\n'
+      returnValue += '   }\n'
       returnValue += '   return fgIsA;\n'
       returnValue += '}\n'
       returnValue += template + 'const char * ' + specclname + '::Class_Name() {return "' + clname[2:]  + '";}\n'
@@ -2814,7 +2819,11 @@ def ClassDefImplementation(selclasses, self) :
       returnValue += '      b.WriteClassBuffer(' + clname  + '::Class(),this);\n'
       returnValue += '   }\n'
       returnValue += '}\n'
-      returnValue += template + 'TClass* ' + specclname + '::fgIsA = 0;\n'
+      #must strip of leading '::' to avoid ambiguity with embedded type in atomic_TClass_ptr
+      if len(specclname) > 2:
+        if specclname[:2] == '::':
+          specclname = specclname[2:]        
+      returnValue += template + 'atomic_TClass_ptr ' + specclname + '::fgIsA(0);\n'
       returnValue += namespacelevel * '}' + '\n'
     elif derivesFromTObject :
       # no fgIsA etc members but derives from TObject!

config/Makefile.linux

@@ -36,7 +36,7 @@ COMPILER      = gnu
 
 # Linker:
 LD            = g++
-LDFLAGS       = -m32 $(OPT) $(EXTRA_LDFLAGS) -Wl,--no-undefined -Wl,--as-needed
+LDFLAGS       = -m32 -Wl,--hash-style=gnu $(OPT) $(EXTRA_LDFLAGS)
 SOFLAGS       = -shared -Wl,-soname,
 SOEXT         = so
 

config/Makefile.linuxarm

@@ -14,13 +14,16 @@ else
 OPT           = $(OPTFLAGS)
 NOOPT         =
 endif
+ifeq ($(CXX11),yes)
+CXX11FLAGS    = -std=c++11 -Wno-deprecated-declarations
+endif
 
 # Compiler:
 CXX           = g++
 CC            = gcc
-CXXFLAGS      = -Wall -fsigned-char -fPIC $(EXTRA_CXXFLAGS)
+CXXFLAGS      = -Wall -fsigned-char -fPIC $(EXTRA_CXXFLAGS) $(CXX11FLAGS)
 CFLAGS        = -Wall -fsigned-char -fPIC $(EXTRA_CFLAGS)
-CINTCXXFLAGS  = -Wall -fsigned-char -fPIC $(EXTRA_CXXFLAGS) \
+CINTCXXFLAGS  = -Wall -fsigned-char -fPIC $(EXTRA_CXXFLAGS) $(CXX11FLAGS) \
                 -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
                 -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO
 CINTCFLAGS    = -Wall -fsigned-char -fPIC $(EXTRA_CFLAGS) \

config/Makefile.linuxx8664gcc

@@ -39,7 +39,7 @@ COMPILER      = gnu
 
 # Linker:
 LD            = g++
-LDFLAGS       = -m64 $(OPT) $(EXTRA_LDFLAGS) -Wl,--no-undefined -Wl,--as-needed
+LDFLAGS       = -m64 -Wl,--hash-style=gnu $(OPT) $(EXTRA_LDFLAGS)
 SOFLAGS       = -shared -Wl,-soname,
 SOEXT         = so
 

configure

@@ -380,14 +380,14 @@ check_libcompat() {
 
     case $arch in
     macosx)
-        logmsg " lipo -info $chklibcompat | grep ' i386'"
-        if lipo -info $chklibcompat | grep ' i386' > /dev/null 2>& 1 ; then
+        logmsg " otool -fhv $chklibcompat | grep -i ' i386'"
+        if otool -fhv $chklibcompat | grep -i ' i386' > /dev/null 2>& 1 ; then
             ret=1
         fi
         ;;
     macosx64)
-        logmsg " lipo -info $chklibcompat | grep ' x86_64'"
-        if lipo -info $chklibcompat | grep ' x86_64' > /dev/null 2>& 1 ; then
+        logmsg " otool -fhv $chklibcompat | grep -i ' x86_64'"
+        if otool -fhv $chklibcompat | grep -i ' x86_64' > /dev/null 2>& 1 ; then
             ret=1
         fi
         ;;
@@ -2851,7 +2851,7 @@ result "$enable_builtin_pcre"
 #
 if test "x$enable_builtin_zlib" = "xno" ; then
     check_header "zlib.h" "" \
-        $ZLIB ${ZLIB:+$ZLIB/include} \
+        $ZLIB_ROOT/include $ZLIB ${ZLIB:+$ZLIB/include} \
         ${finkdir:+$finkdir/include} \
         /usr/local/include /usr/include/zlib /usr/local/include/zlib \
         /opt/zlib/include /usr/include
@@ -2863,7 +2863,7 @@ if test "x$enable_builtin_zlib" = "xno" ; then
     fi
 
     check_library "libz" "$enable_shared" "" \
-        $ZLIB ${ZLIB:+$ZLIB/lib} \
+        $ZLIB_ROOT/lib $ZLIB ${ZLIB:+$ZLIB/lib} \
         /usr/local/zlib/lib /usr/local/lib \
         /usr/lib/zlib /usr/local/lib/zlib /usr/zlib/lib /usr/lib \
         /usr/zlib /usr/local/zlib /opt/zlib /opt/zlib/lib
@@ -4398,20 +4398,20 @@ if test ! "x$enable_asimage" = "xno" ; then
     # for a system library, then see if we have various headers needed.
     if test "x$enable_builtin_afterimage" = "xyes" && test ! "x$enable_cocoa" = "xyes"; then
        check_header "jpeglib.h" "" \
-          $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
+          $LIBJPG_ROOT/include $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
           ${finkdir:+$finkdir/include} \
           /usr/local/include /usr/include /opt/include
        asjpegincdir=$found_dir
        check_header "png.h" "" \
-          $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
+          $LIBPNG_ROOT/include $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
           ${ASPNG:+$ASPNG/include} \
           ${finkdir:+$finkdir/include} \
           /usr/local/include /usr/X11/include /usr/include \
           /usr/local/include/libpng /opt/include
        aspngincdir=$found_dir
        if test ! "x$enable_astiff" = "xno" ; then
            check_header "tiffio.h" "" \
-               $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
+               $LIBTIFF_ROOT/include $ASIMAGE ${ASIMAGE:+$ASIMAGE/include} \
                ${finkdir:+$finkdir/include} \
                /usr/local/include /usr/include /opt/include
            astiffincdir=$found_dir
@@ -4427,11 +4427,14 @@ if test ! "x$enable_asimage" = "xno" ; then
        # add libpng which needs libz
        if test ! "x$enable_astiff" = "xno" ; then
            aslibs="libjpeg libtiff libz libpng"
+           extra_libtiff_path=$LIBTIFF_ROOT/lib
        else
            aslibs="libjpeg libz libpng"
+           extra_libtiff_path=
        fi
        for k in $aslibs ; do
            check_library $k "$enable_shared" "" \
+               $extra_libtiff_path $LIBJPG_ROOT/lib $LIBPNG_ROOT/lib $ZLIB_ROOT/lib \
                $ASIMAGE ${ASIMAGE:+$ASIMAGE/lib} ${ASPNG:+$ASPNG/lib} \
                ${finkdir:+$finkdir/lib} \
                /usr/local/lib /usr/X11/lib /usr/lib /opt/lib

core/base/inc/Rtypes.h

@@ -34,7 +34,9 @@
 #include <string.h>
 #include <snprintf.h>   // part of stdio.h on systems that have it
 #include <strlcpy.h>    // part of string.h on systems that have it
-
+#if __cplusplus > 199711L
+#include <atomic>
+#endif
 
 
 //---- forward declared class types --------------------------------------------
@@ -268,12 +270,17 @@ namespace ROOT {
 #include "TGenericClassInfo.h"
 #endif
 
+#if __cplusplus > 199711L
+typedef std::atomic<TClass*> atomic_TClass_ptr;
+#else
+typedef TClass* atomic_TClass_ptr;
+#endif
 // Common part of ClassDef definition.
 // DeclFileLine() is not part of it since CINT uses that as trigger for
 // the class comment string.
 #define _ClassDef_(name,id) \
 private: \
-   static TClass *fgIsA; \
+   static atomic_TClass_ptr fgIsA; \
 public: \
    static TClass *Class(); \
    static const char *Class_Name(); \
@@ -290,7 +297,7 @@ public: \
 // Version without any virtual functions.
 #define _ClassDefNV_(name,id) \
 private: \
-static TClass *fgIsA; \
+static atomic_TClass_ptr fgIsA; \
 public: \
 static TClass *Class(); \
 static const char *Class_Name(); \

core/base/inc/TROOT.h

@@ -241,7 +241,7 @@ friend class TCintWithCling;
    Long_t            ProcessLine(const char *line, Int_t *error = 0);
    Long_t            ProcessLineSync(const char *line, Int_t *error = 0);
    Long_t            ProcessLineFast(const char *line, Int_t *error = 0);
-   Bool_t            ReadingObject() const { /* Deprecated (will be removed in next release) */ return fReadingObject; }
+   Bool_t            ReadingObject() const;
    void              RefreshBrowsers();
    void              RemoveClass(TClass *);
    void              Reset(Option_t *option="");
@@ -258,7 +258,7 @@ friend class TCintWithCling;
    void              SetEscape(Bool_t flag = kTRUE) { fEscape = flag; }
    void              SetLineIsProcessing() { fLineIsProcessing++; }
    void              SetLineHasBeenProcessed() { if (fLineIsProcessing) fLineIsProcessing--; }
-   void              SetReadingObject(Bool_t flag = kTRUE) { fReadingObject = flag; }
+   void              SetReadingObject(Bool_t flag = kTRUE);
    void              SetMustClean(Bool_t flag = kTRUE) { fMustClean=flag; }
    void              SetSelectedPrimitive(const TObject *obj) { fPrimitive = obj; }
    void              SetSelectedPad(TVirtualPad *pad) { fSelectPad = pad; }

core/base/inc/TStorage.h

@@ -34,14 +34,14 @@ typedef char *(*ReAllocCharFun_t)(char*, size_t, size_t);
 class TStorage {
 
 private:
-   static ULong_t        fgHeapBegin;          // begin address of heap
-   static ULong_t        fgHeapEnd;            // end address of heap
    static size_t         fgMaxBlockSize;       // largest block allocated
    static FreeHookFun_t  fgFreeHook;           // function called on free
    static void          *fgFreeHookData;       // data used by this function
    static ReAllocFun_t   fgReAllocHook;        // custom ReAlloc
    static ReAllocCFun_t  fgReAllocCHook;       // custom ReAlloc with length check
    static Bool_t         fgHasCustomNewDelete; // true if using ROOT's new/delete
+   static const UInt_t   kObjectAllocMemValue = 0x99999999;
+                                               // magic number for ObjectAlloc
 
 public:
    virtual ~TStorage() { }
@@ -77,16 +77,13 @@ class TStorage {
    static void   AddToHeap(ULong_t begin, ULong_t end);
    static Bool_t IsOnHeap(void *p);
 
+   static Bool_t FilledByObjectAlloc(UInt_t* member);
+
    ClassDef(TStorage,0)  //Storage manager class
 };
 
 #ifndef WIN32
-inline void TStorage::AddToHeap(ULong_t begin, ULong_t end)
-   { if (begin < fgHeapBegin) fgHeapBegin = begin;
-     if (end   > fgHeapEnd)   fgHeapEnd   = end; }
-
-inline Bool_t TStorage::IsOnHeap(void *p)
-   { return (ULong_t)p >= fgHeapBegin && (ULong_t)p < fgHeapEnd; }
+inline Bool_t TStorage::FilledByObjectAlloc(UInt_t *member) { return *member == kObjectAllocMemValue; }
 
 inline size_t TStorage::GetMaxBlockSize() { return fgMaxBlockSize; }