Merge pull request open-mpi#6 from lrrajesh/master

Job launch changes

config/orcm_config_files.m4

@@ -24,6 +24,7 @@ AC_DEFUN([ORCM_CONFIG_FILES],[
     orcm/tools/orun/Makefile
     orcm/tools/osub/Makefile
     orcm/tools/oqueue/Makefile
+    orcm/tools/orcmsd/Makefile
     orcm/tools/wrappers/Makefile
     orcm/tools/wrappers/orcm.pc
     orcm/tools/wrappers/orcmcc-wrapper-data.txt

orcm/mca/scd/base/scd_dt_fns.c

@@ -175,6 +175,15 @@ int orcm_pack_alloc(opal_buffer_t *buffer, const void *src,
             ORTE_ERROR_LOG(ret);
             return ret;
         }
+        /* pack the originator */
+        if (OPAL_SUCCESS !=
+            (ret = opal_dss_pack_buffer(buffer,
+                                        (void*)&alloc->originator,
+                                        1,
+                                        ORTE_NAME))) {
+            ORTE_ERROR_LOG(ret);
+            return ret;
+        }
         /* pack the hnp daemon */
         if (OPAL_SUCCESS !=
             (ret = opal_dss_pack_buffer(buffer,
@@ -193,6 +202,15 @@ int orcm_pack_alloc(opal_buffer_t *buffer, const void *src,
             ORTE_ERROR_LOG(ret);
             return ret;
         }
+        /* pack the hnp uri */
+        if (OPAL_SUCCESS !=
+            (ret = opal_dss_pack_buffer(buffer,
+                                        (void*)&alloc->hnpuri,
+                                        1,
+                                        OPAL_STRING))) {
+            ORTE_ERROR_LOG(ret);
+            return ret;
+        }
         /* pack the nodefile */
         if (OPAL_SUCCESS !=
             (ret = opal_dss_pack_buffer(buffer,
@@ -428,6 +446,16 @@ int orcm_unpack_alloc(opal_buffer_t *buffer, void *dest,
             ORTE_ERROR_LOG(ret);
             return ret;
         }
+        /* unpack the orginator */
+        n=1;
+        if (OPAL_SUCCESS !=
+            (ret = opal_dss_unpack_buffer(buffer,
+                                          &a->originator,
+                                          &n,
+                                          ORTE_NAME))) {
+            ORTE_ERROR_LOG(ret);
+            return ret;
+        }
         /* unpack the hnp daemon */
         n=1;
         if (OPAL_SUCCESS !=
@@ -448,6 +476,16 @@ int orcm_unpack_alloc(opal_buffer_t *buffer, void *dest,
             ORTE_ERROR_LOG(ret);
             return ret;
         }
+        /* unpack the hnp uri */
+        n=1;
+        if (OPAL_SUCCESS !=
+            (ret = opal_dss_unpack_buffer(buffer,
+                                          &a->hnpuri,
+                                          &n,
+                                          OPAL_STRING))) {
+            ORTE_ERROR_LOG(ret);
+            return ret;
+        }
         /* unpack the nodefile */
         n=1;
         if (OPAL_SUCCESS !=

orcm/mca/scd/fifo/scd_fifo.c

@@ -359,7 +359,7 @@ static void fifo_cancel(int sd, short args, void *cbdata)
             if (session->id == caddy->session->id) {
                 /* if session is running, send cancel launch command */
                 if (0 == strcmp(q->name, "running")) {
-                    ORCM_ACTIVATE_RM_STATE(caddy->session, ORCM_SESSION_STATE_KILL);
+                    ORCM_ACTIVATE_RM_STATE(session, ORCM_SESSION_STATE_KILL);
                 } else {
                     opal_list_remove_item(&q->sessions, &session->super);
                     ORCM_ACTIVATE_SCD_STATE(caddy->session, ORCM_SESSION_STATE_SCHEDULE);

orcm/mca/scd/scd_types.h

@@ -74,8 +74,10 @@ typedef struct {
     uid_t caller_uid;         // uid of submission request
     gid_t caller_gid;         // gid of submission request
     bool interactive;         // interactive or batch
+    orte_process_name_t originator;  // originator process name
     orte_process_name_t hnp;  // hnp process name
     char *hnpname;            // hnp string name
+    char *hnpuri;             // hnp uri  name
     char *nodefile;           // file listing names and/or regex of candidate nodes to be used
     char *nodes;              // regex of nodes to be used
     char *queues;             // comma-delimited list of queue names

orcm/mca/sst/orun/Makefile.am → orcm/mca/sst/orcmsd/Makefile.am

@@ -8,32 +8,34 @@
 # $HEADER$
 #
 
+dist_orcmdata_DATA = help-sst-orcmsd.txt
+
 sources = \
-        sst_orun.h \
-        sst_orun.c \
-        sst_orun_component.c
+        sst_orcmsd.h \
+        sst_orcmsd.c \
+        sst_orcmsd_component.c
 
 # Make the output library in this directory, and name it either
 # mca_<project>_<type>_<name>.la (for DSO builds) or
 # libmca_<project>_<type>_<name>.la (for static builds).
 
-if MCA_BUILD_orcm_sst_orun_DSO
+if MCA_BUILD_orcm_sst_orcmsd_DSO
 lib =
 lib_sources =
-component = mca_sst_orun.la
+component = mca_sst_orcmsd.la
 component_sources = $(sources)
 else
-lib = libmca_sst_orun.la
+lib = libmca_sst_orcmsd.la
 lib_sources = $(sources)
 component =
 ponent_sources =
 endif
 
 mcacomponentdir = $(orcmlibdir)
 mcacomponent_LTLIBRARIES = $(component)
-mca_sst_orun_la_SOURCES = $(component_sources)
-mca_sst_orun_la_LDFLAGS = -module -avoid-version
+mca_sst_orcmsd_la_SOURCES = $(component_sources)
+mca_sst_orcmsd_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(lib)
-libmca_sst_orun_la_SOURCES = $(lib_sources)
-libmca_sst_orun_la_LDFLAGS = -module -avoid-version
+libmca_sst_orcmsd_la_SOURCES = $(lib_sources)
+libmca_sst_orcmsd_la_LDFLAGS = -module -avoid-version

orcm/mca/sst/orcmsd/help-sst-orcmsd.txt

@@ -0,0 +1,81 @@
+# -*- text -*-
+#
+# Copyright (c) 2011      Cisco Systems, Inc.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+# This is the US/English general help file for ORCM configuration file.
+#
+[no-dir]
+ORCM was unable to open the configuration directory:
+    %s
+Check to make sure the path is correct.
+#
+[parse_error_string]
+ORCM detected a parse error on a string in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s
+#
+[parse_error_int]
+ORCM detected a parse error on an integer in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %d
+#
+[parse_error]
+ORCM detected an unknown parse error in the configuration file:
+    %s
+It occurred on line number %d on token %d.
+#
+[bad-max-procs]
+ORCM received an incorrect value for process-limit in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s
+#
+[bad-max-instances]
+ORCM received an incorrect value for max-instances in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s
+#
+[no-exec]
+ORCM detected a parse error for process in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s
+#
+[no-app-name]
+ORCM detected a parse error for application in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s
+#
+[no-version]
+ORCM detected a parse error for version in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s
+#
+[no-app-version]
+ORCM detected a parse error for application version in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s
+#
+[no-argv]
+ORCM detected a parse error for argv in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s
+#
+[no-host-types]
+ORCM detected a parse error for host-types in the configuration file:
+    %s
+It occurred on line number %d on token %d:
+    %s