Changeset 3355 in kBuild for trunk/src

Timestamp:

Jun 5, 2020 2:06:42 AM (5 years ago)

Author:

bird

Message:

kWorker,kmk: Correcting a few SetThreadGroupAffinity calls.

Location:

trunk/src

Files:

• kWorker/Makefile.kmk (modified) (1 diff)
• kWorker/kWorker.c (modified) (3 diffs)
• kmk/kmkbuiltin/kSubmit.c (modified) (1 diff)
• kmk/w32/winchildren.c (modified) (3 diffs)

trunk/src/kWorker/Makefile.kmk

@@ -78 +78 @@
        nt/ntunlink.c \
        nt/kFsCache.c \
+       win_get_processor_group_active_mask.c \
        quote_argv.c \
         is_console.c \

trunk/src/kWorker/kWorker.c

@@ -55 +55 @@
 #include "nt/kFsCache.h"
 #include "nt_fullpath.h"
+#include "win_get_processor_group_active_mask.h"
 #include "quote_argv.h"
 #include "md5.h"
@@ -12284 +12285 @@
 
 
+/**
+ * Helper for main() argument handling that sets the processor group if
+ * possible.
+ */
+static void kwSetProcessorGroup(unsigned long uGroup)
+{
+    typedef BOOL (WINAPI *PFNSETTHREADGROUPAFFINITY)(HANDLE, const GROUP_AFFINITY*, GROUP_AFFINITY *);
+    HMODULE             const hmodKernel32 = GetModuleHandleW(L"KERNEL32.DLL");
+    PFNSETTHREADGROUPAFFINITY pfnSetThreadGroupAffinity;
+
+    pfnSetThreadGroupAffinity = (PFNSETTHREADGROUPAFFINITY)GetProcAddress(hmodKernel32, "SetThreadGroupAffinity");
+    if (pfnSetThreadGroupAffinity)
+    {
+        GROUP_AFFINITY OldAff = { 0,            0, 0, 0, 0 };
+        GROUP_AFFINITY NewAff = { 0, (WORD)uGroup, 0, 0, 0 };
+        NewAff.Mask = win_get_processor_group_active_mask((WORD)uGroup);
+        if (NewAff.Mask && (WORD)uGroup == uGroup)
+        {
+            if (!pfnSetThreadGroupAffinity(GetCurrentThread(), &NewAff, &OldAff))
+                kwErrPrintf("Failed to set processor group to %lu (%p): %u\n", uGroup, NewAff.Mask, GetLastError());
+        }
+        else if (GetLastError() == NO_ERROR)
+            kwErrPrintf("Cannot set processor group to %lu: No active processors in group!\n", uGroup);
+        else
+            kwErrPrintf("Cannot set processor group to %lu: GetLogicalProcessorInformationEx failed: %u\n",
+                        uGroup, GetLastError());
+    }
+    else
+    {
+        OSVERSIONINFOA VerInfo = {0};
+        if (VerInfo.dwMajorVersion > 6 || (VerInfo.dwMajorVersion == 6 && VerInfo.dwMinorVersion >= 1))
+            kwErrPrintf("Cannot set processor group to %lu: SetThreadGroupAffinity no found! (Windows version %lu.%lu)\n",
+                        uGroup, VerInfo.dwMajorVersion, VerInfo.dwMinorVersion);
+    }
+}
+
+
 int main(int argc, char **argv)
 {
@@ -12511 +12549 @@
                     && *pszEnd == '\0'
                     && uValue == (WORD)uValue)
-                {
-                    typedef BOOL (WINAPI *PFNSETTHREADGROUPAFFINITY)(HANDLE, const GROUP_AFFINITY*, GROUP_AFFINITY *);
-                    PFNSETTHREADGROUPAFFINITY pfnSetThreadGroupAffinity;
-                    pfnSetThreadGroupAffinity = (PFNSETTHREADGROUPAFFINITY)GetProcAddress(GetModuleHandleW(L"KERNEL32.DLL"),
-                                                                                          "SetThreadGroupAffinity");
-                    if (pfnSetThreadGroupAffinity)
-                    {
-                        GROUP_AFFINITY NewAff = { ~(uintptr_t)0, (WORD)uValue, 0, 0, 0 };
-                        GROUP_AFFINITY OldAff = {             0,            0, 0, 0, 0 };
-                        if (!pfnSetThreadGroupAffinity(GetCurrentThread(), &NewAff, &OldAff))
-                            kwErrPrintf("Failed to set processor group to %lu: %u\n", uValue, GetLastError());
-                    }
-                    else
-                        kwErrPrintf("Cannot set processor group to %lu because SetThreadGroupAffinity was not found\n", uValue);
-                }
+                    kwSetProcessorGroup(uValue);
                 else
                     return kwErrPrintfRc(2, "Invalid --priority argument: %s\n", argv[i]);

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -588 +588 @@
                             if (iProcessorGroup >= 0 && g_pfnSetThreadGroupAffinity)
                             {
-                                GROUP_AFFINITY NewAff = { ~(uintptr_t)0, (WORD)iProcessorGroup, 0, 0, 0 };
-                                GROUP_AFFINITY OldAff = {             0,                     0, 0, 0, 0 };
+                                GROUP_AFFINITY OldAff = { 0,                                                    0, 0, 0, 0 };
+                                GROUP_AFFINITY NewAff = { 0 /* == all active apparently */, (WORD)iProcessorGroup, 0, 0, 0 };
                                 if (!g_pfnSetThreadGroupAffinity(ProcInfo.hThread, &NewAff, &OldAff))
                                     warnx(pCtx, "warning: Failed to set processor group to %d: %u\n",

trunk/src/kmk/w32/winchildren.c

@@ -551 +551 @@
                         Info.BasicLimitInformation.LimitFlags &= ~JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
                     if (!SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &Info, sizeof(Info)))
-                        OSN(message, 0, _("SetInformationJobObject(%s,JobObjectExtendedLimitInformation,{%s},) failed: %u"),
-                            pszJobName, win_job_object_mode, GetLastError());
+                        OSSN(message, 0, _("SetInformationJobObject(%s,JobObjectExtendedLimitInformation,{%s},) failed: %u"),
+                             pszJobName, win_job_object_mode, GetLastError());
                 }
                 else
@@ -1283 +1283 @@
         if (g_cProcessorGroups > 1)
         {
-            GROUP_AFFINITY Affinity = { 0, pWorker->iProcessorGroup, { 0, 0, 0 } };
+            GROUP_AFFINITY Affinity = { 0 /* == all active apparently */, pWorker->iProcessorGroup, { 0, 0, 0 } };
             fRet = g_pfnSetThreadGroupAffinity(ProcInfo.hThread, &Affinity, NULL);
             assert(fRet);
@@ -2490 +2490 @@
     if (g_cProcessorGroups > 1)
     {
-        GROUP_AFFINITY Affinity = { 0 /* == all active apparently */ , pWorker->iProcessorGroup, { 0, 0, 0 } };
+        GROUP_AFFINITY Affinity = { 0 /* == all active apparently */, pWorker->iProcessorGroup, { 0, 0, 0 } };
         BOOL fRet = g_pfnSetThreadGroupAffinity(GetCurrentThread(), &Affinity, NULL);
         assert(fRet); (void)fRet;