Changeset 5634

Timestamp:

10/30/09 12:40:10 (3 weeks ago)

Author:

jayesh

Message:

Handling the case where we don't have info about logical procs on windows - eg: Win2K systems. If info about logical procs is not available we don't set proc affinity and allow these systems to continue working. See tickets 832,776

Location:

mpich2/trunk/src/pm/smpd

Files:

• smpd.h (modified) (1 diff)
• smpd_affinitize.c (modified) (7 diffs)
• smpd_cmd_args.c (modified) (1 diff)

mpich2/trunk/src/pm/smpd/smpd.h

@@ -981 +981 @@
 DWORD_PTR smpd_get_next_process_affinity_mask(void );
 DWORD_PTR smpd_get_processor_affinity_mask(int proc_num);
-void smpd_init_affinity_table(void );
+BOOL smpd_init_affinity_table(void );
 #endif
 

mpich2/trunk/src/pm/smpd/smpd_affinitize.c

@@ -40 +40 @@
 {
     DWORD_PTR Mask;
-    if (s_affinity_max == 0)
+    if (s_affinity_max == 0){
+        smpd_dbg_printf("Affinity table not initialized. Returning invalid mask\n");
         return 0;
+    }
 
     Mask = s_affinity_table[s_affinity_idx % s_affinity_max];
@@ -246 +248 @@
     are distributed so as to balance the use of system resources.
 */
-void smpd_init_affinity_table()
+typedef BOOL (WINAPI *LPFN_GetLogicalProcessorInformation)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
+BOOL smpd_init_affinity_table()
 {
     /*
@@ -252 +255 @@
     */
     int count, nTableEntries;
-    BOOL fSucc;
+    BOOL fSucc, retval = TRUE;
     DWORD Length;
     DWORD_PTR SystemMask, ReserveMask, PrimaryMask;
@@ -258 +261 @@
     SYSTEM_LOGICAL_PROCESSOR_INFORMATION* pInfo = NULL;
     ResourceTableEntry* pTable = NULL;
+    LPFN_GetLogicalProcessorInformation lpfn_get_logical_proc_info;
 
     fSucc = GetProcessAffinityMask(GetCurrentProcess(), &UsableProcessorMask, &SystemMask);
-    if(!fSucc)
-        return;
-
+    if(!fSucc){
+        return FALSE;
+    }
+
+    /* Check if GetLogicalProcessorInformation() is available */
+    lpfn_get_logical_proc_info =
+        (LPFN_GetLogicalProcessorInformation ) GetProcAddress(GetModuleHandle(TEXT("kernel32")),
+                                                    "GetLogicalProcessorInformation");
+    if(lpfn_get_logical_proc_info == NULL){
+        smpd_dbg_printf("GetLogicalProcessorInformation() not available\n"); 
+        return FALSE;
+    }
     /*
         Retrieve the length required to store the processor information data
     */
     Length = 0;
-    /* FIXME: Check return val */
-    GetLogicalProcessorInformation(NULL, &Length);
-    if(Length == 0)
-        return;
+    /* This call will fail - however it will return the length reqd to store proc info*/
+    fSucc = lpfn_get_logical_proc_info(NULL, &Length);
+    if(Length == 0){
+        smpd_dbg_printf("GetLogicalProcessorInformation() returned invalid (0 bytes) length to store proc info\n");
+        return FALSE;
+    }
 
     /*
@@ -276 +291 @@
     */
     pInfo = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION*) malloc(Length);
-    if(pInfo == NULL)
-        return;
+    if(pInfo == NULL){
+        smpd_err_printf("Allocating memory for system logical proc info failed\n");
+        return FALSE;
+    }
 
     /*
         Query for the processors information
     */
-    fSucc = GetLogicalProcessorInformation(pInfo, &Length);
-    if(!fSucc)
-        goto fn_exit;
+    fSucc = lpfn_get_logical_proc_info(pInfo, &Length);
+    if(!fSucc){
+        smpd_err_printf("GetLogicalProcessorInformation() failed (error = %d)\n", GetLastError());
+        goto fn_fail;
+    }
     
     count = Length / sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION);
@@ -294 +313 @@
 
     pTable = (ResourceTableEntry*) malloc(count * sizeof(ResourceTableEntry));
-    if (pTable == NULL)
-        goto fn_exit;
+    if (pTable == NULL){
+        smpd_err_printf("Allocating memory for Resourcetableentry failed\n");
+        goto fn_fail;
+    }
 
     /*
@@ -326 +347 @@
 
     free(pTable);
-fn_exit:
+ fn_exit:
     free(pInfo);
+    return retval;
+fn_fail:
+    retval = FALSE;
+    goto fn_exit;
 }
 

mpich2/trunk/src/pm/smpd/smpd_cmd_args.c

@@ -446 +446 @@
         }
 #ifdef HAVE_WINDOWS_H
-    /* FIXME: smpd_init_affinity_table() Does not return error codes if it fails */
-    smpd_init_affinity_table();
+    {
+        BOOL ret;
+        ret = smpd_init_affinity_table();
+        if(!ret){
+            smpd_dbg_printf("Initializing smpd affinity table failed\n");
+        }
+    }
 #endif