Changeset 1934 in kBuild

Timestamp:

Oct 24, 2008 10:24:02 PM (16 years ago)

Author:

bird

Message:

kmk: Implemented lazy resolving of $+, $^{, $? and $|. This saves > 30% memory and also a bit of time.}

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• commands.c (modified) (3 diffs)
• filedef.h (modified) (1 diff)
• function.c (modified) (3 diffs)
• testcase-lazy-deps-vars.kmk (added)
• variable.c (modified) (1 diff)

trunk/src/kmk/Makefile.am

@@ -140 +140 @@
         -DCONFIG_WITH_PRINT_STATS_SWITCH \
         -DCONFIG_WITH_RDONLY_VARIABLE_VALUE \
+        -DCONFIG_WITH_LAZY_DEP_LISTS \
         \
         -DKBUILD_HOST=\"$(BUILD_TARGET)\" \

trunk/src/kmk/Makefile.kmk

@@ -170 +170 @@
         CONFIG_WITH_PRINT_STATS_SWITCH \
         CONFIG_WITH_RDONLY_VARIABLE_VALUE \
+        CONFIG_WITH_LAZY_DEPS_VARS \
         \
         KBUILD_HOST=\"$(KBUILD_TARGET)\" \
@@ -517 +518 @@
         fi
 
-
-test_all:       test_math test_stack test_shell test_if1of test_local test_includedep test_2ndtargetexp test_30_continued_on_failure
-
+test_lazy_deps_vars:
+        $(MAKE) -C $(kmk_PATH) -f testcase-lazy-deps-vars.kmk
+
+
+test_all:       test_math test_stack test_shell test_if1of test_local test_includedep test_2ndtargetexp test_30_continued_on_failure test_lazy_deps_vars
+
+

trunk/src/kmk/commands.c

@@ -26 +26 @@
 #include <windows.h>
 #include "w32err.h"
+#endif
+#ifdef CONFIG_WITH_LAZY_DEPS_VARS
+# include <assert.h>
 #endif
 
@@ -175 +178 @@
 #endif /* CONFIG_WITH_RDONLY_VARIABLE_VALUE */
 
+#ifndef CONFIG_WITH_LAZY_DEPS_VARS
   /* Compute the values for $^, $+, $?, and $|.  */
 
@@ -317 +321 @@
   }
 
+#else  /* CONFIG_WITH_LAZY_DEPS_VARS */
+
+  /* Make a copy of the current dependency chain for later use in
+     potential $(dep-pluss $@) calls.  Then drop duplicate deps.  */
+
+  /* assert (file->org_deps == NULL); - FIXME? */
+  free_dep_chain (file->org_deps);
+  file->org_deps = copy_dep_chain (file->deps);
+
+  uniquize_deps (file->deps);
+
+#endif /* CONFIG_WITH_LAZY_DEPS_VARS */
 #undef  DEFINE_VARIABLE
 }

trunk/src/kmk/filedef.h

@@ -30 +30 @@
     const char *vpath;          /* VPATH/vpath pathname */
     struct dep *deps;           /* all dependencies, including duplicates */
+#ifdef CONFIG_WITH_LAZY_DEPS_VARS
+    struct dep *org_deps;       /* original dependencies before
+                                   duplicates were dropped. */
+#endif
     struct commands *cmds;      /* Commands to execute for this target.  */
     int command_flags;          /* Flags OR'd in for cmds; see commands.h.  */

trunk/src/kmk/function.c

