Changeset 104 for cpp/gdk/sstring.cpp

Timestamp:

07/23/13 18:15:30 (12 years ago)

Author:

sz

Message:

introducing object de/serialization - see serialtest.cpp
the core GDK classes can be now used in multiple threads (ifdef MULTITHREADED)

File:

• cpp/gdk/sstring.cpp (modified) (10 diffs)

cpp/gdk/sstring.cpp

@@ -7 +7 @@
 #include "nonstd_stl.h"
 #include "extvalue.h"
+
+#ifdef MULTITHREADED
+#include <pthread.h>
+static pthread_mutex_t sstring_ref_lock;
+#define REF_LOCK pthread_mutex_lock(&sstring_ref_lock);
+#define REF_UNLOCK pthread_mutex_unlock(&sstring_ref_lock)
+#else
+#define REF_LOCK 
+#define REF_UNLOCK 
+#endif
 
 static int guessMemSize(int request, int memhint)
@@ -96 +106 @@
 SString::~SString()
 {
+REF_LOCK;
 detach();
+REF_UNLOCK;
 }
 
@@ -102 +114 @@
 {
 buf=new SBuf(x);
+memhint=-1;
 }
 
@@ -113 +126 @@
 SString::SString(const SString &from)
 {
-buf=from.buf;
-if (buf->size) buf->refcount++;
+if (from.buf==&SBuf::empty())
+        buf=&SBuf::empty();
+else
+        {
+        REF_LOCK;
+        buf=from.buf;
+        if (buf->size)
+                buf->refcount++;
+        REF_UNLOCK;
+        }
 memhint=-1;
 }
@@ -163 +184 @@
 {
 if (ensuresize<0) ensuresize=len();
+REF_LOCK;
 detachCopy(ensuresize);
+REF_UNLOCK;
 appending=buf->used;
 return buf->txt;
@@ -176 +199 @@
 char *SString::directAppend(int maxappend)
 {
+REF_LOCK;
 detachCopy(buf->used+maxappend);
+REF_UNLOCK;
 appending=buf->used;
 return buf->txt+appending;
@@ -208 +233 @@
 {
 if (!count) return;
+REF_LOCK;
 detachCopy(buf->used+count);
+REF_UNLOCK;
 buf->append(txt,count);
 }
@@ -230 +257 @@
 if (!ch) chlen=0;
 else if (chlen<0) chlen=strlen(ch);
+REF_LOCK;
 detachEmpty(chlen);
+REF_UNLOCK;
 memcpy(buf->txt,ch,chlen);
 buf->txt[chlen]=0; buf->used=chlen;
@@ -243 +272 @@
 {
 if (s.buf==buf) return;
+REF_LOCK;
 detach();
 buf=s.buf;
 if (buf->size) buf->refcount++;
+REF_UNLOCK;
 }
 ///////////////////////////////////////
@@ -306 +337 @@
 }
 
-const SString& SString::valueOf(int i)
-{
-static SString t;
+SString SString::valueOf(int i)
+{
+SString t;
 sprintf(t.directWrite(20),"%d",i); t.endWrite();
 return t;
 }
-const SString& SString::valueOf(long i)
-{
-static SString t;
+SString SString::valueOf(long i)
+{
+SString t;
 sprintf(t.directWrite(20),"%d",i); t.endWrite();
 return t;
 }
-const SString& SString::valueOf(double d)
-{
-static SString t;
+SString SString::valueOf(double d)
+{
+SString t;
 sprintf(t.directWrite(20),"%g",d); t.endWrite();
 return t;
 }
-const SString& SString::valueOf(const SString& s)
+SString SString::valueOf(const SString& s)
 {
 return s;