[ViewVC] Diff of: cvs/deliantra/server/common/shstr.C

Comparing deliantra/server/common/shstr.C (file contents):
Revision 1.6 by root, Sun Sep 3 11:37:25 2006 UTC vs.
Revision 1.7 by root, Sun Sep 3 23:33:00 2006 UTC

 #include <cstdlib>
 #include <tr1/unordered_set>
 #include "shstr.h"
-// NOTE: even with lots of stuff loaded, we do not usually have >>20000 strings.
-// maybe refcounting is just overhead?
 struct hash
 {
   std::size_t operator ()(const char *s) const
   {
 typedef std::tr1::unordered_set<const char *, hash, equal> HT;
 static HT ht;
+static const char *makevec (const char *s)
+{
+  int len = strlen (s);
+  const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1));
+  shstr::length (v) = len;
+  shstr::refcnt (v) = 1;
+  memcpy ((char *)v, s, len + 1);
+  return s;
+}
+const char *shstr::null = makevec ("<nil>");
 const char *
 shstr::find (const char *s)
 {
   if (!s)
     return s;
 const char *
 shstr::intern (const char *s)
 {
   if (!s)
-    return s;
+    return null;
   if (const char *found = find (s))
     {
       ++refcnt (found);
       return found;
     }
-  int len = strlen (s);
+  s = makevec (s);
-  const char *v = (const char *)(2 + (int *)malloc (sizeof (int) * 2 + len + 1));
-  length (v) = len;
-  refcnt (v) = 1;
-  memcpy ((char *)v, s, len + 1);
-  ht.insert (v);
+  ht.insert (s);
-  return v;
+  return s;
 }
 // periodically test refcounts == 0 for a few strings
 // this is the ONLY thing that erases stuff from ht. keep it that way.
 void

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines