Changeset 1933 for trunk

Timestamp:

Oct 24, 2008, 10:40:32 PM (17 years ago)

Author:

bird

Message:

kmk: moved suffixes_strcached to strcache.c and global scope.

Location:

trunk/src/kmk

Files:

• commands.c (modified) (2 diffs)
• file.c (modified) (1 diff)
• make.h (modified) (1 diff)
• strcache.c (modified) (2 diffs)

trunk/src/kmk/commands.c

@@ -85 +85 @@
       const char *name;
       unsigned int len;
-#ifdef CONFIG_WITH_STRCACHE2
-      static const char *suffixes_strcache = 0; /* XXX: make this global */
-
-      if (!suffixes_strcache)
-        suffixes_strcache = strcache_add_len (".SUFFIXES", sizeof (".SUFFIXES") - 1);
-#endif /* CONFIG_WITH_STRCACHE2 */
 
 #ifndef NO_ARCHIVES
@@ -114 +108 @@
           unsigned int slen = strlen (dep_name (d));
 #else
-      for (d = enter_file (suffixes_strcache)->deps; d ; d = d->next)
+      for (d = enter_file (suffixes_strcached)->deps; d ; d = d->next)
         {
           unsigned int slen = strcache2_get_len (&file_strcache, dep_name (d));

trunk/src/kmk/file.c

@@ -863 +863 @@
   for (file_slot = file_slot_0; file_slot < file_end; file_slot++)
     for (f = *file_slot; f != 0; f = f->prev)
+#ifndef CONFIG_WITH_STRCACHE2
       if (strcmp (f->name, ".SUFFIXES") != 0)
+#else
+      if (f->name != suffixes_strcached)
+#endif
         expand_deps (f);
   free (file_slot_0);

trunk/src/kmk/make.h

@@ -639 +639 @@
 # include "strcache2.h"
 extern struct strcache2 file_strcache;
+extern const char *suffixes_strcached;
 
 # define strcache_iscached(str)     strcache2_is_cached(&file_strcache, str)

trunk/src/kmk/strcache.c

@@ -250 +250 @@
 
 #include "strcache2.h"
+
+const char *suffixes_strcached;
 
 /* The file string cache. */
@@ -266 +268 @@
 #endif
                  0);            /* thread safe */
+
+  /* .SUFFIXES is referenced in several loops, keep the added pointer in a
+     global var so these can be optimized. */
+
+  suffixes_strcached = strcache_add_len (".SUFFIXES", sizeof (".SUFFIXES")-1);
 }