* remove the monitor function from the pcm - doesn't really make sense to

have it there
* condense the rsh pcm into fewer files, for faster compile times
* Fix return value bug in mca_pcm_base_build_base_env()

This commit was SVN r2200.

src/mca/pcm/base/pcm_base_util.c

@@ -45,4 +45,5 @@ mca_pcm_base_build_base_env(char ***envp)
         }
     }
     
+    return OMPI_SUCCESS;
 }

src/mca/pcm/cofs/src/pcm_cofs_module.c

@@ -45,7 +45,6 @@ mca_pcm_base_component_1_0_0_t mca_pcm_cofs_component = {
 struct mca_pcm_base_module_1_0_0_t mca_pcm_cofs_1_0_0 = {
     mca_pcm_base_no_unique_name, /* unique_string */
     NULL, /* allocate_resources */
-    NULL, /* register_monitor */
     NULL, /* can_spawn */
     NULL, /* spawn_procs */
     NULL, /* kill_proc */

src/mca/pcm/pcm.h

@@ -172,18 +172,6 @@ typedef ompi_list_t*
                                         int nodes,
                                         int procs);
 
-/**
- * Register a watch function for changes in the job status
- *
- * @param jobid (IN) Jobid associated with the job to be monitored
- * @param func (IN) Function to call on status change
- *
- * @warning Type type for jobid will change in the near future.
- */
-typedef int
-(*mca_pcm_base_register_monitor_fn_t)(int jobid,
-                                 ompi_rte_monitor_fn_t func);
-
 
 /** 
  * This tells you whether the pcm module is capable of spawning new
@@ -266,7 +254,6 @@ typedef int
 struct mca_pcm_base_module_1_0_0_t {
     mca_pcm_base_get_unique_name_fn_t pcm_get_unique_name;    
     mca_pcm_base_allocate_resources_fn_t pcm_allocate_resources;
-    mca_pcm_base_register_monitor_fn_t pcm_register_monitor;
     mca_pcm_base_can_spawn_fn_t pcm_can_spawn;
     mca_pcm_base_spawn_procs_fn_t pcm_spawn_procs;
     mca_pcm_base_kill_proc_fn_t pcm_kill_proc;

src/mca/pcm/rsh/src/Makefile.am

@@ -7,12 +7,8 @@ include $(top_ompi_srcdir)/config/Makefile.options
 noinst_LTLIBRARIES = libmca_pcm_rsh.la
 libmca_pcm_rsh_la_SOURCES = \
 	pcm_rsh.h \
-	pcm_rsh.c \
-	pcm_rsh_can_spawn.c \
 	pcm_rsh_component.c \
-	pcm_rsh_kill_job.c \
-	pcm_rsh_kill_proc.c \
-	pcm_rsh_register_monitor.c \
-	pcm_rsh_spawn_procs.c
+	pcm_rsh_kill.c \
+	pcm_rsh_spawn.c
 
 

src/mca/pcm/rsh/src/pcm_rsh.c

@@ -1,17 +0,0 @@
-/* -*- C -*-
- *
- * $HEADER$
- * 
- */
-
-#include "ompi_config.h"
-
-#include "mca/pcm/pcm.h"
-#include "mca/pcm/rsh/src/pcm_rsh.h"
-#include "include/types.h"
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <unistd.h>

src/mca/pcm/rsh/src/pcm_rsh.h

@@ -35,16 +35,10 @@ extern "C" {
     /*
      * Interface
      */
-    char *mca_pcm_rsh_get_unique_name(void);
-    ompi_list_t* mca_pcm_rsh_allocate_resources(int jobid, int nodes, 
-                                                int procs);
-    int mca_pcm_rsh_register_monitor(int jobid,
-                                     ompi_rte_monitor_fn_t func);
     bool mca_pcm_rsh_can_spawn(void);
     int mca_pcm_rsh_spawn_procs(int jobid, ompi_list_t *schedule_list);
     int mca_pcm_rsh_kill_proc(ompi_process_name_t *name, int flags);
     int mca_pcm_rsh_kill_job(int jobid, int flags);
-    int mca_pcm_rsh_deallocate_resources(int jobid, ompi_list_t *nodelist);
 
 #ifdef __cplusplus
 }

src/mca/pcm/rsh/src/pcm_rsh_can_spawn.c

@@ -1,19 +0,0 @@
-/* -*- C -*-
- * 
- * $HEADER$
- *
- */
-
-#include "ompi_config.h"
-
-#include "mca/pcm/pcm.h"
-#include "mca/pcm/rsh/src/pcm_rsh.h"
-
-bool
-mca_pcm_rsh_can_spawn(void)
-{
-    /* we can always try to rsh some more...  Might not always work as
-     * the caller hopes
-     */
-    return true;
-}

src/mca/pcm/rsh/src/pcm_rsh_component.c

@@ -49,7 +49,6 @@ mca_pcm_base_component_1_0_0_t mca_pcm_rsh_component = {
 struct mca_pcm_base_module_1_0_0_t mca_pcm_rsh_1_0_0 = {
     mca_pcm_base_no_unique_name,
     NULL,
-    mca_pcm_rsh_register_monitor,
     mca_pcm_rsh_can_spawn,
     mca_pcm_rsh_spawn_procs,
     mca_pcm_rsh_kill_proc,

src/mca/pcm/rsh/src/pcm_rsh_kill.c

@@ -9,8 +9,16 @@
 #include "mca/pcm/pcm.h"
 #include "mca/pcm/rsh/src/pcm_rsh.h"
 
+
 int
 mca_pcm_rsh_kill_proc(ompi_process_name_t *name, int flags)
 {
     return OMPI_ERROR;
 }
+
+
+int
+mca_pcm_rsh_kill_job(int jobid, int flags)
+{
+    return OMPI_ERROR;
+}

src/mca/pcm/rsh/src/pcm_rsh_kill_job.c

@@ -1,16 +0,0 @@
-/* -*- C -*-
- * 
- * $HEADER$
- *
- */
-
-#include "ompi_config.h"
-
-#include "mca/pcm/pcm.h"
-#include "mca/pcm/rsh/src/pcm_rsh.h"
-
-int
-mca_pcm_rsh_kill_job(int jobid, int flags)
-{
-    return OMPI_ERROR;
-}

src/mca/pcm/rsh/src/pcm_rsh_register_monitor.c

@@ -1,18 +0,0 @@
-/* -*- C -*-
- * 
- * $HEADER$
- *
- */
-
-#include "ompi_config.h"
-
-#include "mca/pcm/pcm.h"
-#include "mca/pcm/rsh/src/pcm_rsh.h"
-
-#include <string.h>
-
-int
-mca_pcm_rsh_register_monitor(int jobid, ompi_rte_monitor_fn_t func)
-{
-    return OMPI_SUCCESS;
-}

src/mca/pcm/rsh/src/pcm_rsh_spawn.c

@@ -10,6 +10,17 @@
 #include "mca/pcm/rsh/src/pcm_rsh.h"
 #include "runtime/runtime_types.h"
 
+
+bool
+mca_pcm_rsh_can_spawn(void)
+{
+    /* we can always try to rsh some more...  Might not always work as
+     * the caller hopes
+     */
+    return true;
+}
+
+
 int
 mca_pcm_rsh_spawn_procs(int jobid, ompi_list_t *schedlist)
 {