From 5011348de4e98b41fb4fe4dbac49aa9da2b7992a Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Wed, 18 Aug 2004 15:24:26 +0000 Subject: [PATCH] * 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 | 1 + src/mca/pcm/cofs/src/pcm_cofs_module.c | 1 - src/mca/pcm/pcm.h | 13 ------------- src/mca/pcm/rsh/src/Makefile.am | 8 ++------ src/mca/pcm/rsh/src/pcm_rsh.c | 17 ----------------- src/mca/pcm/rsh/src/pcm_rsh.h | 6 ------ src/mca/pcm/rsh/src/pcm_rsh_can_spawn.c | 19 ------------------- src/mca/pcm/rsh/src/pcm_rsh_component.c | 1 - .../{pcm_rsh_kill_proc.c => pcm_rsh_kill.c} | 8 ++++++++ src/mca/pcm/rsh/src/pcm_rsh_kill_job.c | 16 ---------------- .../pcm/rsh/src/pcm_rsh_register_monitor.c | 18 ------------------ ...{pcm_rsh_spawn_procs.c => pcm_rsh_spawn.c} | 11 +++++++++++ 12 files changed, 22 insertions(+), 97 deletions(-) delete mode 100644 src/mca/pcm/rsh/src/pcm_rsh.c delete mode 100644 src/mca/pcm/rsh/src/pcm_rsh_can_spawn.c rename src/mca/pcm/rsh/src/{pcm_rsh_kill_proc.c => pcm_rsh_kill.c} (73%) delete mode 100644 src/mca/pcm/rsh/src/pcm_rsh_kill_job.c delete mode 100644 src/mca/pcm/rsh/src/pcm_rsh_register_monitor.c rename src/mca/pcm/rsh/src/{pcm_rsh_spawn_procs.c => pcm_rsh_spawn.c} (87%) diff --git a/src/mca/pcm/base/pcm_base_util.c b/src/mca/pcm/base/pcm_base_util.c index c3a9f69fd4..6d6dea5cc7 100644 --- a/src/mca/pcm/base/pcm_base_util.c +++ b/src/mca/pcm/base/pcm_base_util.c @@ -45,4 +45,5 @@ mca_pcm_base_build_base_env(char ***envp) } } + return OMPI_SUCCESS; } diff --git a/src/mca/pcm/cofs/src/pcm_cofs_module.c b/src/mca/pcm/cofs/src/pcm_cofs_module.c index 80a747a65d..910e902380 100644 --- a/src/mca/pcm/cofs/src/pcm_cofs_module.c +++ b/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 */ diff --git a/src/mca/pcm/pcm.h b/src/mca/pcm/pcm.h index e11214f544..d419a125bd 100644 --- a/src/mca/pcm/pcm.h +++ b/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; diff --git a/src/mca/pcm/rsh/src/Makefile.am b/src/mca/pcm/rsh/src/Makefile.am index 22377e4fcf..900521d7e7 100644 --- a/src/mca/pcm/rsh/src/Makefile.am +++ b/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 diff --git a/src/mca/pcm/rsh/src/pcm_rsh.c b/src/mca/pcm/rsh/src/pcm_rsh.c deleted file mode 100644 index 10e64c5e26..0000000000 --- a/src/mca/pcm/rsh/src/pcm_rsh.c +++ /dev/null @@ -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 -#include -#include -#include -#include diff --git a/src/mca/pcm/rsh/src/pcm_rsh.h b/src/mca/pcm/rsh/src/pcm_rsh.h index e546f82f86..3772fea82f 100644 --- a/src/mca/pcm/rsh/src/pcm_rsh.h +++ b/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 } diff --git a/src/mca/pcm/rsh/src/pcm_rsh_can_spawn.c b/src/mca/pcm/rsh/src/pcm_rsh_can_spawn.c deleted file mode 100644 index 5a18076c03..0000000000 --- a/src/mca/pcm/rsh/src/pcm_rsh_can_spawn.c +++ /dev/null @@ -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; -} diff --git a/src/mca/pcm/rsh/src/pcm_rsh_component.c b/src/mca/pcm/rsh/src/pcm_rsh_component.c index 98323b0266..c889c09a6b 100644 --- a/src/mca/pcm/rsh/src/pcm_rsh_component.c +++ b/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, diff --git a/src/mca/pcm/rsh/src/pcm_rsh_kill_proc.c b/src/mca/pcm/rsh/src/pcm_rsh_kill.c similarity index 73% rename from src/mca/pcm/rsh/src/pcm_rsh_kill_proc.c rename to src/mca/pcm/rsh/src/pcm_rsh_kill.c index 062e68e422..c1704744b5 100644 --- a/src/mca/pcm/rsh/src/pcm_rsh_kill_proc.c +++ b/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; +} diff --git a/src/mca/pcm/rsh/src/pcm_rsh_kill_job.c b/src/mca/pcm/rsh/src/pcm_rsh_kill_job.c deleted file mode 100644 index 9f55df2960..0000000000 --- a/src/mca/pcm/rsh/src/pcm_rsh_kill_job.c +++ /dev/null @@ -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; -} diff --git a/src/mca/pcm/rsh/src/pcm_rsh_register_monitor.c b/src/mca/pcm/rsh/src/pcm_rsh_register_monitor.c deleted file mode 100644 index 66c0124d5e..0000000000 --- a/src/mca/pcm/rsh/src/pcm_rsh_register_monitor.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- C -*- - * - * $HEADER$ - * - */ - -#include "ompi_config.h" - -#include "mca/pcm/pcm.h" -#include "mca/pcm/rsh/src/pcm_rsh.h" - -#include - -int -mca_pcm_rsh_register_monitor(int jobid, ompi_rte_monitor_fn_t func) -{ - return OMPI_SUCCESS; -} diff --git a/src/mca/pcm/rsh/src/pcm_rsh_spawn_procs.c b/src/mca/pcm/rsh/src/pcm_rsh_spawn.c similarity index 87% rename from src/mca/pcm/rsh/src/pcm_rsh_spawn_procs.c rename to src/mca/pcm/rsh/src/pcm_rsh_spawn.c index bef971e336..16aa8ef416 100644 --- a/src/mca/pcm/rsh/src/pcm_rsh_spawn_procs.c +++ b/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) {