Changeset 346

Timestamp:

04/07/15 04:20:14 (10 years ago)

Author:

Maciej Komosinski

Message:

Each thread can use its own simulator's GenMan?

Location:

cpp

Files:

• common/threads.h (modified) (6 diffs)
• frams/genetics/geno.cpp (modified) (2 diffs)
• frams/genetics/geno.h (modified) (2 diffs)
• frams/genetics/preconfigured.h (modified) (1 diff)

cpp/common/threads.h

@@ -66 +66 @@
 };
 
+template<class T> class ThreadSingletonPtr
+{
+pthread_key_t mt_key;
+
+  public:
+
+ThreadSingletonPtr()
+ {
+ pthread_key_create(&mt_key,NULL);
+ }
+
+T* setptr(T* new_o)
+ {
+ T* o=(T*)pthread_getspecific(mt_key);
+ pthread_setspecific(mt_key,new_o);
+ return o;
+ }
+
+T* get()
+ {
+ return (T*)pthread_getspecific(mt_key);
+ }
+};
+
 #else
 
@@ -82 +106 @@
 ////////////////////////////////////
 
+// THREAD_LOCAL(cls) - behaves like object of class cls (automatic creation/destruction)
+// THREAD_LOCAL(cls)..._PTR - behaves like pointer to cls (initial NULL, no autocreation/destruction)
+// _PTR can only be accessed using tls...Ptr() variant of Get/Set, _ptr suffix is internally used in variable name to avoid mistakes
 #ifdef USE_CPP_TLS
 
@@ -88 +115 @@
 #define THREAD_LOCAL_DECL(cls,var) CPP_TLS cls* var
 #define THREAD_LOCAL_DEF(cls,var) CPP_TLS cls* var=NULL
+#define THREAD_LOCAL_DECL_PTR(cls,var) CPP_TLS cls* var ## _ptr
+#define THREAD_LOCAL_DEF_PTR(cls,var) CPP_TLS cls* var ## _ptr=NULL
 
 template<class T> T* tlsGet(T*& var)
@@ -93 +122 @@
 if (!var)
         var=new T();
+return var;
+}
+
+template<class T> T* tlsGetPtr(T*& var)
+{
 return var;
 }
@@ -105 +139 @@
 }
 
+#define tlsGetSetPtr(var,o) tlsSet(var ## _ptr,o)
+
 #else
 
@@ -115 +151 @@
 #define tlsSet(var,o) var.set(o)
 
+#define THREAD_LOCAL_DECL_PTR(cls,var) ThreadSingletonPtr<cls> var ## _ptr
+#define THREAD_LOCAL_DEF_PTR(cls,var) ThreadSingletonPtr<cls> var ## _ptr
+#define tlsGetPtr(var) var ## _ptr.get()
+#define tlsSetPtr(var,o) var ## _ptr.setptr(o)
+
 #endif
 

cpp/frams/genetics/geno.cpp

@@ -7 +7 @@
 #include <frams/model/model.h>
 
-SListTempl<GenoValidator*> Geno::validators;
 GenoConvManager *Geno::converters = NULL;
+
+THREAD_LOCAL_DEF(Geno::Validators, geno_validators);
+
+Geno::Validators& Geno::getValidators() {return tlsGetRef(geno_validators);}
 
 void Geno::init(const SString& genstring, char genformat, const SString& genname, const SString& comment)
@@ -234 +237 @@
         if (isvalid >= 0) return;
         if (gen.len() == 0) { isvalid = 0; return; }
-        FOREACH(GenoValidator*, v, validators)
+        Validators& vals=getValidators();
+        FOREACH(GenoValidator*, v, vals)
                 if ((isvalid = v->testGenoValidity(*this)) >= 0)
                         return;

cpp/frams/genetics/geno.h

@@ -54 +54 @@
 
 public:
+        typedef SListTempl<GenoValidator*> Validators;
+
         /// create a genotype object from primitives
         /// @param genstring pure genotype, without any comments
@@ -116 +118 @@
 
         // managing global Geno-related objects (used for validation and conversion)
-        static void addValidator(GenoValidator* gv) { validators += gv; }
-        static void removeValidator(GenoValidator* gv) { validators -= gv; }
+        static Validators& getValidators();
+        static void addValidator(GenoValidator* gv,int at_position=9999) { getValidators().insert(at_position,gv); }
+        static void removeValidator(GenoValidator* gv) { getValidators() -= gv; }
         static void useConverters(GenoConvManager& gcm) { converters = &gcm; }
         static GenoConvManager &getConverters() { return *converters; }
 protected:
         static GenoConvManager *converters;
-        static SListTempl<GenoValidator*> validators;
 };
 

cpp/frams/genetics/preconfigured.h

@@ -30 +30 @@
 };
 
+/** Initialization procedure for applications adding their own validators */
+class PreconfiguredGenetics_NoValidators
+{
+  public:
+DefaultGenoConvManager gcm;
+
+PreconfiguredGenetics_NoValidators()
+        {
+        gcm.addDefaultConverters(); //without converters, the application would only handle "format 0" genotypes
+        Geno::useConverters(gcm);
+        }
+};
+
 #endif