Added TMCtls.h with thread local storage typedefs for platforms which support TLS

(according to Geant4 tls.hh and G4Threading.hh)

montecarlo/vmc/inc/TMCtls.h

+// @(#)root/vmc:$Id$
+// Author: Ivana Hrivnacova, 29/04/2014
+
+/*************************************************************************
+ * Copyright (C) 2014, Rene Brun and Fons Rademakers.                    *
+ * All rights reserved.                                                  *
+ *                                                                       *
+ * For the licensing terms see $ROOTSYS/LICENSE.                         *
+ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+ *************************************************************************/
+
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+
+#ifndef ROOT_TMCtls
+#define ROOT_TMCtls
+
+// Thread Local Storage typedefs
+//
+// According to Geant4 tls.hh and G4Threading.hh
+
+// Always build with thread support but keep a possibility to introduce
+// a build option
+#define VMC_MULTITHREADED 1
+ 
+#if ( defined (VMC_MULTITHREADED) ) 
+  #if ( ( defined(__MACH__) && defined(__clang__) && defined(__x86_64__) ) || \
+        ( defined(__MACH__) && defined(__GNUC__) && __GNUC__>=4 && __GNUC_MINOR__>=7 ) || \
+        defined(__linux__) || defined(_AIX) ) && ( !defined(__CINT__) )
+      //  Multi-threaded build: for POSIX systems 
+      #include <pthread.h>
+      #define TMCThreadLocal __thread
+  #else
+      //#  error "No Thread Local Storage (TLS) technology supported for this platform. Use sequential build !"
+      #define TMCThreadLocal 
+  #endif
+#else
+  #define TMCThreadLocal 
+#endif
+
+#endif //ROOT_TMCtls

montecarlo/vmc/inc/TVirtualMC.h

@@ -24,6 +24,7 @@
 #include "TMCProcess.h"
 #include "TMCParticleType.h"
 #include "TMCOptical.h"
+#include "TMCtls.h"
 #include "TVirtualMCApplication.h"
 #include "TVirtualMCStack.h"
 #include "TVirtualMCDecayer.h"
@@ -32,10 +33,6 @@
 #include "TString.h"
 #include "TError.h"
 
-#if defined(__linux__) && !defined(__CINT__)
-#include <pthread.h>
-#endif
-
 class TLorentzVector;
 class TGeoHMatrix;
 class TArrayI;
@@ -866,10 +863,10 @@ private:
    TVirtualMC(const TVirtualMC &mc);
    TVirtualMC & operator=(const TVirtualMC &);
 
-#if defined(__linux__) && !defined(__CINT__)
-   static __thread TVirtualMC*  fgMC; // Monte Carlo singleton instance
+#if !defined(__CINT__)
+   static TMCThreadLocal TVirtualMC*  fgMC; // Monte Carlo singleton instance
 #else
-   static          TVirtualMC*  fgMC; // Monte Carlo singleton instance
+   static                TVirtualMC*  fgMC; // Monte Carlo singleton instance
 #endif
 
    TVirtualMCStack*    fStack;   //! Particles stack
@@ -880,10 +877,10 @@ private:
    ClassDef(TVirtualMC,1)  //Interface to Monte Carlo
 };
 
-#if defined(__linux__) && !defined(__CINT__)
-R__EXTERN __thread TVirtualMC *gMC;
+#if !defined(__CINT__)
+R__EXTERN TMCThreadLocal TVirtualMC *gMC;
 #else
-R__EXTERN          TVirtualMC *gMC;
+R__EXTERN                TVirtualMC *gMC;
 #endif
 
 #endif //ROOT_TVirtualMC

montecarlo/vmc/inc/TVirtualMCApplication.h

@@ -25,9 +25,7 @@
 #include "TMath.h"
 #endif
 
-#if defined(__linux__) && !defined(__CINT__)
-#include <pthread.h>
-#endif
+#include "TMCtls.h"
 
 class TVirtualMCApplication : public TNamed {
 
@@ -112,10 +110,10 @@ public:
 
 private:
    // static data members
-#if defined(__linux__) && !defined(__CINT__)
-   static __thread TVirtualMCApplication* fgInstance; // singleton instance
+#if !defined(__CINT__)
+   static TMCThreadLocal TVirtualMCApplication* fgInstance; // singleton instance
 #else
-   static          TVirtualMCApplication* fgInstance; // singleton instance
+   static                TVirtualMCApplication* fgInstance; // singleton instance
 #endif
 
    ClassDef(TVirtualMCApplication,1)  //Interface to MonteCarlo application

montecarlo/vmc/src/TVirtualMC.cxx

@@ -26,13 +26,8 @@
 
 ClassImp(TVirtualMC)
 
-#if defined(__linux__) && !defined(__CINT__)
-__thread TVirtualMC* TVirtualMC::fgMC=0;
-__thread TVirtualMC* gMC;
-#else
-TVirtualMC* TVirtualMC::fgMC=0;
-TVirtualMC* gMC;
-#endif
+TMCThreadLocal TVirtualMC* TVirtualMC::fgMC=0;
+TMCThreadLocal TVirtualMC* gMC;
 
 //_____________________________________________________________________________
 TVirtualMC::TVirtualMC(const char *name, const char *title,

montecarlo/vmc/src/TVirtualMCApplication.cxx

@@ -20,11 +20,7 @@
 
 ClassImp(TVirtualMCApplication)
 
-#if defined(__linux__) && !defined(__CINT__)
-__thread TVirtualMCApplication* TVirtualMCApplication::fgInstance = 0;
-#else
-TVirtualMCApplication* TVirtualMCApplication::fgInstance = 0;
-#endif
+TMCThreadLocal TVirtualMCApplication* TVirtualMCApplication::fgInstance = 0;
 
 //_____________________________________________________________________________
 TVirtualMCApplication::TVirtualMCApplication(const char *name,