[mpich2-commits] r7862 - in mpich2/trunk/src/pm/hydra/tools/bootstrap: src utils
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Mon Jan 31 01:13:36 CST 2011
Author: balaji
Date: 2011-01-31 01:13:35 -0600 (Mon, 31 Jan 2011)
New Revision: 7862
Removed:
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_env.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_finalize.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_job_id.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_native_int.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_node_list.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_usize.c
Modified:
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_env.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_finalize.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_job_id.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_native_int.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_node_list.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_usize.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_wait.c
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/Makefile.mk
mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu.h
Log:
For cases where the RMK knows how many cores are available in the
system, we need to set the universe size correctly. This helps with
ticket #1426, though it doesn't fix it still.
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_env.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_env.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_env.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -14,8 +14,13 @@
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.query_env_inherit(env_name, ret);
- HYDU_ERR_POP(status, "launcher returned error querying env propagation\n");
+ if (HYDT_bsci_fns.query_env_inherit) {
+ status = HYDT_bsci_fns.query_env_inherit(env_name, ret);
+ HYDU_ERR_POP(status, "launcher returned error querying env propagation\n");
+ }
+ else {
+ *ret = 1;
+ }
fn_exit:
HYDU_FUNC_EXIT();
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_finalize.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_finalize.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_finalize.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -14,11 +14,15 @@
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.rmk_finalize();
- HYDU_ERR_POP(status, "RMK returned error while finalizing\n");
+ if (HYDT_bsci_fns.rmk_finalize) {
+ status = HYDT_bsci_fns.rmk_finalize();
+ HYDU_ERR_POP(status, "RMK returned error while finalizing\n");
+ }
- status = HYDT_bsci_fns.launcher_finalize();
- HYDU_ERR_POP(status, "RMK returned error while finalizing\n");
+ if (HYDT_bsci_fns.launcher_finalize) {
+ status = HYDT_bsci_fns.launcher_finalize();
+ HYDU_ERR_POP(status, "RMK returned error while finalizing\n");
+ }
if (HYDT_bsci_info.rmk)
HYDU_FREE(HYDT_bsci_info.rmk);
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in 2011-01-31 07:13:35 UTC (rev 7862)
@@ -34,32 +34,6 @@
HYDT_bsci_fns.query_env_inherit = NULL;
}
-static void set_rmk_defaults(void)
-{
- if (HYDT_bsci_fns.query_native_int == NULL)
- HYDT_bsci_fns.query_native_int = HYDT_bscu_query_native_int;
- if (HYDT_bsci_fns.query_node_list == NULL)
- HYDT_bsci_fns.query_node_list = HYDT_bscu_query_node_list;
- if (HYDT_bsci_fns.query_jobid == NULL)
- HYDT_bsci_fns.query_jobid = HYDT_bscu_query_jobid;
- if (HYDT_bsci_fns.rmk_finalize == NULL)
- HYDT_bsci_fns.rmk_finalize = HYDT_bscu_rmk_finalize;
-}
-
-static void set_launcher_defaults(void)
-{
- if (HYDT_bsci_fns.launcher_finalize == NULL)
- HYDT_bsci_fns.launcher_finalize = HYDT_bscu_launcher_finalize;
- if (HYDT_bsci_fns.wait_for_completion == NULL)
- HYDT_bsci_fns.wait_for_completion = HYDT_bscu_wait_for_completion;
- if (HYDT_bsci_fns.query_usize == NULL)
- HYDT_bsci_fns.query_usize = HYDT_bscu_query_usize;
- if (HYDT_bsci_fns.query_proxy_id == NULL)
- HYDT_bsci_fns.query_proxy_id = HYDT_bscu_query_proxy_id;
- if (HYDT_bsci_fns.query_env_inherit == NULL)
- HYDT_bsci_fns.query_env_inherit = HYDT_bscu_query_env_inherit;
-}
-
static void init_bsci_info(void)
{
HYDT_bsci_info.rmk = NULL;
@@ -83,14 +57,13 @@
status = (*rmk_init_array[i])();
HYDU_ERR_POP(status, "bootstrap device returned error initializing\n");
- /* Set default values for the RMK functions */
- set_rmk_defaults();
-
- status = HYDT_bsci_fns.query_native_int(&ret);
+ status = HYDT_bsci_query_native_int(&ret);
HYDU_ERR_POP(status, "unable to query native environment\n");
- status = HYDT_bsci_fns.rmk_finalize();
- HYDU_ERR_POP(status, "unable to finalize bootstrap server\n");
+ if (HYDT_bsci_fns.rmk_finalize) {
+ status = HYDT_bsci_fns.rmk_finalize();
+ HYDU_ERR_POP(status, "unable to finalize bootstrap server\n");
+ }
HYDU_FREE(HYDT_bsci_info.rmk);
init_rmk_fns();
@@ -204,10 +177,6 @@
"unrecognized launcher: %s\n", HYDT_bsci_info.launcher);
- /* Set default values for the remaining functions */
- set_rmk_defaults();
- set_launcher_defaults();
-
/* This function is mandatory */
if (HYDT_bsci_fns.launch_procs == NULL)
HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR,
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_job_id.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_job_id.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_job_id.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -14,8 +14,14 @@
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.query_jobid(jobid);
- HYDU_ERR_POP(status, "RMK returned error while querying job ID\n");
+ if (HYDT_bsci_fns.query_jobid) {
+ status = HYDT_bsci_fns.query_jobid(jobid);
+ HYDU_ERR_POP(status, "RMK returned error while querying job ID\n");
+ }
+ else {
+ /* We don't know anything about job ID */
+ *jobid = NULL;
+ }
fn_exit:
HYDU_FUNC_EXIT();
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_native_int.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_native_int.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_native_int.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -14,8 +14,13 @@
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.query_native_int(ret);
- HYDU_ERR_POP(status, "RMK returned error querying native integration\n");
+ if (HYDT_bsci_fns.query_native_int) {
+ status = HYDT_bsci_fns.query_native_int(ret);
+ HYDU_ERR_POP(status, "RMK returned error querying native integration\n");
+ }
+ else {
+ *ret = 0;
+ }
fn_exit:
HYDU_FUNC_EXIT();
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_node_list.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_node_list.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -14,8 +14,14 @@
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.query_node_list(node_list);
- HYDU_ERR_POP(status, "RMK returned error while querying node list\n");
+ if (HYDT_bsci_fns.query_node_list) {
+ status = HYDT_bsci_fns.query_node_list(node_list);
+ HYDU_ERR_POP(status, "RMK returned error while querying node list\n");
+ }
+ else {
+ /* We don't know anything about nodes or resources */
+ *node_list = NULL;
+ }
fn_exit:
HYDU_FUNC_EXIT();
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -14,8 +14,14 @@
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.query_proxy_id(proxy_id);
- HYDU_ERR_POP(status, "launcher returned error while querying proxy ID\n");
+ if (HYDT_bsci_fns.query_proxy_id) {
+ status = HYDT_bsci_fns.query_proxy_id(proxy_id);
+ HYDU_ERR_POP(status, "launcher returned error while querying proxy ID\n");
+ }
+ else {
+ /* We don't know anything about proxy IDs by default. */
+ *proxy_id = -1;
+ }
fn_exit:
HYDU_FUNC_EXIT();
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_usize.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_usize.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_usize.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -10,13 +10,28 @@
HYD_status HYDT_bsci_query_usize(int *size)
{
+ struct HYD_node *node_list, *tmp;
HYD_status status = HYD_SUCCESS;
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.query_usize(size);
- HYDU_ERR_POP(status, "launcher returned error querying usize\n");
+ if (HYDT_bsci_fns.query_usize)
+ return HYDT_bsci_fns.query_usize(size);
+ status = HYDT_bsci_fns.query_node_list(&node_list);
+ HYDU_ERR_POP(status, "unable to query node list\n");
+
+ if (node_list) {
+ *size = 0;
+ for (tmp = node_list; tmp; tmp = tmp->next)
+ *size += tmp->core_count;
+ }
+ else {
+ *size = -1;
+ }
+
+ HYDU_free_node_list(node_list);
+
fn_exit:
HYDU_FUNC_EXIT();
return status;
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_wait.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_wait.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_wait.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -14,7 +14,12 @@
HYDU_FUNC_ENTER();
- status = HYDT_bsci_fns.wait_for_completion(timeout);
+ if (HYDT_bsci_fns.wait_for_completion) {
+ status = HYDT_bsci_fns.wait_for_completion(timeout);
+ }
+ else {
+ status = HYDT_bscu_wait_for_completion(timeout);
+ }
HYDU_ERR_POP(status, "launcher returned error waiting for completion\n");
fn_exit:
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/Makefile.mk
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/Makefile.mk 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/Makefile.mk 2011-01-31 07:13:35 UTC (rev 7862)
@@ -6,12 +6,6 @@
AM_CPPFLAGS += -I$(top_srcdir)/tools/bootstrap/utils
-libhydra_la_SOURCES += $(top_srcdir)/tools/bootstrap/utils/bscu_finalize.c \
- $(top_srcdir)/tools/bootstrap/utils/bscu_query_node_list.c \
- $(top_srcdir)/tools/bootstrap/utils/bscu_query_job_id.c \
- $(top_srcdir)/tools/bootstrap/utils/bscu_query_proxy_id.c \
- $(top_srcdir)/tools/bootstrap/utils/bscu_query_native_int.c \
- $(top_srcdir)/tools/bootstrap/utils/bscu_usize.c \
+libhydra_la_SOURCES += \
$(top_srcdir)/tools/bootstrap/utils/bscu_wait.c \
- $(top_srcdir)/tools/bootstrap/utils/bscu_cb.c \
- $(top_srcdir)/tools/bootstrap/utils/bscu_env.c
+ $(top_srcdir)/tools/bootstrap/utils/bscu_cb.c
Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu.h
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu.h 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu.h 2011-01-31 07:13:35 UTC (rev 7862)
@@ -15,15 +15,7 @@
extern int *HYD_bscu_pid_list;
extern int HYD_bscu_pid_count;
-HYD_status HYDT_bscu_rmk_finalize(void);
-HYD_status HYDT_bscu_launcher_finalize(void);
-HYD_status HYDT_bscu_query_node_list(struct HYD_node **node_list);
-HYD_status HYDT_bscu_query_jobid(char **jobid);
-HYD_status HYDT_bscu_query_usize(int *size);
-HYD_status HYDT_bscu_query_proxy_id(int *proxy_id);
HYD_status HYDT_bscu_wait_for_completion(int timeout);
-HYD_status HYDT_bscu_query_env_inherit(const char *env_name, int *ret);
HYD_status HYDT_bscu_stdio_cb(int fd, HYD_event_t events, void *userp);
-HYD_status HYDT_bscu_query_native_int(int *ret);
#endif /* BSCU_H_INCLUDED */
Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_env.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_env.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_env.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -1,21 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "hydra.h"
-#include "bscu.h"
-
-HYD_status HYDT_bscu_query_env_inherit(const char *env_name, int *ret)
-{
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- *ret = 1;
-
- HYDU_FUNC_EXIT();
-
- return status;
-}
Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_finalize.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_finalize.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_finalize.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -1,30 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "hydra.h"
-#include "bscu.h"
-
-HYD_status HYDT_bscu_rmk_finalize(void)
-{
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- HYDU_FUNC_EXIT();
-
- return status;
-}
-
-HYD_status HYDT_bscu_launcher_finalize(void)
-{
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- HYDU_FUNC_EXIT();
-
- return status;
-}
Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_job_id.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_job_id.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_job_id.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -1,22 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "hydra.h"
-#include "bscu.h"
-
-HYD_status HYDT_bscu_query_jobid(char **jobid)
-{
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- /* We don't know anything about job ID */
- *jobid = NULL;
-
- HYDU_FUNC_EXIT();
-
- return status;
-}
Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_native_int.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_native_int.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_native_int.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -1,21 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "hydra.h"
-#include "bscu.h"
-
-HYD_status HYDT_bscu_query_native_int(int *ret)
-{
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- *ret = 0;
-
- HYDU_FUNC_EXIT();
-
- return status;
-}
Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_node_list.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_node_list.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_node_list.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -1,22 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "hydra.h"
-#include "bscu.h"
-
-HYD_status HYDT_bscu_query_node_list(struct HYD_node **node_list)
-{
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- /* We don't know anything about nodes or resources */
- *node_list = NULL;
-
- HYDU_FUNC_EXIT();
-
- return status;
-}
Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_query_proxy_id.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -1,22 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "hydra.h"
-#include "bscu.h"
-
-HYD_status HYDT_bscu_query_proxy_id(int *proxy_id)
-{
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- /* We don't know anything about proxy IDs by default. */
- *proxy_id = -1;
-
- HYDU_FUNC_EXIT();
-
- return status;
-}
Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_usize.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_usize.c 2011-01-29 05:42:16 UTC (rev 7861)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/utils/bscu_usize.c 2011-01-31 07:13:35 UTC (rev 7862)
@@ -1,21 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*
- * (C) 2008 by Argonne National Laboratory.
- * See COPYRIGHT in top-level directory.
- */
-
-#include "hydra.h"
-#include "bscu.h"
-
-HYD_status HYDT_bscu_query_usize(int *size)
-{
- HYD_status status = HYD_SUCCESS;
-
- HYDU_FUNC_ENTER();
-
- *size = -1;
-
- HYDU_FUNC_EXIT();
-
- return status;
-}
More information about the mpich2-commits
mailing list