Update the ccp module:

rename the get_cluster_message function for both ras/plm.
  use _umask instead of umask.
  add WIN32_DCOM definition to support Windows Vista.

This commit was SVN r19470.

orte/mca/plm/ccp/plm_ccp_module.c

@@ -11,6 +11,9 @@
  * $HEADER$
  *
  */
+
+#define _WIN32_DCOM
+
 #include "orte_config.h"
 #include "orte/constants.h"
 #include "orte/types.h"
@@ -78,7 +81,7 @@ static int plm_ccp_finalize(void);
 static int plm_ccp_connect(ICluster* pCluster);
 static int plm_ccp_disconnect(void);
 
-void get_cluster_message(ICluster* pCluster);
+void plm_get_cluster_message(ICluster* pCluster);
 static char *plm_ccp_commandline(char *prefix, char *node_name, int argc, char **argv);
 
 /*
@@ -127,7 +130,7 @@ static int plm_ccp_launch_job(orte_job_t *jdata)
     orte_std_cntr_t launched = 0, i; 
 
     orte_job_map_t *map = NULL;
-    int argc, rc, node_name_index, proc_name_index;
+    int argc, rc, node_name_index, proc_vpid_index, proc_name_index;
     char *param, **env = NULL, *var, **argv = NULL;
     bool connected = false;
     char *bin_base = NULL, *lib_base = NULL, *command_line;
@@ -254,7 +257,7 @@ GETMAP:
 
     hr = pCluster->CreateJob(&pJob);
     if (FAILED(hr)) {
-        get_cluster_message(pCluster);
+        plm_get_cluster_message(pCluster);
         opal_output(orte_plm_globals.output,
                     "plm:ccp:failed to create cluster object!");
         goto cleanup;
@@ -269,8 +272,8 @@ GETMAP:
     env = opal_argv_copy(orte_launch_environ);
 
     /* add our umask -- see big note in orted.c */
-    current_umask = umask(0);
-    umask(current_umask);
+    current_umask = _umask(0);
+    _umask(current_umask);
     asprintf(&var, "0%o", current_umask);
     opal_setenv("ORTE_DAEMON_UMASK_VALUE", var, true, &env);
     free(var);
@@ -422,7 +425,7 @@ GETMAP:
         /* Set terms for task. */
         hr = pCluster->CreateTask(&pTask);
         if (FAILED(hr)) {
-            get_cluster_message(pCluster);
+            plm_get_cluster_message(pCluster);
             OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
                                 "plm:ccp:failed to create task object!"));
             goto cleanup;
@@ -495,7 +498,7 @@ GETMAP:
         OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
                             "Added job %d to scheduling queue.\n", job_id));
     }else {
-        get_cluster_message(pCluster);
+        plm_get_cluster_message(pCluster);
     }
 
     OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
@@ -734,7 +737,7 @@ static char *plm_ccp_commandline(char *prefix, char *node_name, int argc, char *
 }
 
 
-void get_cluster_message(ICluster* pCluster)
+void plm_get_cluster_message(ICluster* pCluster)
 {
     HRESULT hr = S_OK;
     BSTR message = NULL;

orte/mca/ras/ccp/ras_ccp_module.c

@@ -14,8 +14,6 @@
 #include "orte/constants.h"
 #include "orte/types.h"
 
-#define _WIN32_WINNT  0x0500
-
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,7 +46,7 @@
 static int orte_ras_ccp_allocate(opal_list_t *nodes);
 static int orte_ras_ccp_finalize(void);
 static int discover(opal_list_t* nodelist, ICluster* pCluster);
-void get_cluster_message(ICluster* pCluster);
+void ras_get_cluster_message(ICluster* pCluster);
 
 
 /*
@@ -106,7 +104,7 @@ static int orte_ras_ccp_allocate(opal_list_t *nodes)
     /* Connect to the cluster's head node */
     hr = pCluster->Connect(_bstr_t(cluster_head));
     if (FAILED(hr)) {
-        get_cluster_message(pCluster);
+        ras_get_cluster_message(pCluster);
         OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output,
                             "ras:ccp:allocate: connection failed!"));
         return ORTE_ERROR;
@@ -153,7 +151,7 @@ static int orte_ras_ccp_finalize(void)
 
 static int discover(opal_list_t* nodelist, ICluster* pCluster)
 {
-    int ret;
+    int ret = ORTE_ERROR;
     int32_t nodeid;
     orte_node_t *node;
     opal_list_item_t* item;
@@ -178,7 +176,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster)
     /* Get the collection of nodes. */
     hr = pCluster->get_ComputeNodes(&pNodesCollection);
     if (FAILED(hr)) {
-        get_cluster_message(pCluster);
+        ras_get_cluster_message(pCluster);
         OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output,
                             "ras:ccp:pCluster->get_ComputeNodes failed."));
         return ORTE_ERROR;
@@ -187,7 +185,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster)
     /* Get the enumerator used to iterate through the collection. */
     hr = pNodesCollection->GetEnumerator(&pNodes);
     if (FAILED(hr)) {
-        get_cluster_message(pCluster);
+        ras_get_cluster_message(pCluster);
         OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output,
                             "ras:ccp:pNodesCollection->GetEnumerator failed."));
         return ORTE_ERROR;
@@ -323,3 +321,20 @@ cleanup:
     
     return ret;
 }
+
+void ras_get_cluster_message(ICluster* pCluster)
+{
+    HRESULT hr = S_OK;
+    BSTR message = NULL;
+
+    hr = pCluster->get_ErrorMessage(&message);
+    if (SUCCEEDED(hr)) {
+        OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
+                            _com_util::ConvertBSTRToString(message)));
+        SysFreeString(message);
+    }
+    else {
+        OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
+                            "pCluster->get_ErrorMessage failed.\n"));
+    }
+}