Changeset 1940 for trunk/src/kmk/strcache2.c

Timestamp:

Oct 26, 2008, 2:59:40 AM (17 years ago)

Author:

bird

Message:

strcache2: fixed entry alignment.

File:

• trunk/src/kmk/strcache2.c (modified) (4 diffs)

trunk/src/kmk/strcache2.c

@@ -697 +697 @@
   if (off)
     {
+      off = STRCACHE2_ENTRY_ALIGNMENT - off;
       seg->start += off;
       seg->size  -= off;
@@ -737 +738 @@
 
   entry = (struct strcache2_entry *) seg->cursor;
-  assert ((size_t)entry & (STRCACHE2_ENTRY_ALIGNMENT - 1));
+  assert (!((size_t)entry & (STRCACHE2_ENTRY_ALIGNMENT - 1)));
   seg->cursor += size;
   seg->avail -= size;
@@ -1054 +1055 @@
   const char *end;
 
-  if ((size_t)str & (sizeof (void *) - 1))
+  entry = (struct strcache2_entry const *)str - 1;
+  if ((size_t)entry & (STRCACHE2_ENTRY_ALIGNMENT - 1))
     {
       fprintf (stderr,
-               "strcache2[%s]: missaligned string %p\nstring: %s\n",
-               cache->name, (void *)str, str);
+               "strcache2[%s]: missaligned entry %p\nstring: %p=%s\n",
+               cache->name, (void *)entry, (void *)str, str);
       return -1;
     }
 
-  entry = (struct strcache2_entry const *)str - 1;
   end = memchr (str, '\0', entry->length);
   if ((size_t)(end - str) == entry->length)
@@ -1078 +1079 @@
     {
       fprintf (stderr,
-               "strcache2[%s]: corrupt entry %p, hash#1: %x, expected %x;\nstring: %s\n",
+               "strcache2[%s]: corrupt entry %p, hash: %x, expected %x;\nstring: %s\n",
                cache->name, (void *)entry, hash, entry->hash, str);
       return -1;