Changeset 348 for cpp/frams/genetics/geno.cpp

Timestamp:

04/09/15 23:51:28 (9 years ago)

Author:

Maciej Komosinski

Message:

• explicit c_str() in SString instead of (const char*) cast
• genetic converters and GenMan? are now thread-local which enables multi-threaded simulator separation

File:

• cpp/frams/genetics/geno.cpp (modified) (4 diffs)

cpp/frams/genetics/geno.cpp

@@ -7 +7 @@
 #include <frams/model/model.h>
 
-GenoConvManager *Geno::converters = NULL;
-
-THREAD_LOCAL_DEF(Geno::Validators, geno_validators);
-
-Geno::Validators& Geno::getValidators() {return tlsGetRef(geno_validators);}
+THREAD_LOCAL_DEF_PTR(Geno::Validators, geno_validators);
+THREAD_LOCAL_DEF_PTR(GenoConvManager, geno_converters);
+
+Geno::Validators* Geno::getValidators() {return tlsGetPtr(geno_validators);}
+GenoConvManager* Geno::getConverters() {return tlsGetPtr(geno_converters);}
+
+Geno::Validators* Geno::useValidators(Validators* val)
+{return tlsSetPtr(geno_validators,val);}
+GenoConvManager* Geno::useConverters(GenoConvManager* gcm)
+{return tlsSetPtr(geno_converters,gcm);}
 
 void Geno::init(const SString& genstring, char genformat, const SString& genname, const SString& comment)
@@ -78 +83 @@
         if (!name.len()) name = genname;
         if (!txt.len()) txt = comment;
-        multiline = (strchr((const char*)gen, '\n') != 0);
+        multiline = (strchr(gen.c_str(), '\n') != 0);
         // mapoutshift...?
 }
@@ -237 +242 @@
         if (isvalid >= 0) return;
         if (gen.len() == 0) { isvalid = 0; return; }
-        Validators& vals=getValidators();
-        FOREACH(GenoValidator*, v, vals)
+        Validators* vals=getValidators();
+        if (vals!=NULL)
+                {
+        FOREACH(GenoValidator*, v, (*vals))
                 if ((isvalid = v->testGenoValidity(*this)) >= 0)
                         return;
+                }
         isvalid = 0;
         FMprintf("Geno", "validate", FMLV_WARN, "Wrong configuration? No genotype validators defined for genetic format f%c.", format);
@@ -255 +263 @@
         if (otherformat == getFormat()) { if (converter_missing) *converter_missing = false; return *this; }
 #ifndef NO_GENOCONVMANAGER
+        GenoConvManager *converters=getConverters();
         if (converters)
         {