Changeset 2912 in kBuild for trunk/src/kWorker

Timestamp:

Sep 14, 2016 1:36:15 PM (8 years ago)

Author:

bird

Message:

rewrote kmk_redirect to skip the separate process. Added chache invalidation after directory deletion for addressing kmk rebuild and fetching.

File:

• trunk/src/kWorker/kWorker.c (modified) (7 diffs)

trunk/src/kWorker/kWorker.c

@@ -2638 +2638 @@
 static _onexit_t __cdecl kwSandbox_msvcrt__onexit(_onexit_t pfnFunc)
 {
-    if (g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_LINK)
+    //if (g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_LINK)
     {
         PKWEXITCALLACK pCallback;
@@ -2663 +2663 @@
 static int __cdecl kwSandbox_msvcrt_atexit(int (__cdecl *pfnFunc)(void))
 {
-    if (g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_LINK)
+    //if (g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_LINK)
     {
         PKWEXITCALLACK pCallback;
@@ -7492 +7492 @@
     PKWEXITCALLACK              pExitCallback;
 
+
+    /*
+     * First stuff that may cause code to run.
+     */
+
     /* Do exit callback first. */
     pExitCallback = g_Sandbox.pExitCallbackHead;
@@ -7514 +7519 @@
     }
 
+    /* Free left behind FlsAlloc leaks. */
+    pLocalStorage = g_Sandbox.pFlsAllocHead;
+    g_Sandbox.pFlsAllocHead = NULL;
+    while (pLocalStorage)
+    {
+        PKWLOCALSTORAGE pNext = pLocalStorage->pNext;
+        KW_LOG(("Freeing leaked FlsAlloc index %#x\n", pLocalStorage->idx));
+        FlsFree(pLocalStorage->idx);
+        kHlpFree(pLocalStorage);
+        pLocalStorage = pNext;
+    }
+
+    /* Free left behind TlsAlloc leaks. */
+    pLocalStorage = g_Sandbox.pTlsAllocHead;
+    g_Sandbox.pTlsAllocHead = NULL;
+    while (pLocalStorage)
+    {
+        PKWLOCALSTORAGE pNext = pLocalStorage->pNext;
+        KW_LOG(("Freeing leaked TlsAlloc index %#x\n", pLocalStorage->idx));
+        TlsFree(pLocalStorage->idx);
+        kHlpFree(pLocalStorage);
+        pLocalStorage = pNext;
+    }
+
+
+    /*
+     * Then free resources associated with the sandbox run.
+     */
 
 #ifdef WITH_TEMP_MEMORY_FILES
@@ -7533 +7566 @@
 #endif
 
+    /* Free left behind HeapCreate leaks. */
+    pHeap = g_Sandbox.pHeapHead;
+    g_Sandbox.pHeapHead = NULL;
+    while (pHeap != NULL)
+    {
+        PKWHEAP pNext = pHeap->pNext;
+        KW_LOG(("Freeing HeapCreate leak %p\n", pHeap->hHeap));
+        HeapDestroy(pHeap->hHeap);
+        pHeap = pNext;
+    }
+
     /* Free left behind VirtualAlloc leaks. */
     pTracker = g_Sandbox.pVirtualAllocHead;
@@ -7544 +7588 @@
         pTracker = pNext;
     }
-
-    /* Free left behind HeapCreate leaks. */
-    pHeap = g_Sandbox.pHeapHead;
-    g_Sandbox.pHeapHead = NULL;
-    while (pHeap != NULL)
-    {
-        PKWHEAP pNext = pHeap->pNext;
-        KW_LOG(("Freeing HeapCreate leak %p\n", pHeap->hHeap));
-        HeapDestroy(pHeap->hHeap);
-        pHeap = pNext;
-    }
-
-    /* Free left behind FlsAlloc leaks. */
-    pLocalStorage = g_Sandbox.pFlsAllocHead;
-    g_Sandbox.pFlsAllocHead = NULL;
-    while (pLocalStorage)
-    {
-        PKWLOCALSTORAGE pNext = pLocalStorage->pNext;
-        KW_LOG(("Freeing leaked FlsAlloc index %#x\n", pLocalStorage->idx));
-        FlsFree(pLocalStorage->idx);
-        kHlpFree(pLocalStorage);
-        pLocalStorage = pNext;
-    }
-
-    /* Free left behind TlsAlloc leaks. */
-    pLocalStorage = g_Sandbox.pTlsAllocHead;
-    g_Sandbox.pTlsAllocHead = NULL;
-    while (pLocalStorage)
-    {
-        PKWLOCALSTORAGE pNext = pLocalStorage->pNext;
-        KW_LOG(("Freeing leaked TlsAlloc index %#x\n", pLocalStorage->idx));
-        TlsFree(pLocalStorage->idx);
-        kHlpFree(pLocalStorage);
-        pLocalStorage = pNext;
-    }
-
 
     /* Free the environment. */
@@ -8184 +8192 @@
         /* Optional directory change. */
         if (   i < argc
-            && strcmp(argv[i], "--chdir") == 0)
+            && (   strcmp(argv[i], "--chdir") == 0
+                || strcmp(argv[i], "-C")      == 0 ) )
         {
             i++;