Changeset 2838 for trunk/src/kWorker

Timestamp:

Aug 25, 2016, 11:46:25 PM (9 years ago)

Author:

bird

Message:

kWorker: A little more hacking.

Location:

trunk/src/kWorker

Files:

• Makefile.kmk (modified) (4 diffs)
• kWorker.c (modified) (1 diff)

trunk/src/kWorker/Makefile.kmk

@@ -24 +24 @@
 #
 
-## @todo fixme!!!
-KBUILD_WITH_STATIC_MSVCRT = 1
 
 SUB_DEPTH = ../..
@@ -32 +30 @@
 
 PROGRAMS += kWorker
-kWorker_TEMPLATE = BIN
+kWorker_TEMPLATE = BIN-STATIC-THREADED
 kWorker_INCS = kStuff/include
 kWorker_DEFS.debug = K_STRICT
@@ -39 +37 @@
 kWorker_LIBS = \
         $(kStuff_1_TARGET) \
-        $(LIB_KDEP) \
-        $(LIB_KUTIL)
+        $(kWorkerLib_1_TARGET)
 include $(KBUILD_PATH)/sdks/WINDDK71.kmk
 kWorker_LIBS.win = \
-        $(TEMPLATE_BIN_LIBS) \
+        $(TEMPLATE_BIN-STATIC-THREADED_LIBS) \
         $(PATH_SDK_WINDDK71_LIB_WNET)/ntdll.lib
 kWorker_LDFLAGS.win = \
@@ -50 +47 @@
 
 #
+# Stuff from ../libs.  Need to rebuilt it with static CRT.
+#
+LIBRARIES += kWorkerLib
+kWorkerLib_TEMPLATE = LIB-STATIC-THREADED
+kWorkerLib_DEFPATH = ../lib # Need fix from r2837.
+kWorkerLib_DEFPATH := $(PATH_SUB_CURRENT)/../lib
+kWorkerLib_SOURCES = \
+        crc32.c \
+        md5.c
+kWorkerLib_SOURCES.win = \
+        nt_fullpath.c \
+        quoted_spawn.c \
+       nt/nthlpcore.c \
+       nt/nthlpfs.c \
+       nt/ntdir.c \
+       nt/ntstat.c \
+       nt/ntunlink.c
+
+#
 # kStuff library.
 #
 LIBRARIES += kStuff
-kStuff_TEMPLATE = LIB
+kStuff_TEMPLATE = LIB-STATIC-THREADED
 kStuff_DEFS.debug = K_STRICT
 kStuff_INCS = kStuff/include

trunk/src/kWorker/kWorker.c

@@ -4922 +4922 @@
 #else
 // Skylake (W10/amd64, only stdandard MS defender):
-//     run 4: 32.67/1024 = 0x0 (0.031904296875)
-//     run 3: 32.77/1024 = 0x0 (0.032001953125)
-//     run 2: 34/1024 = 0x0 (0.033203125)
-//     run 1: 37/1024 = 0x0 (0.0361328125)
-//     kmk 1: 44/1024 = 0x0 (0.04296875)
-//     cmd 1: 48/1024 = 0x0 (0.046875)
+//     cmd 1:  48    /1024 = 0x0 (0.046875)        [for /l %i in (1,1,1024) do ...]
+//     kmk 1:  44    /1024 = 0x0 (0.04296875)      [all: ; 1024 x cl.exe]
+//     run 1:  37    /1024 = 0x0 (0.0361328125)    [just process creation gain]
+//     run 2:  34    /1024 = 0x0 (0.033203125)     [get file attribs]
+//     run 3:  32.77 /1024 = 0x0 (0.032001953125)  [read caching of headers]
+//     run 4:  32.67 /1024 = 0x0 (0.031904296875)  [loader tweaking]
+//     run 5:  29.144/1024 = 0x0 (0.0284609375)    [with temp files in memory]
 // Dell (W7/amd64, infected by mcafee):
 //     kmk 1: 285.278/1024 = 0x0 (0.278591796875)