Changeset 1808 for trunk/src/kmk

Timestamp:

Oct 9, 2008, 7:36:19 AM (17 years ago)

Author:

bird

Message:

kmk: More memchr and less strlen for simple assignments (var:=val).

Location:

trunk/src/kmk

Files:

• expand.c (modified) (12 diffs)
• variable.c (modified) (2 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -228 +228 @@
   char *o;
   unsigned int line_offset;
+#ifdef KMK
+  const char *eos;
+#endif
 
   if (!line)
@@ -245 +248 @@
     }
 
+#ifdef KMK
   /* Simple first, 50% of the kBuild calls to this function does
      not need any expansion at all. Should be worth a special case. */
-#ifdef KMK
-  if (length > 0)
-    {
-      p1 = (const char *)memchr (string, '$', length);
-      if (p1 == 0)
-        {
-          if (string[length] == '\0')
-            o = variable_buffer_output (o, string, length);
-          else
-            o = variable_buffer_output (o, string, length);
-          variable_buffer_output (o, "\0", 2);
-          return (variable_buffer + line_offset);
-        }
-    }
-  else
-    {
-      p1 = strchr (string, '$');
-      if (p1 == 0)
-      {
-          length = strlen (string);
-          o = variable_buffer_output (o, string, length);
-          variable_buffer_output (o, "\0", 2);
-          return (variable_buffer + line_offset);
-      }
-    }
+  if (length < 0)
+    length = strlen (string);
+  p1 = (const char *)memchr (string, '$', length);
+  if (p1 == 0)
+    {
+      o = variable_buffer_output (o, string, length);
+      variable_buffer_output (o, "\0", 2);
+      return (variable_buffer + line_offset);
+    }
+  eos = string + length;
 #endif /* KMK - optimization */
 
@@ -283 +272 @@
 #ifdef KMK
       p1 += abuf - string;
+      eos += abuf - string;
 #endif /* KMK - optimization */
       string = abuf;
@@ -337 +327 @@
                If so, expand it before expanding the entire reference.  */
 
+#ifndef KMK
             end = strchr (beg, closeparen);
+#else  /* KMK - optimization */
+            end = memchr (beg, closeparen, eos - beg);
+#endif /* KMK - optimization */
             if (end == 0)
               /* Unterminated variable reference.  */
@@ -477 +471 @@
         ++p;
 #ifdef KMK
-      p1 = strchr (p, '$');
+      p1 = memchr (p, '$', eos - p);
 #endif /* KMK - optimization */
     }
@@ -500 +494 @@
   char *o;
   unsigned int line_offset;
+#ifdef KMK
+  const char *eos;
+#endif
 
   if (!line)
@@ -517 +514 @@
     }
 
+#ifdef KMK
   /* Simple first, 50% of the kBuild calls to this function does
      not need any expansion at all. Should be worth a special case. */
-#ifdef KMK
-  if (length > 0)
-    {
-      p1 = (const char *)memchr (string, '$', length);
-      if (p1 == 0)
-        {
-          if (string[length] == '\0')
-            o = variable_buffer_output (o, string, length);
-          else
-            o = variable_buffer_output (o, string, length);
-          o = variable_buffer_output (o, "\0", 2);
-          *eol = o - 2;
-          return (variable_buffer + line_offset);
-        }
-    }
-  else
-    {
-      p1 = strchr (string, '$');
-      if (p1 == 0)
-      {
-          length = strlen (string);
-          o = variable_buffer_output (o, string, length + 1);
-          o = variable_buffer_output (o, "\0", 2);
-          *eol = o - 2;
-          return (variable_buffer + line_offset);
-      }
-    }
-#endif /* KMK */
+  if (length < 0)
+    length = strlen (string);
+  p1 = (const char *)memchr (string, '$', length);
+  if (p1 == 0)
+    {
+      o = variable_buffer_output (o, string, length);
+      o = variable_buffer_output (o, "\0", 2);
+      *eol = o - 2;
+      return (variable_buffer + line_offset);
+    }
+  eos = string + length;
+#endif /* KMK - optimization */
 
   /* If we want a subset of the string, allocate a temporary buffer for it.
@@ -557 +539 @@
 #ifdef KMK
       p1 += abuf - string;
+      eos += abuf - string;
 #endif
       string = abuf;
@@ -612 +595 @@
                If so, expand it before expanding the entire reference.  */
 
+#ifndef KMK
             end = strchr (beg, closeparen);
+#else  /* KMK - optimization */
+            end = memchr (beg, closeparen, eos - beg);
+#endif /* KMK - optimization */
             if (end == 0)
               /* Unterminated variable reference.  */
@@ -752 +739 @@
         ++p;
 #ifdef KMK
-      p1 = strchr (p, '$');
-#endif
+      p1 = memchr (p, '$', eos - p);
+#endif /* KMK - optimization */
     }
 
@@ -1064 +1051 @@
 
 char *
-allocated_variable_expand_2 (const char *line, long length)
+allocated_variable_expand_2 (const char *line, long length, unsigned int *value_len)
 {
   char *value;
@@ -1077 +1064 @@
 #endif
 
-  value = variable_expand_string (NULL, line, length);
+  if (!value_len)
+    value = variable_expand_string (NULL, line, length);
+  else
+    {
+      char *eol;
+      value = variable_expand_string_2 (NULL, line, length, &eol);
+      *value_len = eol - value;
+    }
 
   variable_buffer = obuf;

trunk/src/kmk/variable.c

@@ -1724 +1724 @@
          variable buffer, and we may still need that if we're looking at a
          target-specific variable.  */
+#if !defined(KMK) || !defined(CONFIG_WITH_VALUE_LENGTH)
       p = alloc_value = allocated_variable_expand (value);
+#else  /* KMK - optimization */
+      p = alloc_value = allocated_variable_expand_2 (value, -1, &value_len);
+#endif /* KMK - optimization */
       break;
     case f_conditional:
@@ -2089 +2093 @@
 #else  /* KMK - optimizations */
   //if (memchr (beg, '$', end - beg)) /* (Mostly for cleaning up the profiler result.) */
-      v->name = allocated_variable_expand_2 (beg, end - beg);
+      v->name = allocated_variable_expand_2 (beg, end - beg, NULL);
   //else
   //  {

trunk/src/kmk/variable.h

@@ -141 +141 @@
 #else  /* KMK */
 # define allocated_variable_expand(line) \
-  allocated_variable_expand_2 (line, -1)
-char *allocated_variable_expand_2(const char *line, long length);
+  allocated_variable_expand_2 (line, -1, NULL)
+char *allocated_variable_expand_2(const char *line, long length, unsigned int *value_len);
 #endif
 char *expand_argument (const char *str, const char *end);