Changeset 530 in kBuild

Timestamp:

Sep 17, 2006 8:38:57 PM (18 years ago)

Author:

bird

Message:

Added kBuild specific functions for speeding up source processing.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• kBuild/footer.kmk (modified) (7 diffs)
• src/gmake/Makefile.kmk (modified) (2 diffs)
• src/gmake/dep.h (modified) (1 diff)
• src/gmake/expand.c (modified) (1 diff)
• src/gmake/function.c (modified) (6 diffs)
• src/gmake/kbuild.c (added)
• src/gmake/kbuild.h (added)
• src/gmake/main.c (modified) (4 diffs)
• src/gmake/read.c (modified) (2 diffs)
• src/gmake/variable.c (modified) (5 diffs)
• src/gmake/variable.h (modified) (1 diff)

trunk/ChangeLog

@@ -3 +3 @@
 2006-09-17:
     - kBuild/gmake:
+        o Added kBuild specific functions for speeding up source processing.
         o Fixed assertion in w32_fixcase when shell doesn't have a full path 
           and some other case.

trunk/kBuild/footer.kmk

@@ -27 +27 @@
 ifndef __footer_kmk__
 # start-of-file-content
+
+#
+# Make sure that the core variables we defined in recursive expansion mode
+# up in header.kmk get expanded before we really start using them. The kBuild
+# functions added to kmk to speed stuff up assumes that the variables are
+# expanded here.
+#
+PATH_OBJ    := $(PATH_OBJ)
+PATH_TARGET := $(PATH_TARGET)
+PATH_INS    := $(PATH_INS)
+PATH_BIN    := $(PATH_BIN)
+PATH_DLL    := $(PATH_DLL)
+PATH_SYS    := $(PATH_SYS)
+PATH_LIB    := $(PATH_LIB)
+PATH_DOC    := $(PATH_DOC)
 
 #
@@ -109 +124 @@
         $($(target)_$(source)_TOOL.$(bld_trg)) \
         $($(target)_$(source)_TOOL) \
