Changeset 371 for cpp/frams

Timestamp:

04/21/15 15:19:47 (10 years ago)

Author:

Maciej Komosinski

Message:

THREAD_LOCAL uses ThreadLocal_ prefix for variables. The static object inside the single-threaded implementation is no longer associated with a class.

Location:

cpp/frams

Files:

• util/extvalue.cpp (modified) (11 diffs)
• util/extvalue.h (modified) (1 diff)
• vm/classes/collectionobj.cpp (modified) (5 diffs)

cpp/frams/util/extvalue.cpp

@@ -124 +124 @@
 }
 
-THREAD_LOCAL_DEF(ExtObject::Serialization, ExtObject::serialization);
+THREAD_LOCAL_DEF(ExtObject::Serialization, ExtObject_serialization);
 
 void ExtObject::Serialization::begin()
@@ -185 +185 @@
 SString ExtObject::serialize_inner() const
 {
-        int ref = tlsGetRef(serialization).add(*this);
+        int ref = tlsGetRef(ExtObject_serialization).add(*this);
         if (ref >= 0)
                 return SString::sprintf("^%d", ref);
@@ -216 +216 @@
         }
 
-        tlsGetRef(serialization).remove(*this);//undo nonserializable reference
+        tlsGetRef(ExtObject_serialization).remove(*this);//undo nonserializable reference
         SString ret = interfaceName();
         ret += SString::sprintf("<%p>", object ? object : paraminterface);
@@ -224 +224 @@
 SString ExtObject::serialize() const
 {
-        tlsGetRef(serialization).begin();
+        tlsGetRef(ExtObject_serialization).begin();
         SString ret = serialize_inner();
-        tlsGetRef(serialization).end();
+        tlsGetRef(ExtObject_serialization).end();
         return ret;
 }
@@ -998 +998 @@
                 VectorObject *vec = new VectorObject;
                 ExtObject o(&VectorObject::par, vec);
-                tlsGetRef(ExtObject::serialization).add(o);
+                tlsGetRef(ExtObject_serialization).add(o);
                 const char* p = in + 1;
                 ExtValue tmp;
@@ -1029 +1029 @@
                 DictionaryObject *dic = new DictionaryObject;
                 ExtObject o(&DictionaryObject::par, dic);
-                tlsGetRef(ExtObject::serialization).add(o);
+                tlsGetRef(ExtObject_serialization).add(o);
                 const char* p = in + 1;
                 ExtValue args[2]/*={value,key}*/, dummy_ret;
@@ -1080 +1080 @@
                 if (ret && (ref.getType() == TInt))
                 {
-                        const ExtObject* o = tlsGetRef(ExtObject::serialization).get(ref.getInt());
+                        const ExtObject* o = tlsGetRef(ExtObject_serialization).get(ref.getInt());
                         if (o)
                         {
@@ -1105 +1105 @@
                                 {
                                         cls->call(m, &tmp, this);
-                                        tlsGetRef(ExtObject::serialization).replace(tmp.getObject(), getObject());
+                                        tlsGetRef(ExtObject_serialization).replace(tmp.getObject(), getObject());
                                         return ret;
                                 }
@@ -1116 +1116 @@
                                 {
                                         cls->call(m, &tmp, this);
-                                        tlsGetRef(ExtObject::serialization).replace(tmp.getObject(), getObject());
+                                        tlsGetRef(ExtObject_serialization).replace(tmp.getObject(), getObject());
                                         return ret;
                                 }
@@ -1126 +1126 @@
                                 {
                                         cls->call(m, &tmp, this);
-                                        tlsGetRef(ExtObject::serialization).replace(tmp.getObject(), getObject());
+                                        tlsGetRef(ExtObject_serialization).replace(tmp.getObject(), getObject());
                                         return ret;
                                 }
                         }
-                        tlsGetRef(ExtObject::serialization).remove(tmp.getObject());
+                        tlsGetRef(ExtObject_serialization).remove(tmp.getObject());
                         setEmpty();
                 }
@@ -1144 +1144 @@
 const char* ExtValue::deserialize(const char* in)
 {
-        tlsGetRef(ExtObject::serialization).begin();
+        tlsGetRef(ExtObject_serialization).begin();
         const char* ret = deserialize_inner(in);
-        tlsGetRef(ExtObject::serialization).end();
+        tlsGetRef(ExtObject_serialization).end();
         return ret;
 }

cpp/frams/util/extvalue.h

@@ -99 +99 @@
         };
 
-        static THREAD_LOCAL_DECL(Serialization, serialization);
-};
+};
+
+extern THREAD_LOCAL_DECL(ExtObject::Serialization, ExtObject_serialization);
 
 class ExtValue

cpp/frams/vm/classes/collectionobj.cpp

@@ -149 +149 @@
 }
 
-static THREAD_LOCAL_DEF(SList,tostring_trace);
+static THREAD_LOCAL_DEF(SList,VectorObject_tostring_trace);
 
 void VectorObject::get_toString(ExtValue* ret)
@@ -155 +155 @@
 SString out="[";
 //static SListTempl<VectorObject*> trace;
-if (tlsGetRef(tostring_trace).find(this)>=0)
+if (tlsGetRef(VectorObject_tostring_trace).find(this)>=0)
         out+="...";
 else
         {
-        tlsGetRef(tostring_trace)+=this;
+        tlsGetRef(VectorObject_tostring_trace)+=this;
         for(int i=0;i<data.size();i++)
                 {
@@ -169 +169 @@
                         out+="null";
                 }
-        tlsGetRef(tostring_trace)-=this;
+        tlsGetRef(VectorObject_tostring_trace)-=this;
         }
 out+="]";
@@ -402 +402 @@
 SString out="{";
 //static SListTempl<DictionaryObject*> trace;
-if (tlsGetRef(tostring_trace).find(this)>=0)
+if (tlsGetRef(VectorObject_tostring_trace).find(this)>=0)
         out+="...";
 else
         {
-        tlsGetRef(tostring_trace)+=this;
+        tlsGetRef(VectorObject_tostring_trace)+=this;
         for(HashEntryIterator it(hash);it.isValid();)
                 {
@@ -418 +418 @@
                 if (it.isValid()) out+=",";
                 }
-        tlsGetRef(tostring_trace)-=this;
+        tlsGetRef(VectorObject_tostring_trace)-=this;
         }
 out+="}";