Changeset 3669 for trunk

Timestamp:

Sep 19, 2010, 2:23:16 AM (15 years ago)

Author:

bird

Message:

grow.h/c: Store the string length, speeds up collition handling and adds strpool_len() for skipping strlen()'s. Fixed strpool_addnu/strpool_addu matching bug.

Location:

trunk/emx/src/emxomf

Files:

• grow.c (modified) (5 diffs)
• grow.h (modified) (1 diff)

trunk/emx/src/emxomf/grow.c

@@ -37 +37 @@
 #include <string.h>
 #include <ctype.h>
+#include <assert.h>
 #include "defs.h"
 #include "grow.h"
@@ -250 +251 @@
 {
   struct string *next;          /* Pointer to next string in same bucket */
+  int len;                      /* The string length. */
   char string[1];               /* The string */
 };
@@ -310 +312 @@
   hash %= STRPOOL_HASH_SIZE;
   for (v = p->table[hash]; v != NULL; v = v->next)
-    if (strlen (v->string) == len && memcmp (v->string, s, len) == 0)
+    if (v->len == len && memcmp (v->string, s, len) == 0)
       return v->string;
   v = xmalloc (sizeof (*v) + len);
+  assert(((uintptr_t)v & (sizeof(int) - 1)) == 0);
   memcpy (v->string, s, len);
   v->string[len] = 0;
+  v->len = len;
   v->next = p->table[hash];
   p->table[hash] = v;
@@ -348 +352 @@
   hash %= STRPOOL_HASH_SIZE;
   for (v = p->table[hash]; v != NULL; v = v->next)
-    if (strlen (v->string) == len && memcmp (v->string, s, len) == 0)
-      return v->string;
+    if (v->len == len)
+      {
+        i = len;
+        while (--i >= 0)
+          if (toupper(s[i]) != v->string[i])
+            break;
+        if (i < 0)
+            return v->string;
+      }
   v = xmalloc (sizeof (*v) + len);
+  assert(((uintptr_t)v & (sizeof(int) - 1)) == 0);
   memcpy (v->string, s, len);
   v->string[len] = 0;
-  strupr(v->string);
+  v->len = len;
+  strupr (v->string);
   v->next = p->table[hash];
   p->table[hash] = v;
@@ -369 +382 @@
 }
 
+/* Get the length of a string pool string.  This is very quick since we store
+   the lenght before the string data.  */
+int strpool_len (const char *s)
+{
+    assert(((uintptr_t)s & (sizeof(int) - 1)) == 0);
+    if (!s)
+      return 0;
+    return ((size_t *)s)[-1];
+}
+

trunk/emx/src/emxomf/grow.h

@@ -59 +59 @@
 const char *strpool_addn (struct strpool *p, const char *s, int len);
 const char *strpool_add (struct strpool *p, const char *s);
-const char *strpool_addnu ( struct strpool *p, const char *s, int len);
-const char *strpool_addu ( struct strpool *p, const char *s);
+const char *strpool_addnu (struct strpool *p, const char *s, int len);
+const char *strpool_addu (struct strpool *p, const char *s);
+int strpool_len (const char *s);
+