+        $($(source)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
+        $($(source)_$(type)TOOL.$(bld_trg)) \
+        $($(source)_$(type)TOOL) \
+        $($(source)_TOOL.$(bld_trg).$(bld_trg_arch)) \
+        $($(source)_TOOL.$(bld_trg)) \
+        $($(source)_TOOL) \
         $($(target)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
         $($(target)_$(type)TOOL.$(bld_trg)) \
@@ -115 +136 @@
         $($(target)_TOOL.$(bld_trg)) \
         $($(target)_TOOL) \
-        $($(source)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
-        $($(source)_$(type)TOOL.$(bld_trg)) \
-        $($(source)_$(type)TOOL) \
-        $($(source)_TOOL.$(bld_trg).$(bld_trg_arch)) \
-        $($(source)_TOOL.$(bld_trg)) \
-        $($(source)_TOOL) \
         $($(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
         $($(type)TOOL.$(bld_trg)) \
@@ -480 +495 @@
 ## wrapper the compile command dependency check.
 ifndef NO_COMPILE_CMDS_DEPS
+ ifdef NEW_KMK
+_DEP_COMPILE_CMDS = $(comp-vars $(target)_$(source)_CMDS_PREV_,$(target)_$(source)_CMDS_,FORCE)
+ else
 _DEP_COMPILE_CMDS = $(if $(subst $(strip $($(target)_$(source)_CMDS_PREV_)),,$(strip $($(target)_$(source)_CMDS_))),FORCE,)
+ endif
 else
 _DEP_COMPILE_CMDS =
@@ -577 +596 @@
 # @param    bld_trg_cpu   Build target cpu.
 #
-# @remark   I've no clue why I've to $(eval ..) everything in this define. MAKE bug?
-# @remark       I now have a clue. Have to use $$ if not.
-define def_target_source_c_cpp_asm
+define def_target_source_c_cpp_asm_old
 #$ (warning dbg: def_target_source_c_cpp_asm: source='$(source)' target='$(target)' type='$(type)')
 
@@ -937 +954 @@
 endef
 
+## Generic macro for processing C, C++ and Assembly sources.
+# @param    $(target)     Normalized target name.
+# @param    $(source)     Source file name.
+# @param    $(type)       Source type. {C,CXX,AS}
+# @param    bld_type      Build type.
+# @param    bld_trg       Build target.
+# @param    bld_trg_arch  Build target arch.
+# @param    bld_trg_cpu   Build target cpu.
+#
+#$ (warning dbg: def_target_source_c_cpp_asm: source='$(source)' target='$(target)' type='$(type)')
+def_target_source_c_cpp_asm_new = $(kb-src-one x)
+
+ifdef NEW_KMK
+def_target_source_c_cpp_asm_var = def_target_source_c_cpp_asm_new
+else
+def_target_source_c_cpp_asm_var = def_target_source_c_cpp_asm_old
+endif
+
 ## Generic macro for processing all target sources.
 # @param    $(target)   Normalized target name.
@@ -944 +979 @@
 type := C
 $(foreach source, $(filter %.c             , $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
-        ,$(eval $(value def_target_source_c_cpp_asm)) )
+   ,$(eval $(value $(def_target_source_c_cpp_asm_var))) )
 
 # C++ sources
 type := CXX
 $(foreach source, $(filter %.cpp %.cxx %.xx, $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
-        ,$(eval $(value def_target_source_c_cpp_asm)) )
+        ,$(eval $(value $(def_target_source_c_cpp_asm_var))) )
 
 # ASM sources
 type := AS
 $(foreach source, $(filter %.asm %.s %.S   , $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
-        ,$(eval $(value def_target_source_c_cpp_asm)) )
+        ,$(eval $(value $(def_target_source_c_cpp_asm_var))) )
 
 endef

trunk/src/gmake/Makefile.kmk

@@ -21 +21 @@
         CONFIG_NO_DEFAULT_VARIABLES \
         CONFIG_WITH_EXTENDED_NOTPARALLEL \
+    CONFIG_WITH_INCLUDEDEP \
         CONFIG_WITH_TOUPPER_TOLOWER \
-    CONFIG_WITH_INCLUDEDEP \
+        CONFIG_WITH_VALUE_LENGTH \
+        CONFIG_WITH_COMPARE \
         KMK \
         CONFIG_WITH_OPTIMIZATION_HACKS \
-        VARIABLE_HASH 
+        VARIABLE_HASH
         
 kmk_SOURCES = \
@@ -49 +51 @@
         version.c \
         vpath.c \
-        remote-stub.c
+        remote-stub.c \
+        kbuild.c
 
 kmk_SOURCES.win32 = \

trunk/src/gmake/dep.h

@@ -82 +82 @@
 extern struct dep *read_all_makefiles PARAMS ((char **makefiles));
 extern int eval_buffer PARAMS ((char *buffer));
+#ifdef CONFIG_WITH_INCLUDEDEP
+extern void eval_include_dep PARAMS ((char *name, struct floc *f));
+#endif
 extern int update_goal_chain PARAMS ((struct dep *goals));
 extern void uniquize_deps PARAMS ((struct dep *));
+

trunk/src/gmake/expand.c

@@ -522 +522 @@
   /* Either expand it or copy it, depending.  */
   if (! v->recursive)
+#ifdef CONFIG_WITH_VALUE_LENGTH
+    return variable_buffer_output (buf, v->value, 
+                                   v->value_length >= 0 ? v->value_length : strlen (v->value));
+#else
     return variable_buffer_output (buf, v->value, strlen (v->value));
-
+#endif
+
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  buf = variable_expand_string (buf, v->value, v->value_length >= 0 ? v->value_length : strlen (v->value));
+#else
   buf = variable_expand_string (buf, v->value, strlen (v->value));
+#endif
   return (buf + strlen (buf));
 }

trunk/src/gmake/function.c

@@ -17 +17 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
+#ifdef CONFIG_WITH_OPTIMIZATION_HACKS
+# include <assert.h>
+#endif 
 #include "make.h"
 #include "filedef.h"
@@ -32 +35 @@
 # include "pathstuff.h"
 #endif
-#include <assert.h> /* bird */
+
+#ifdef KMK
+# include "kbuild.h"
+#endif 
 
 
@@ -265 +271 @@
    it can't be function and we can skip the hash lookup drop out. */
 
-#define MAX_FUNCTION_LENGTH 10 /* bird */
+#ifdef KMK
+# define MAX_FUNCTION_LENGTH 12
+#else
+# define MAX_FUNCTION_LENGTH 10
+#endif 
 
 /* Look up a function by name.  */
@@ -1411 +1421 @@
   /* Copy its value into the output buffer without expanding it.  */
   if (v)
+#ifdef CONFIG_WITH_VALUE_LENGTH
+    o = variable_buffer_output (o, v->value, 
+                                v->value_length >= 0 ? v->value_length : strlen(v->value));
+#else
     o = variable_buffer_output (o, v->value, strlen(v->value));
+#endif 
 
   return o;
@@ -2117 +2132 @@
 }
 #endif /* CONFIG_WITH_TOUPPER_TOLOWER */
+
+#if defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE)
+/* Returns empty string if equal, returns the third arg if not equal. */
+static char *
+func_comp_vars (char *o, char **argv, const char *funcname)
+{
+  const char *s1, *e1, *x1, *s2, *e2, *x2;
+  char *a1 = NULL, *a2 = NULL;
+  size_t l, l1, l2;
+  struct variable *var1 = lookup_variable (argv[0], strlen (argv[0]));
+  struct variable *var2 = lookup_variable (argv[1], strlen (argv[1]));
+
+  /* the simple cases */
+  if (var1 == var2)
+    return variable_buffer_output (o, "", 1);       /* eq */
+  if (!var1 || !var2)
+    return variable_buffer_output (o, argv[2], strlen(argv[2]));
+  if (var1->value == var2->value)
+    return variable_buffer_output (o, "", 1);       /* eq */
+  if (!var1->recursive && !var2->recursive)
+  {
+    if (    var1->value_length == var2->value_length
+        &&  !memcmp (var1->value, var2->value, var1->value_length))
+      return variable_buffer_output (o, "", 1);     /* eq */
+
+    /* ignore trailing and leading blanks */
+    s1 = var1->value;
+    while (isblank ((unsigned char) *s1))
+      s1++;
+    e1 = s1 + var1->value_length;
+    while (e1 > s1 && isblank ((unsigned char) e1[-1]))
+      e1--;
+
+    s2 = var2->value;
+    while (isblank ((unsigned char) *s2))
+      s2++;
+    e2 = s2 + var2->value_length;
+    while (e2 > s2 && isblank ((unsigned char) e2[-1]))
+      e2--;
+
+    if (e1 - s1 != e2 - s2)
+      return variable_buffer_output (o, "", 1);     /* eq */
+l_simple_compare:
+    if (!memcmp (s1, s2, e1 - s1))
+      return variable_buffer_output (o, "", 1);     /* eq */
+    return variable_buffer_output (o, argv[2], strlen(argv[2]));
+  }
+
+  /* ignore trailing and leading blanks */
+  s1 = var1->value;
+  e1 = s1 + var1->value_length;
+  while (isblank ((unsigned char) *s1))
+    s1++;
+  while (e1 > s1 && isblank ((unsigned char) e1[-1]))
+    e1--;
+
+  s2 = var2->value;
+  e2 = s2 + var2->value_length;
+  while (isblank((unsigned char)*s2))
+    s2++;
+  while (e2 > s2 && isblank ((unsigned char) e2[-1]))
+    e2--;
+
+  /* both empty after stripping? */
+  if (s1 == e1 && s2 == e2)
+    return variable_buffer_output (o, "", 1);       /* eq */
+
+  /* optimist. */
+  if (   e1 - s1 == e2 - s2
+      && !memcmp(s1, s2, e1 - s1))
+    return variable_buffer_output (o, "", 1);       /* eq */
+
+  /* compare up to the first '$' or the end. */
+  x1 = var1->recursive ? memchr (s1, '$', e1 - s1) : NULL;
+  x2 = var2->recursive ? memchr (s2, '$', e2 - s2) : NULL;
+  if (!x1 && !x2)
+    return variable_buffer_output (o, argv[2], strlen (argv[2]));
+
+  l1 = x1 ? x1 - s1 : e1 - s1;
+  l2 = x2 ? x2 - s2 : e2 - s2;
+  l = l1 <= l2 ? l1 : l2;
+  if (l && memcmp (s1, s2, l))
+      return variable_buffer_output (o, argv[2], strlen (argv[2]));
+
+  /* one or both buffers now require expanding. */
+  if (!x1)
+    s1 += l;
+  else
+    {
+      s1 = a1 = allocated_variable_expand ((char *)s1 + l);
+      if (!l)
+        while (isblank ((unsigned char) *s1))
+          s1++;
+      e1 = strchr (s1, '\0'); /*hmm*/
+      while (e1 > s1 && isblank ((unsigned char) e1[-1]))
+        e1--;
+    }
+
+  if (!x2)
+    s2 += l;
+  else
+    {
+      s2 = a2 = allocated_variable_expand ((char *)s2 + l);
+      if (!l)
+        while (isblank ((unsigned char) *s2))
+          s2++;
+      e2 = strchr (s2, '\0'); /*hmm*/
+      while (e2 > s2 && isblank ((unsigned char) e2[-1]))
+        e2--;
+    }
+
+  /* the final compare */
+  l = (   e1 - s1 != e2 - s2
+       || memcmp (s1, s2, e1 - s1));
+  if (a1)
+    free (a1);
+  if (a2)
+    free (a2);
+  if (l)
+    return variable_buffer_output (o, "", 1);
+  return variable_buffer_output (o, argv[2], strlen (argv[2]));
+}
+#endif 
 
 /* Lookup table for builtin functions.
@@ -2179 +2317 @@
   { STRING_SIZE_TUPLE("tolower"),       0,  1,  1,  func_toupper_tolower},
 #endif
+#if defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE)
+  { STRING_SIZE_TUPLE("comp-vars"),     3,  3,  1,  func_comp_vars},
+#endif
+#ifdef KMK
+  { STRING_SIZE_TUPLE("kb-src-tool"),   1,  1,  0,  func_kbuild_source_tool},
+  { STRING_SIZE_TUPLE("kb-obj-base"),   1,  1,  0,  func_kbuild_object_base},
+  { STRING_SIZE_TUPLE("kb-obj-suff"),   1,  1,  0,  func_kbuild_object_suffix},
+  { STRING_SIZE_TUPLE("kb-src-prop"),   3,  3,  0,  func_kbuild_source_prop},
+  { STRING_SIZE_TUPLE("kb-src-one"),    1,  1,  0,  func_kbuild_source_one},
+#endif 
 };
 

trunk/src/gmake/main.c

@@ -282 +282 @@
 
 struct variable shell_var;
+
+#ifdef KMK
+/* Process priority. 
+    0 = no change; 
+    1 = idle / max nice; 
+    2 = below normal /  nice 10; 
+    3 = normal / nice 0; 
+    4 = high / nice -10;
+    4 = realtime / nice -19; */
+int process_priority = 0;
+#endif 
 
 
@@ -402 +413 @@
     { 'p', flag, (char *) &print_data_base_flag, 1, 1, 0, 0, 0,
       "print-data-base" },
+#ifdef KMK
+    { CHAR_MAX+5, positive_int, (char *) &process_priority, 1, 1, 0, 0, 0,
+      "priority" },
+#endif
     { 'q', flag, (char *) &question_flag, 1, 1, 1, 0, 0, "question" },
     { 'r', flag, (char *) &no_builtin_rules_flag, 1, 1, 0, 0, 0,
@@ -667 +682 @@
     }
 }
+
+
+#ifdef KMK
+static void
+set_make_priority (void)
+{
+#ifdef WINDOWS32
+    DWORD dwPriority;
+    switch (process_priority)
+      {
+        case 0:     return;
+        case 1:     dwPriority = IDLE_PRIORITY_CLASS; break;
+        case 2:     dwPriority = BELOW_NORMAL_PRIORITY_CLASS; break;
+        case 3:     dwPriority = NORMAL_PRIORITY_CLASS; break;
+        case 4:     dwPriority = HIGH_PRIORITY_CLASS; break;
+        case 5:     dwPriority = REALTIME_PRIORITY_CLASS; break;
+        default:    fatal(NILF, _("invalid priority %d\n"), process_priority);
+      }
+    SetPriorityClass(GetCurrentProcess(), dwPriority);
+#else /*#elif HAVE_NICE */
+    int nice = 0;
+    switch (process_priority)
+      {
+        case 0:     return;
+        case 1:     nice = 19; break;
+        case 2:     nice = 10; break;
+        case 3:     nice = 0; break;
+        case 4:     nice = -10; break;
+        case 5:     nice = -19; break;
+        default:    fatal(NILF, _("invalid priority %d\n"), process_priority);
+      }
+    nice(nice);
+#endif 
+}
+#endif 
+
 
 #ifdef WINDOWS32
@@ -1277 +1328 @@
 
   decode_debug_flags ();
+
+#ifdef KMK
+  set_make_priority ();
+#endif 
 
   /* Set always_make_flag if -B was given and we've not restarted already.  */

trunk/src/gmake/read.c

@@ -461 +461 @@
 }
 
+#ifdef CONFIG_WITH_INCLUDEDEP
+/* no nonsense dependency file including. */
+void 
+eval_include_dep(char *name, struct floc *f)
+{
+  FILE *fp;
+  long max_size;
+  long size;
+  char *buf;
+  unsigned int saved_var_len;
+  char *saved_var_buf;
+
+  /* ignore non-existing dependency files. */
+  if (!file_exists_p (name))
+    return;
+
+  /* open it and determin the size. */
+  errno = 0;
+  fp = fopen (name, "r");
+  if (!fp)
+    {
+      error (f, "%s: %s", name, strerror (errno));
+      return;
+    }
+
+  if (fseek (fp, 0, SEEK_END))
+    fatal (f, "%s: fseek failed - %s", name, strerror (errno));
+  max_size = ftell (fp);
+  if (max_size < 0)
+    fatal (f, "%s: ftell failed - %s", name, strerror (errno));
+  if (fseek (fp, 0, SEEK_SET))
+    fatal (f, "%s: fseek failed - %s", name, strerror (errno));
+
+  /* ignore empty files. */
+  if (max_size == 0)
+  {
+      fclose (fp);
+      return;
+  }
+
+  /* allocate a buffer and read the file. \r\n -> \n conversion 
+     make this intersting ... */
+  buf = xmalloc (max_size + 1);
+  size = fread (buf, 1, max_size, fp); /* FIXME: EINTR? incomplete reads? */
+  if (   size == -1
+      || (ferror (fp) && !feof (fp)))
+      fatal (f, "%s: fread failed - %s", name, strerror (errno));
+  if (size < max_size / 2)
+      fatal (f, "%s: fread failed - %s", name, strerror (errno));
+  buf[size] = '\0';
+
+  /* evaluate the buffer and cleanup. */
+  install_variable_buffer (&saved_var_buf, &saved_var_len);
+  eval_buffer (buf);
+  restore_variable_buffer (saved_var_buf, saved_var_len);
+
+  free (buf);
+  fclose (fp);
+}
+#endif /* CONFIG_WITH_INCLUDEDEP */
+
 
 
@@ -809 +870 @@
                does not globbing and doesn't support multiple names. It's
                trying to save time by being dead simple. */
-            struct conditionals *save;
-            struct conditionals new_conditionals;
             char *name = p2;
             char *end = strchr(name, '\0');
             char saved;
-            int r;
 
             while (end > name && isspace ((unsigned char)end[-1]))
               --end;
+
             saved = *end; /* not sure if this is required... */
             *end = '\0';
-
-            if (file_exists_p (name))
-              {
-                /* Save the state of conditionals and start
-                   the included makefile with a clean slate.  */
-                save = install_conditionals (&new_conditionals);
-
-                /* Record the rules that are waiting so they will determine
-                   the default goal before those in the included makefile.  */
-                record_waiting_files ();
-
-                /* Read the makefile.  */
-                r = eval_makefile (name, RM_INCLUDED | RM_NO_TILDE | RM_DONTCARE);
-                if (!r)
-                  error (fstart, "%s: %s", name, strerror (errno));
-
-                /* Restore conditional state.  */
-                restore_conditionals (save);
-              }
+            eval_include_dep (name, fstart);
             *end = saved;
+
             goto rule_complete;
           }