@@ -2185 +2185 @@
 
 
+#ifdef CONFIG_WITH_LAZY_DEPS_VARS
+
+/* This is also in file.c (bad).  */
+# if VMS
+#  define FILE_LIST_SEPARATOR ','
+# else
+#  define FILE_LIST_SEPARATOR ' '
+# endif
+
+/* Implements $^ and $+.
+
+   The first is somes with with FUNCNAME 'dep', the second as 'dep-all'.
+
+   If no second argument is given, or if it's empty, or if it's zero,
+   all dependencies will be returned.  If the second argument is non-zero
+   the dependency at that position will be returned.  If the argument is
+   negative a fatal error is thrown.  */
+static char *
+func_deps (char *o, char **argv, const char *funcname)
+{
+  unsigned int idx = 0;
+  struct file *file;
+
+  /* Handle the argument if present. */
+
+  if (argv[1])
+    {
+      char *p = argv[1];
+      while (isspace ((unsigned int)*p))
+        p++;
+      if (*p != '\0')
+        {
+          char *n;
+          long l = strtol (p, &n, 0);
+          while (isspace ((unsigned int)*n))
+            n++;
+          idx = l;
+          if (*n != '\0' || l < 0 || (long)idx != l)
+            fatal (NILF, _("%s: invalid index value: `%s'\n"), funcname, p);
+        }
+    }
+
+  /* Find the file and select the list corresponding to FUNCNAME. */
+
+  file = lookup_file (argv[0]);
+  if (file)
+    {
+      struct dep *deps = funcname[4] != '\0' && file->org_deps
+                       ? file->org_deps : file->deps;
+      struct dep *d;
+
+      if (idx == 0 /* all */)
+        {
+          unsigned int total_len = 0;
+
+          /* calc the result length. */
+
+          for (d = deps; d; d = d->next)
+            if (!d->ignore_mtime)
+              {
+                const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                if (ar_name (c))
+                  {
+                    c = strchr (c, '(') + 1;
+                    total_len += strlen (c);
+                  }
+                else
+#else
+                  total_len += strcache2_get_len (&file_strcache, c) + 1;
+#endif
+              }
+
+          if (total_len)
+            {
+              /* prepare the variable buffer dude wrt to the output size and
+                 pass along the strings.  */
+
+              o = variable_buffer_output (o + total_len, "", 0) - total_len; /* a hack */
+
+              for (d = deps; d; d = d->next)
+                if (!d->ignore_mtime)
+                  {
+                    unsigned int len;
+                    const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                    if (ar_name (c))
+                      {
+                        c = strchr (c, '(') + 1;
+                        len += strlen (c);
+                      }
+                    else
+#else
+                      len = strcache2_get_len (&file_strcache, c) + 1;
+#endif
+                    o = variable_buffer_output (o, c, len);
+                    o[-1] = FILE_LIST_SEPARATOR;
+                  }
+
+                --o;        /* nuke the last list separator */
+                *o = '\0';
+            }
+        }
+      else
+        {
+          /* Dependency given by index.  */
+
+          for (d = deps; d; d = d->next)
+            if (!d->ignore_mtime)
+              {
+                if (--idx == 0) /* 1 based indexing */
+                  {
+                    unsigned int len;
+                    const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                    if (ar_name (c))
+                      {
+                        c = strchr (c, '(') + 1;
+                        len += strlen (c) - ;
+                      }
+                    else
+#else
+                        len = strcache2_get_len (&file_strcache, c);
+#endif
+                    o = variable_buffer_output (o, c, len);
+                    break;
+                  }
+              }
+        }
+    }
+
+  return o;
+}
+
+/* Implements $?.
+
+   If no second argument is given, or if it's empty, or if it's zero,
+   all dependencies will be returned.  If the second argument is non-zero
+   the dependency at that position will be returned.  If the argument is
+   negative a fatal error is thrown.  */
+static char *
+func_deps_newer (char *o, char **argv, const char *funcname)
+{
+  unsigned int idx = 0;
+  struct file *file;
+
+  /* Handle the argument if present. */
+
+  if (argv[1])
+    {
+      char *p = argv[1];
+      while (isspace ((unsigned int)*p))
+        p++;
+      if (*p != '\0')
+        {
+          char *n;
+          long l = strtol (p, &n, 0);
+          while (isspace ((unsigned int)*n))
+            n++;
+          idx = l;
+          if (*n != '\0' || l < 0 || (long)idx != l)
+            fatal (NILF, _("%s: invalid index value: `%s'\n"), funcname, p);
+        }
+    }
+
+  /* Find the file. */
+
+  file = lookup_file (argv[0]);
+  if (file)
+    {
+      struct dep *deps = file->deps;
+      struct dep *d;
+
+      if (idx == 0 /* all */)
+        {
+          unsigned int total_len = 0;
+
+          /* calc the result length. */
+
+          for (d = deps; d; d = d->next)
+            if (!d->ignore_mtime && d->changed)
+              {
+                const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                if (ar_name (c))
+                  {
+                    c = strchr (c, '(') + 1;
+                    total_len += strlen (c);
+                  }
+                else
+#else
+                  total_len += strcache2_get_len (&file_strcache, c) + 1;
+#endif
+              }
+
+          if (total_len)
+            {
+              /* prepare the variable buffer dude wrt to the output size and
+                 pass along the strings.  */
+
+              o = variable_buffer_output (o + total_len, "", 0) - total_len; /* a hack */
+
+              for (d = deps; d; d = d->next)
+                if (!d->ignore_mtime && d->changed)
+                  {
+                    unsigned int len;
+                    const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                    if (ar_name (c))
+                      {
+                        c = strchr (c, '(') + 1;
+                        len += strlen (c);
+                      }
+                    else
+#else
+                      len = strcache2_get_len (&file_strcache, c) + 1;
+#endif
+                    o = variable_buffer_output (o, c, len);
+                    o[-1] = FILE_LIST_SEPARATOR;
+                  }
+
+                --o;        /* nuke the last list separator */
+                *o = '\0';
+            }
+        }
+      else
+        {
+          /* Dependency given by index.  */
+
+          for (d = deps; d; d = d->next)
+            if (!d->ignore_mtime && d->changed)
+              {
+                if (--idx == 0) /* 1 based indexing */
+                  {
+                    unsigned int len;
+                    const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                    if (ar_name (c))
+                      {
+                        c = strchr (c, '(') + 1;
+                        len += strlen (c) - ;
+                      }
+                    else
+#else
+                        len = strcache2_get_len (&file_strcache, c);
+#endif
+                    o = variable_buffer_output (o, c, len);
+                    break;
+                  }
+              }
+        }
+    }
+
+  return o;
+}
+
+/* Implements $|, the order only dependency list.
+
+   If no second argument is given, or if it's empty, or if it's zero,
+   all dependencies will be returned.  If the second argument is non-zero
+   the dependency at that position will be returned.  If the argument is
+   negative a fatal error is thrown.  */
+static char *
+func_deps_order_only (char *o, char **argv, const char *funcname)
+{
+  unsigned int idx = 0;
+  struct file *file;
+
+  /* Handle the argument if present. */
+
+  if (argv[1])
+    {
+      char *p = argv[1];
+      while (isspace ((unsigned int)*p))
+        p++;
+      if (*p != '\0')
+        {
+          char *n;
+          long l = strtol (p, &n, 0);
+          while (isspace ((unsigned int)*n))
+            n++;
+          idx = l;
+          if (*n != '\0' || l < 0 || (long)idx != l)
+            fatal (NILF, _("%s: invalid index value: `%s'\n"), funcname, p);
+        }
+    }
+
+  /* Find the file. */
+
+  file = lookup_file (argv[0]);
+  if (file)
+    {
+      struct dep *deps = file->deps;
+      struct dep *d;
+
+      if (idx == 0 /* all */)
+        {
+          unsigned int total_len = 0;
+
+          /* calc the result length. */
+
+          for (d = deps; d; d = d->next)
+            if (d->ignore_mtime)
+              {
+                const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                if (ar_name (c))
+                  {
+                    c = strchr (c, '(') + 1;
+                    total_len += strlen (c);
+                  }
+                else
+#else
+                  total_len += strcache2_get_len (&file_strcache, c) + 1;
+#endif
+              }
+
+          if (total_len)
+            {
+              /* prepare the variable buffer dude wrt to the output size and
+                 pass along the strings.  */
+
+              o = variable_buffer_output (o + total_len, "", 0) - total_len; /* a hack */
+
+              for (d = deps; d; d = d->next)
+                if (d->ignore_mtime)
+                  {
+                    unsigned int len;
+                    const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                    if (ar_name (c))
+                      {
+                        c = strchr (c, '(') + 1;
+                        len += strlen (c);
+                      }
+                    else
+#else
+                      len = strcache2_get_len (&file_strcache, c) + 1;
+#endif
+                    o = variable_buffer_output (o, c, len);
+                    o[-1] = FILE_LIST_SEPARATOR;
+                  }
+
+                --o;        /* nuke the last list separator */
+                *o = '\0';
+            }
+        }
+      else
+        {
+          /* Dependency given by index.  */
+
+          for (d = deps; d; d = d->next)
+            if (d->ignore_mtime)
+              {
+                if (--idx == 0) /* 1 based indexing */
+                  {
+                    unsigned int len;
+                    const char *c = dep_name (d);
+
+#ifndef NO_ARCHIVES
+                    if (ar_name (c))
+                      {
+                        c = strchr (c, '(') + 1;
+                        len += strlen (c) - ;
+                      }
+                    else
+#else
+                        len = strcache2_get_len (&file_strcache, c);
+#endif
+                    o = variable_buffer_output (o, c, len);
+                    break;
+                  }
+              }
+        }
+    }
+
+  return o;
+}
+#endif /* CONFIG_WITH_LAZY_DEPS_VARS */
+
+
 
 #ifdef CONFIG_WITH_DEFINED
