Changeset 526 for trunk/src/gmake/function.c

Timestamp:

Sep 16, 2006, 4:37:51 PM (19 years ago)

Author:

bird

Message:

tuning. libc is 1-2 seconds faster to load now.

File:

• trunk/src/gmake/function.c (modified) (6 diffs)

trunk/src/gmake/function.c

@@ -32 +32 @@
 # include "pathstuff.h"
 #endif
+#include <assert.h> /* bird */
 
 
@@ -261 +262 @@
 
 
+/* The maximum length of a function, once reached there is 
+   it can't be function and we can skip the hash lookup drop out. */
+
+#define MAX_FUNCTION_LENGTH 10 /* bird */
+
 /* Look up a function by name.  */
-
+#if defined(__GNUC__) || defined(_MSC_VER)
+__inline
+#endif
 static const struct function_table_entry *
 lookup_function (const char *s)
 {
   const char *e = s;
-
+#ifdef MAX_FUNCTION_LENGTH
+  int left = MAX_FUNCTION_LENGTH;
+  int ch;
+  while (((ch = *e) >= 'a' && ch <='z') || ch == '-')
+    {
+      if (!left--)
+        return 0;
+      e++;
+    }
+#else
   while (*e && ( (*e >= 'a' && *e <= 'z') || *e == '-'))
     e++;
+#endif
   if (*e == '\0' || isblank ((unsigned char) *e))
     {
@@ -2198 +2216 @@
    *STRINGP past the reference and returning nonzero.  If not, return zero.  */
 
-int
-handle_function (char **op, char **stringp)
-{
-  const struct function_table_entry *entry_p;
+static int
+handle_function2 (const struct function_table_entry *entry_p, char **op, char **stringp) /* bird split it up. */
+{
   char openparen = (*stringp)[0];
   char closeparen = openparen == '(' ? ')' : '}';
@@ -2213 +2230 @@
   beg = *stringp + 1;
 
-  entry_p = lookup_function (beg);
-
-  if (!entry_p)
-    return 0;
-
   /* We found a builtin function.  Find the beginning of its arguments (skip
      whitespace after the name).  */
@@ -2298 +2310 @@
 
   return 1;
+}
+
+int
+handle_function (char **op, char **stringp) /* bird split it up */
+{
+  const struct function_table_entry *entry_p = lookup_function (*stringp + 1);
+  if (!entry_p)
+    return 0;
+  return handle_function2 (entry_p, op, stringp);
 }
 
@@ -2416 +2437 @@
   hash_load (&function_table, function_table_init,
              FUNCTION_TABLE_ENTRIES, sizeof (struct function_table_entry));
-}
+#ifdef MAX_FUNCTION_LENGTH /* bird */
+  {
+    unsigned i;
+    for (i = 0; i < FUNCTION_TABLE_ENTRIES; i++)
+        assert(function_table_init[i].len <= MAX_FUNCTION_LENGTH);
+  }
+#endif 
+}