Changeset 1843 in kBuild for trunk/src/kmk

Timestamp:

Oct 12, 2008 3:40:32 PM (16 years ago)

Author:

bird

Message:

kmk/strcache: align the strings on a (somewhat) natural boundrary and offer a service for retrieving their length (which we also store now).

Location:

trunk/src/kmk

Files:

• make.h (modified) (1 diff)
• strcache.c (modified) (3 diffs)

trunk/src/kmk/make.h

@@ -504 +504 @@
 const char *strcache_add_len (const char *str, int len);
 int strcache_setbufsize (int size);
+#ifdef CONFIG_WITH_VALUE_LENGTH
+MY_INLINE unsigned int strcache_get_len (const char *str)
+{
+  unsigned int len = ((unsigned int *)str)[-1];
+  MY_ASSERT_MSG (strcache_iscached (str), ("\n"));
+  MY_ASSERT_MSG (strlen (str) == len, ("\n"));
+  return len;
+}
+#endif
 
 #ifdef  HAVE_VFORK_H

trunk/src/kmk/strcache.c

@@ -67 +67 @@
   struct strcache *sp;
   const char *res;
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  int str_len = len;
+  char *tmp;
+
+  /* Add space a length prefix and the terminator and assure
+     (somewhat) natural alignment. */
+  len += sizeof(unsigned int) + 1;
+  len = (len + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
+  --len;
+#endif
 
   /* If the string we want is too large to fit into a single buffer, then
@@ -88 +98 @@
 
   /* Add the string to the best cache.  */
+#ifndef CONFIG_WITH_VALUE_LENGTH
   res = best->end;
   memcpy (best->end, str, len);
@@ -94 +105 @@
   best->bytesfree -= len + 1;
   ++best->count;
-
+#else  /* CONFIG_WITH_VALUE_LENGTH */
+  tmp = best->end;
+  best->end += len + 1;
+  assert(!((size_t)tmp & (sizeof(void *) - 1)));
+
+  *(unsigned int *)tmp = str_len; /* length prefix */
+  tmp += sizeof(unsigned int);
+
+  res = tmp;
+  memcpy (tmp, str, str_len);
+  tmp += str_len;
+  do
+    *(tmp++) = '\0';
+  while (tmp < best->end);
+
+  best->bytesfree -= len + 1;
+  ++best->count;
+
+  assert (tmp == best->end);
+  assert (!((size_t)res & (sizeof(void *) - 1)));
+#endif /* CONFIG_WITH_VALUE_LENGTH */
   return res;
 }