Changeset 7744 for trunk/src

Timestamp:

Jan 8, 2002, 11:34:11 PM (24 years ago)

Author:

sandervl

Message:

DosSet/QueryAffinity fixes for non-SMP systems

Location:

trunk/src/kernel32

Files:

• oslibdos.cpp (modified) (6 diffs)
• process.cpp (modified) (3 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.92 2002-01-04 14:11:23 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.93 2002-01-08 22:34:10 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -3028 +3028 @@
   static PROC_DosSetThreadAffinity pfnDosSetThreadAffinity = NULL;
   static BOOL fInit = FALSE;
-  MPAFFINITY mask;
-
-    if(fInit == FALSE && pfnDosSetThreadAffinity == NULL) {
+  MPAFFINITY  mask;
+  APIRET      rc;
+
+    if(fInit == FALSE && pfnDosSetThreadAffinity == NULL) 
+    {
+        ULONG nrCPUs;
+
+        rc = DosQuerySysInfo(QSV_NUMPROCESSORS, QSV_NUMPROCESSORS, &nrCPUs, sizeof(nrCPUs));
+        if (rc != 0 || nrCPUs == 1) 
+        {//not supported
+            fInit = TRUE;
+            SetLastError(ERROR_SUCCESS_W);
+            return TRUE;
+        }
+
         HMODULE hDoscalls;
         if(DosQueryModuleHandle("DOSCALLS", &hDoscalls) == NO_ERROR) {
@@ -3041 +3053 @@
         return TRUE;
     }
-    APIRET rc;
     USHORT sel = RestoreOS2FS();
 
@@ -3059 +3070 @@
   static PROC_DosQueryThreadAffinity pfnDosQueryThreadAffinity = NULL;
   static BOOL fInit = FALSE;
-  MPAFFINITY mask;
-
-    if(fInit == FALSE && pfnDosQueryThreadAffinity == NULL) {
+  MPAFFINITY  mask;
+  APIRET      rc;
+
+    if(fInit == FALSE && pfnDosQueryThreadAffinity == NULL) 
+    {
+        ULONG nrCPUs;
+
+        rc = DosQuerySysInfo(QSV_NUMPROCESSORS, QSV_NUMPROCESSORS, &nrCPUs, sizeof(nrCPUs));
+        if (rc != 0 || nrCPUs == 1) 
+        {//not supported
+            fInit = TRUE;
+            *pdwThreadAffinityMask = 1;
+            SetLastError(ERROR_SUCCESS_W);
+            return TRUE;
+        }
+
         HMODULE hDoscalls;
         if(DosQueryModuleHandle("DOSCALLS", &hDoscalls) == NO_ERROR) {
@@ -3076 +3100 @@
     ULONG scope = (fMaskType == MASK_SYSTEM) ? AFNTY_SYSTEM : AFNTY_THREAD;
 
-    APIRET rc;
     USHORT sel = RestoreOS2FS();
 
@@ -3083 +3106 @@
 
     if(rc == NO_ERROR) {
-        *pdwThreadAffinityMask = mask.mask[0];
-    }
+         *pdwThreadAffinityMask = mask.mask[0];
+    }
+
     SetLastError(error2WinError(rc,ERROR_INVALID_PARAMETER));
     return (rc == NO_ERROR);

trunk/src/kernel32/process.cpp

@@ -1 @@
-/* $Id: process.cpp,v 1.9 2001-11-10 12:47:47 sandervl Exp $ */
+/* $Id: process.cpp,v 1.10 2002-01-08 22:34:11 sandervl Exp $ */
 
 /*
@@ -124 +124 @@
 BOOL WINAPI SetProcessAffinityMask( HANDLE hProcess, DWORD affmask )
 {
+    dprintf(("SetProcessAffinityMask %x %x", hProcess, affmask));
     ProcessAffinityMask = affmask;
     //TODO: should update all threads, but that doesn't seem possible in OS/2
@@ -135 +136 @@
                                      LPDWORD lpSystemAffinityMask)
 {
+    dprintf(("GetProcessAffinityMask %x %x %x", hProcess, lpProcessAffinityMask, lpSystemAffinityMask));
+
     /* It is definitely important for a process to know on what processor
        it is running :-) */