Author: balaji Date: 2012-12-19 16:24:41 -0600 (Wed, 19 Dec 2012) New Revision: 10774 Removed: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs_query_jobid.c mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_jobid.c mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_job_id.c Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.h mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_utils.c mpich2/trunk/src/pm/hydra/tools/bootstrap/external/Makefile.mk mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_init.c mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs.h mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs_init.c mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm.h mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_init.c mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in Log: Get rid of unnecessary job ID query mechanism that we added into hydra for FTB. No reviewer. Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -26,7 +26,6 @@ HYD_pmcd_pmip.system_global.pmi_id_map.non_filler_start = -1; HYD_pmcd_pmip.system_global.global_process_count = -1; - HYD_pmcd_pmip.system_global.jobid = NULL; HYD_pmcd_pmip.system_global.pmi_fd = NULL; HYD_pmcd_pmip.system_global.pmi_rank = -1; HYD_pmcd_pmip.system_global.pmi_process_mapping = NULL; @@ -68,9 +67,6 @@ HYDU_finalize_user_global(&HYD_pmcd_pmip.user_global); /* System global */ - if (HYD_pmcd_pmip.system_global.jobid) - HYDU_FREE(HYD_pmcd_pmip.system_global.jobid); - if (HYD_pmcd_pmip.system_global.pmi_fd) HYDU_FREE(HYD_pmcd_pmip.system_global.pmi_fd); Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.h =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.h 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip.h 2012-12-19 22:24:41 UTC (rev 10774) @@ -33,7 +33,6 @@ } pmi_id_map; int global_process_count; - char *jobid; /* PMI */ char *pmi_fd; Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_cb.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -620,13 +620,6 @@ HYDU_ERR_POP(status, "unable to add env to list\n"); } - /* Job ID information */ - if (HYD_pmcd_pmip.system_global.jobid) { - status = HYDU_append_env_to_list("HYDRA_JOBID", HYD_pmcd_pmip.system_global.jobid, - &force_env); - HYDU_ERR_POP(status, "unable to add env to list\n"); - } - /* Set the interface hostname based on what the user provided */ if (HYD_pmcd_pmip.local.iface_ip_env_name) { if (HYD_pmcd_pmip.user_global.iface) { Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_utils.c =================================================================== --- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_utils.c 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmip_utils.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -724,11 +724,6 @@ HYDU_ERR_POP(status, "unable to query launcher for proxy ID\n"); } - if (HYD_pmcd_pmip.system_global.jobid == NULL) { - status = HYDT_bsci_query_jobid(&HYD_pmcd_pmip.system_global.jobid); - HYDU_ERR_POP(status, "unable to query launcher for job ID\n"); - } - if (HYD_pmcd_pmip.local.id == -1) HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "proxy ID not available\n"); Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/Makefile.mk =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/Makefile.mk 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/Makefile.mk 2012-12-19 22:24:41 UTC (rev 10774) @@ -31,7 +31,6 @@ $(top_srcdir)/tools/bootstrap/external/slurm_query_native_int.c \ $(top_srcdir)/tools/bootstrap/external/slurm_query_node_list.c \ $(top_srcdir)/tools/bootstrap/external/slurm_query_proxy_id.c \ - $(top_srcdir)/tools/bootstrap/external/slurm_query_jobid.c \ $(top_srcdir)/tools/bootstrap/external/ll_init.c \ $(top_srcdir)/tools/bootstrap/external/ll_launch.c \ $(top_srcdir)/tools/bootstrap/external/ll_query_native_int.c \ @@ -48,8 +47,7 @@ $(top_srcdir)/tools/bootstrap/external/sge_env.c \ $(top_srcdir)/tools/bootstrap/external/pbs_init.c \ $(top_srcdir)/tools/bootstrap/external/pbs_query_native_int.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_query_node_list.c \ - $(top_srcdir)/tools/bootstrap/external/pbs_query_jobid.c + $(top_srcdir)/tools/bootstrap/external/pbs_query_node_list.c if hydra_pbs_launcher libhydra_la_SOURCES += \ Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_init.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_init.c 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_init.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -33,9 +33,6 @@ if (HYDT_bsci_fns.query_native_int == NULL) HYDT_bsci_fns.query_native_int = HYDT_bscd_external_query_native_int; - if (HYDT_bsci_fns.query_jobid == NULL) - HYDT_bsci_fns.query_jobid = HYDT_bscd_external_query_jobid; - HYDU_FUNC_EXIT(); return status; Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs.h =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs.h 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs.h 2012-12-19 22:24:41 UTC (rev 10774) @@ -29,6 +29,5 @@ HYD_status HYDT_bscd_pbs_query_native_int(int *ret); HYD_status HYDT_bscd_pbs_query_node_list(struct HYD_node **node_list); -HYD_status HYDT_bscd_pbs_query_jobid(char **jobid); #endif /* PBS_H_INCLUDED */ Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs_init.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs_init.c 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs_init.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -48,7 +48,6 @@ { HYDT_bsci_fns.query_node_list = HYDT_bscd_pbs_query_node_list; HYDT_bsci_fns.query_native_int = HYDT_bscd_pbs_query_native_int; - HYDT_bsci_fns.query_jobid = HYDT_bscd_pbs_query_jobid; return HYD_SUCCESS; } Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs_query_jobid.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs_query_jobid.c 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/pbs_query_jobid.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -1,31 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ -/* - * (C) 2008 by Argonne National Laboratory. - * See COPYRIGHT in top-level directory. - */ - -#include "hydra.h" -#include "bsci.h" -#include "common.h" - -HYD_status HYDT_bscd_pbs_query_jobid(char **jobid) -{ - const char *tmp_jobid = NULL; - HYD_status status = HYD_SUCCESS; - - HYDU_FUNC_ENTER(); - - MPL_env2str("PBS_JOBID", &tmp_jobid); - - if (tmp_jobid) - *jobid = HYDU_strdup(tmp_jobid); - else - *jobid = NULL; - - fn_exit: - HYDU_FUNC_EXIT(); - return status; - - fn_fail: - goto fn_exit; -} Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm.h =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm.h 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm.h 2012-12-19 22:24:41 UTC (rev 10774) @@ -14,7 +14,6 @@ HYD_status HYDT_bscd_slurm_query_proxy_id(int *proxy_id); HYD_status HYDT_bscd_slurm_query_native_int(int *ret); HYD_status HYDT_bscd_slurm_query_node_list(struct HYD_node **node_list); -HYD_status HYDT_bscd_slurm_query_jobid(char **jobid); HYD_status HYDT_bscd_slurm_query_env_inherit(const char *env_name, int *ret); #endif /* SLURM_H_INCLUDED */ Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_init.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_init.c 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_init.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -21,7 +21,6 @@ { HYDT_bsci_fns.query_node_list = HYDT_bscd_slurm_query_node_list; HYDT_bsci_fns.query_native_int = HYDT_bscd_slurm_query_native_int; - HYDT_bsci_fns.query_jobid = HYDT_bscd_slurm_query_jobid; return HYD_SUCCESS; } Deleted: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_jobid.c =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_jobid.c 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_jobid.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -1,31 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ -/* - * (C) 2008 by Argonne National Laboratory. - * See COPYRIGHT in top-level directory. - */ - -#include "hydra.h" -#include "bsci.h" -#include "common.h" - -HYD_status HYDT_bscd_slurm_query_jobid(char **jobid) -{ - const char *tmp_jobid = NULL; - HYD_status status = HYD_SUCCESS; - - HYDU_FUNC_ENTER(); - - MPL_env2str("SLURM_JOBID", &tmp_jobid); - - if (tmp_jobid) - *jobid = HYDU_strdup(tmp_jobid); - else - *jobid = NULL; - - fn_exit: - HYDU_FUNC_EXIT(); - return status; - - fn_fail: - goto fn_exit; -} Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h =================================================================== --- mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/include/bsci.h 2012-12-19 22:24:41 UTC (rev 10774) @@ -45,9 +45,6 @@ /** \brief Query for node list information */ HYD_status(*query_node_list) (struct HYD_node ** node_list); - /** \brief Query for job ID information */ - HYD_status(*query_jobid) (char **jobid); - /** \brief Finalize the RMK */ HYD_status(*rmk_finalize) (void); @@ -148,16 +145,6 @@ /** - * \brief HYDT_bsci_query_jobid - Query for Job ID information - * - * \param[out] jobid Job ID - * - * This function allows the upper layers to query the job ID. - */ -HYD_status HYDT_bsci_query_jobid(char **jobid); - - -/** * \brief HYDT_bsci_query_proxy_id - Query the ID of a proxy * * \param[out] proxy_id My proxy ID 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 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_init.c.in 2012-12-19 22:24:41 UTC (rev 10774) @@ -22,7 +22,6 @@ { HYDT_bsci_fns.query_native_int = NULL; HYDT_bsci_fns.query_node_list = NULL; - HYDT_bsci_fns.query_jobid = NULL; HYDT_bsci_fns.rmk_finalize = NULL; } Deleted: 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 2012-12-19 22:22:36 UTC (rev 10773) +++ mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_job_id.c 2012-12-19 22:24:41 UTC (rev 10774) @@ -1,32 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ -/* - * (C) 2008 by Argonne National Laboratory. - * See COPYRIGHT in top-level directory. - */ - -#include "hydra.h" -#include "bsci.h" -#include "bscu.h" - -HYD_status HYDT_bsci_query_jobid(char **jobid) -{ - HYD_status status = HYD_SUCCESS; - - HYDU_FUNC_ENTER(); - - 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(); - return status; - - fn_fail: - goto fn_exit; -}