trunk/src/gmake/variable.c

@@ -351 +351 @@
       if ((int) origin >= (int) v->origin)
         {
-          if (v->value != 0)
-            free (v->value);
+#ifdef CONFIG_WITH_VALUE_LENGTH
+          v->value_length = strlen (value);
+          v->value = xrealloc (v->value, v->value_length + 1);
+          bcopy (value, v->value, v->value_length + 1);
+#else
+          if (v->value != 0)
+            free (v->value);
           v->value = xstrdup (value);
+#endif 
           if (flocp != 0)
             v->fileinfo = *flocp;
@@ -374 +380 @@
 #endif
   hash_insert_at (&set->table, v, var_slot);
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  v->value_length = strlen (value);
+  v->value = xmalloc (v->value_length + 1);
+  bcopy (value, v->value, v->value_length + 1);
+#else
   v->value = xstrdup (value);
+#endif 
   if (flocp != 0)
     v->fileinfo = *flocp;
@@ -1031 +1043 @@
       v->origin = o_file;
       v->value = xstrdup (default_shell);
+#ifdef CONFIG_WITH_VALUE_LENGTH
+      v->value_length = -1;
+#endif 
     }
 #endif
@@ -1305 +1320 @@
               val = alloc_value = allocated_variable_expand (val);
 
-            oldlen = strlen (v->value);
+#ifdef CONFIG_WITH_VALUE_LENGTH
+            oldlen = v->value_length;
+            assert(oldlen == strlen (v->value));
+#endif 
             vallen = strlen (val);
             p = (char *) alloca (oldlen + 1 + vallen + 1);
@@ -1538 +1556 @@
   p = next_token (p);
   v->value = p;
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  v->value_length = -1;
+#endif 
 
   /* Expand the name, so "$(foo)bar = baz" works.  */

trunk/src/gmake/variable.h

@@ -57 +57 @@
     int hash2;                  /* the secondary hash */
 #endif
+#ifdef CONFIG_WITH_VALUE_LENGTH
+    int value_length;           /* The length of the value, usually unused.  */
+#endif 
     char *value;                /* Variable value.  */
     struct floc fileinfo;       /* Where the variable was defined.  */