@@ -3844 +4233 @@
 
       initialize_file_variables (file, 1 /* reading - FIXME: we don't know? */);
-      set_file_variables (file);
+      set_file_variables (file); /* FIXME: this must *NOT* be done twice! */
       chop_commands (cmds);
 
@@ -4073 +4462 @@
   { STRING_SIZE_TUPLE("not"),           0,  1,  1,  func_not},
 #endif
+#ifdef CONFIG_WITH_LAZY_DEPS_VARS
+  { STRING_SIZE_TUPLE("deps"),          1,  2,  1,  func_deps},
+  { STRING_SIZE_TUPLE("deps-all"),      1,  2,  1,  func_deps},
+  { STRING_SIZE_TUPLE("deps-newer"),    1,  2,  1,  func_deps_newer},
+  { STRING_SIZE_TUPLE("deps-oo"),       1,  2,  1,  func_deps_order_only},
+#endif
 #ifdef CONFIG_WITH_DEFINED
   { STRING_SIZE_TUPLE("defined"),       1,  1,  1,  func_defined},

trunk/src/kmk/variable.c

@@ -1410 +1410 @@
   define_variable ("^F", 2, "$(notdir $^)", o_automatic, 1);
   define_variable ("+F", 2, "$(notdir $+)", o_automatic, 1);
+#ifdef CONFIG_WITH_LAZY_DEPS_VARS
+  define_variable ("^", 1, "$(deps $@)", o_automatic, 1);
+  define_variable ("+", 1, "$(deps-all $@)", o_automatic, 1);
+  define_variable ("?", 1, "$(deps-newer $@)", o_automatic, 1);
+  define_variable ("|", 1, "$(deps-oo $@)", o_automatic, 1);
+#endif /* CONFIG_WITH_LAZY_DEPS_VARS */
 }