Changeset 3366 in kBuild for trunk/src/kWorker/kWorkerTlsXxxK.c

Timestamp:

Jun 9, 2020 11:53:39 PM (4 years ago)

Author:

bird

Message:

kWorker: More complete TLS handling. More TLS DLLs. Make handle table management thread safe. Lots more stack for new 201x compilers. ++

File:

• trunk/src/kWorker/kWorkerTlsXxxK.c (modified) (5 diffs)

trunk/src/kWorker/kWorkerTlsXxxK.c

@@ -34 +34 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-typedef void KWLDRTLSALLOCATIONHOOK(void *hDll, ULONG idxTls, PIMAGE_TLS_CALLBACK *ppfnTlsCallback);
+typedef void KWLDRTLSCALLBACK(void *hDll, DWORD dwReason, void *pvContext, void *pvWorkerModule);
+typedef KWLDRTLSCALLBACK *PKWLDRTLSCALLBACK;
+typedef PKWLDRTLSCALLBACK KWLDRTLSALLOCATIONHOOK(void *hDll, ULONG idxTls, char *pabInitData, void **ppvWorkerModule);
 
 
@@ -48 +50 @@
 /** The TLS pointer array. The 2nd entry is NULL and serve to terminate the array.
  * The first entry can be used by kWorker if it needs to. */
-__declspec(dllexport) PIMAGE_TLS_CALLBACK g_apfnTlsCallbacks[2] = { DummyTlsCallback, NULL };
+__declspec(dllexport) PIMAGE_TLS_CALLBACK   g_apfnTlsCallbacks[2]   = { DummyTlsCallback, NULL };
 
 /**
  * The TLS index.
  */
-__declspec(dllexport) ULONG               g_idxTls              = ~(ULONG)0;
+__declspec(dllexport) ULONG                 g_idxTls                = ~(ULONG)0;
+
+/**
+ * Callback context.
+ */
+__declspec(dllexport) void                 *g_pvWorkerModule        = NULL;
+
+/**
+ * Regular callback method (returned by kwLdrTlsAllocationHook).
+ */
+__declspec(dllexport) PKWLDRTLSCALLBACK     g_pfnWorkerCallback     = NULL;
+
+
 
 /**
  * Initialization data.
+ * kWorker will copy the init data of the target DLL here.
  */
-//static char const g_abDummy[TLS_SIZE] = {0x42};
-static char g_abDummy[TLS_SIZE] = {0};
+static char g_abInitData[TLS_SIZE] = {0};
 
 /**
@@ -68 +82 @@
 __declspec(allocate(".rdata$T")) const IMAGE_TLS_DIRECTORY _tls_used =
 {
-    (ULONG_PTR)&g_abDummy,
-    (ULONG_PTR)&g_abDummy + sizeof(g_abDummy),
+    (ULONG_PTR)&g_abInitData,
+    (ULONG_PTR)&g_abInitData + sizeof(g_abInitData),
     (ULONG_PTR)&g_idxTls,
     (ULONG_PTR)&g_apfnTlsCallbacks,
@@ -75 +89 @@
     IMAGE_SCN_ALIGN_32BYTES
 };
+
+
+/**
+ * Just a dummy callback function in case the allocation hook gambit fails below
+ * (see KWLDRTLSCALLBACK).
+ */
+static void DummyWorkerCallback(void *hDll, DWORD dwReason, void *pvContext, void *pvWorkerModule)
+{
+    (void)hDll; (void)dwReason; (void)pvContext; (void)pvWorkerModule;
+}
 
 
@@ -86 +110 @@
 __declspec(dllexport) void __stdcall DummyTlsCallback(void *hDll, DWORD dwReason, void *pvContext)
 {
-    (void)hDll; (void)dwReason; (void)pvContext;
-    if (dwReason == DLL_PROCESS_ATTACH)
+    if (g_pfnWorkerCallback)
+        g_pfnWorkerCallback(hDll, dwReason, pvContext, g_pvWorkerModule);
+    else
     {
-        //HMODULE hModExe = (HMODULE)(ULONG_PTR)KWORKER_BASE;
-        HMODULE hModExe = GetModuleHandleW(NULL);
-        KWLDRTLSALLOCATIONHOOK *pfnHook = (KWLDRTLSALLOCATIONHOOK *)GetProcAddress(hModExe, "kwLdrTlsAllocationHook");
-        if (pfnHook)
+        g_pfnWorkerCallback = DummyWorkerCallback;
+        if (dwReason == DLL_PROCESS_ATTACH)
         {
-            pfnHook(hDll, g_idxTls, &g_apfnTlsCallbacks[0]);
-            return;
+            HMODULE hModExe = GetModuleHandleW(NULL);
+            KWLDRTLSALLOCATIONHOOK *pfnHook = (KWLDRTLSALLOCATIONHOOK *)GetProcAddress(hModExe, "kwLdrTlsAllocationHook");
+            if (pfnHook)
+                g_pfnWorkerCallback = pfnHook(hDll, g_idxTls, g_abInitData, &g_pvWorkerModule);
+            else
+                __debugbreak();
         }
-        __debugbreak();
     }
 }