Changeset 1162 for trunk/src

Timestamp:

Sep 30, 2007, 5:55:36 AM (18 years ago)

Author:

bird

Message:

Made kDepIDB into an builtin command to try speed up windows...

Location:

trunk/src

Files:

• Makefile.kmk (modified) (1 diff)
• kDepIDB (deleted)
• kmk/Makefile.am (modified) (2 diffs)
• kmk/Makefile.kmk (modified) (5 diffs)
• kmk/kmkbuiltin.c (modified) (1 diff)
• kmk/kmkbuiltin.h (modified) (1 diff)
• kmk/kmkbuiltin/kDepIDB.c (copied) (copied from trunk/src/kDepIDB/kDepIDB.c ) (7 diffs)
• kmk/variable.c (modified) (1 diff)

trunk/src/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 
-SUBDIRS = lib kmk sed kDepPre kDepIDB kObjCache
+SUBDIRS = lib kmk sed kDepPre kObjCache
 ifneq ($(BUILD_TARGET),win)
 SUBDIRS += ash

trunk/src/kmk/Makefile.am

@@ -50 +50 @@
                 electric.c \
         ../lib/md5.c \
+        ../lib/kDep.c \
                 \
                 kmkbuiltin.c \
@@ -59 +60 @@
                 kmkbuiltin/echo.c \
                 kmkbuiltin/install.c \
+                kmkbuiltin/kDepIDB.c \
+                kmkbuiltin/ln.c \
                 kmkbuiltin/md5sum.c \
                 kmkbuiltin/mkdir.c \
                 kmkbuiltin/mv.c \
-                kmkbuiltin/ln.c \
                 kmkbuiltin/printf.c \
                 kmkbuiltin/rm.c \

trunk/src/kmk/Makefile.kmk

@@ -123 +123 @@
 kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS
 kmk_DEFS.amd64 = CONFIG_WITH_OPTIMIZATION_HACKS
-kmk_DEFS.win.x86 = \
-        CONFIG_NEW_WIN32_CTRL_EVENT
+kmk_DEFS.win.x86 = CONFIG_NEW_WIN32_CTRL_EVENT
 
 kmk_SOURCES = \
@@ -155 +154 @@
 #
 kmk_DEFS += CONFIG_WITH_KMK_BUILTIN
-kmk_LIBS += $(LIB_KUTIL)
+kmk_LIBS += $(LIB_KUTIL) $(LIB_KDEP)
 kmk_SOURCES += \
         kmkbuiltin.c \
@@ -165 +164 @@
         kmkbuiltin/echo.c \
         kmkbuiltin/install.c \
+        kmkbuiltin/kDepIDB.c \
         kmkbuiltin/md5sum.c \
         kmkbuiltin/mkdir.c \
@@ -177 +177 @@
 # Standalone kmkbuiltin commands.
 #
-PROGRAMS += kmk_append kmk_cat kmk_cp kmk_cmp kmk_echo kmk_md5sum kmk_mkdir kmk_mv kmk_install kmk_ln kmk_printf kmk_rm kmk_rmdir
+PROGRAMS += \
+        kmk_append \
+        kmk_cat \
+        kmk_cp \
+        kmk_cmp \
+        kmk_echo \
+        kmk_md5sum \
+        kmk_mkdir \
+        kmk_mv \
+        kmk_install \
+        kmk_ln \
+        kmk_printf \
+        kmk_rm \
+        kmk_rmdir \
+        kDepIDB \
 
 kmk_append_TEMPLATE = BIN-KMK
@@ -246 +260 @@
 kmk_rmdir_SOURCES = \
         kmkbuiltin/rmdir.c
+
+kDepIDB_TEMPLATE = BIN-KMK
+kDepIDB_DEFS = kmk_builtin_kDepIDB=main
+kDepIDB_INCS = .
+kDepIDB_LIBS = $(LIB_KDEP)
+kDepIDB_SOURCES = \
+        kmkbuiltin/kDepIDB.c
 
 

trunk/src/kmk/kmkbuiltin.c

@@ -192 +192 @@
     else if (!strcmp(pszCmd, "install"))
         rc = kmk_builtin_install(argc, argv, environ);
+    else if (!strcmp(pszCmd, "kDepIDB"))
+        rc = kmk_builtin_kDepIDB(argc, argv, environ);
     else if (!strcmp(pszCmd, "ln"))
         rc = kmk_builtin_ln(argc, argv, environ);

trunk/src/kmk/kmkbuiltin.h

@@ -41 +41 @@
 extern int kmk_builtin_rm(int argc, char **argv, char **envp);
 extern int kmk_builtin_rmdir(int argc, char **argv, char **envp);
+extern int kmk_builtin_kDepIDB(int argc, char **argv, char **envp);
 

trunk/src/kmk/kmkbuiltin/kDepIDB.c

@@ -35 +35 @@
 #include <errno.h>
 #include <ctype.h>
-#ifndef __WIN32__
+#if !defined(_MSC_VER)
 # include <stdint.h>
 #else
@@ -42 +42 @@
  typedef unsigned int   uint32_t;
 #endif
-#include "kDep.h"
+/*#include "kDep.h"*/
+#include "../../lib/kDep.h"
+#include "kmkbuiltin.h"
 
 #define OFFSETOF(type, member)  ( (int)(size_t)(void *)&( ((type *)(void *)0)->member) )
@@ -365 +367 @@
         /* validate? */
         return pRoot;
-#endif 
+#endif
     }
     return NULL;
@@ -440 +442 @@
                     fAdded = 1;
                 }
-                dprintf(("%#06x #%d: %6d bytes  %s%s\n", off, iStream, 
-                         iStream < pRoot->cStreams ? pRoot->aStreams[iStream].cbStream : -1, 
-                         psz, fAdded ? "  [dep]" : "")); 
+                dprintf(("%#06x #%d: %6d bytes  %s%s\n", off, iStream,
+                         iStream < pRoot->cStreams ? pRoot->aStreams[iStream].cbStream : -1,
+                         psz, fAdded ? "  [dep]" : ""));
                 (void)fAdded;
 
@@ -459 +461 @@
         }
         else
-            dprintf(("Unknown version or bad size: Version=%u cbNames=%d cbStream=%d\n", 
+            dprintf(("Unknown version or bad size: Version=%u cbNames=%d cbStream=%d\n",
                      pNames->Version, pNames->cbNames, cbStream));
         free(pNames);
@@ -477 +479 @@
                 ||  !pRoot->aStreams[iStream].cbStream)
                 continue;
-            dprintf(("Stream #%d: %#x bytes (%#x aligned)\n", iStream, pRoot->aStreams[iStream].cbStream, 
+            dprintf(("Stream #%d: %#x bytes (%#x aligned)\n", iStream, pRoot->aStreams[iStream].cbStream,
                      Pdb70Align(pHdr, pRoot->aStreams[iStream].cbStream)));
             pbStream = (uint8_t *)Pdb70AllocAndReadStream(pHdr, pRoot, iStream, &cbStream);
@@ -735 +737 @@
 
 
-int main(int argc, char *argv[])
+int kmk_builtin_kDepIDB(int argc, char *argv[])
 {
     int         i;

trunk/src/kmk/variable.c

@@ -1105 +1105 @@
 #ifdef CONFIG_WITH_KMK_BUILTIN
   /* The supported kMk Builtin commands. */
-  (void) define_variable ("KMK_BUILTIN", 11, "append cat cp cmp echo install ln md5sum mkdir mv printf rm rmdir", o_default, 0);
+  (void) define_variable ("KMK_BUILTIN", 11, "append cat cp cmp echo install kDepIDB ln md5sum mkdir mv printf rm rmdir", o_default, 0);
 #endif