ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #1382 from rhc54/topic/cleanup

Просмотр исходного кода 
Cleanup some valgrind complaints about jumps with uninitialized values.
Этот коммит содержится в:
rhc54 2016-02-18 17:29:37 -08:00
родитель 27e7b6e466 6e68d758b9
Коммит bfd4254a7b
14 изменённых файлов: 112 добавлений и 76 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
opal/mca/pmix/pmix112/pmix1_server_south.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Mellanox Technologies, Inc.
@ -431,7 +431,6 @@ int pmix1_server_notify_error(int status,
op->cbdata = cbdata;
rc = pmix1_convert_opalrc(status);
opal_output(0, "CALLING NOTIFY ERROR");
rc = PMIx_Notify_error(rc, ps, psz, eps, esz,
pinfo, sz, opcbfunc, op);
if (PMIX_SUCCESS != rc) {

3
orte/mca/iof/base/base.h
Просмотреть файл

@ -117,7 +117,8 @@ typedef struct {
orte_iof_read_event_t *revstdout;
orte_iof_read_event_t *revstderr;
orte_iof_read_event_t *revstddiag;
opal_list_t subscribers;
opal_list_t *subscribers;
bool copy;
} orte_iof_proc_t;
ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_iof_proc_t);

7
orte/mca/iof/base/iof_base_frame.c
Просмотреть файл

@ -76,7 +76,8 @@ static void orte_iof_base_proc_construct(orte_iof_proc_t* ptr)
ptr->revstdout = NULL;
ptr->revstderr = NULL;
ptr->revstddiag = NULL;
OBJ_CONSTRUCT(&ptr->subscribers, opal_list_t);
ptr->subscribers = NULL;
ptr->copy = true;
}
static void orte_iof_base_proc_destruct(orte_iof_proc_t* ptr)
{
@ -92,7 +93,9 @@ static void orte_iof_base_proc_destruct(orte_iof_proc_t* ptr)
if (NULL != ptr->revstddiag) {
OBJ_RELEASE(ptr->revstddiag);
}
OPAL_LIST_DESTRUCT(&ptr->subscribers);
if (NULL != ptr->subscribers) {
OPAL_LIST_RELEASE(ptr->subscribers);
}
}
OBJ_CLASS_INSTANCE(orte_iof_proc_t,
opal_list_item_t,

49
orte/mca/iof/base/iof_base_setup.c
Просмотреть файл

@ -250,7 +250,9 @@ int orte_iof_base_setup_output_files(const orte_process_name_t* dst_name,
{
int rc;
char *dirname, *outdir, *outfile;
int np, numdigs, fdout;
int np, numdigs, fdout, i;
char *p, **s;
bool usejobid = true;
/* see if we are to output to a file */
dirname = NULL;
@ -263,11 +265,31 @@ int orte_iof_base_setup_output_files(const orte_process_name_t* dst_name,
numdigs++;
np = np / 10;
}
/* construct the directory where the output files will go */
asprintf(&outdir, "%s/%d/rank.%0*lu", dirname,
(int)ORTE_LOCAL_JOBID(proct->name.jobid),
numdigs, (unsigned long)proct->name.vpid);
/* check for a conditional in the directory name */
if (NULL != (p = strchr(dirname, ':'))) {
*p = '\0';
++p;
/* could me more than one directive */
s = opal_argv_split(p, ',');
for (i=0; NULL != s[i]; i++) {
if (0 == strcasecmp(s[i], "nojobid")) {
usejobid = false;
} else if (0 == strcasecmp(s[i], "nocopy")) {
proct->copy = false;
}
}
}
/* construct the directory where the output files will go */
if (usejobid) {
asprintf(&outdir, "%s/%d/rank.%0*lu", dirname,
(int)ORTE_LOCAL_JOBID(proct->name.jobid),
numdigs, (unsigned long)proct->name.vpid);
} else {
asprintf(&outdir, "%s/rank.%0*lu", dirname,
numdigs, (unsigned long)proct->name.vpid);
}
/* ensure the directory exists */
if (OPAL_SUCCESS != (rc = opal_os_dirpath_create(outdir, S_IRWXU|S_IRGRP|S_IXGRP))) {
ORTE_ERROR_LOG(rc);
@ -319,20 +341,9 @@ int orte_iof_base_setup_output_files(const orte_process_name_t* dst_name,
ORTE_IOF_SINK_DEFINE(stderrsink, dst_name, fdout, ORTE_IOF_STDERR,
orte_iof_base_write_handler);
}
/* always create a sink for stddiag */
asprintf(&outfile, "%s/stddiag", outdir);
fdout = open(outfile, O_CREAT|O_RDWR|O_TRUNC, 0644);
free(outfile);
if (fdout < 0) {
/* couldn't be opened */
ORTE_ERROR_LOG(ORTE_ERR_FILE_OPEN_FAILURE);
return ORTE_ERR_FILE_OPEN_FAILURE;
}
/* define a sink to that file descriptor */
ORTE_IOF_SINK_DEFINE(stddiagsink, dst_name, fdout, ORTE_IOF_STDDIAG,
orte_iof_base_write_handler);
/* cleanup */
free(outdir);
/* always tie the sink for stddiag to stderr */
OBJ_RETAIN(*stderrsink);
*stddiagsink = *stderrsink;
}
return ORTE_SUCCESS;
}

15
orte/mca/iof/hnp/iof_hnp.c
Просмотреть файл

@ -137,7 +137,7 @@ static int hnp_push(const orte_process_name_t* dst_name, orte_iof_tag_t src_tag,
{
orte_job_t *jdata;
orte_proc_t *proc;
orte_iof_proc_t *proct;
orte_iof_proc_t *proct, *pptr;
int flags, rc;
orte_ns_cmp_bitmask_t mask = ORTE_NS_CMP_ALL;
orte_iof_sink_t *stdoutsink=NULL, *stderrsink=NULL, *stddiagsink=NULL;
@ -208,6 +208,19 @@ static int hnp_push(const orte_process_name_t* dst_name, orte_iof_tag_t src_tag,
* been defined!
*/
if (NULL != proct->revstdout && NULL != proct->revstderr && NULL != proct->revstddiag) {
if (proct->copy) {
/* see if there are any wildcard subscribers out there that
* apply to us */
OPAL_LIST_FOREACH(pptr, &mca_iof_hnp_component.procs, orte_iof_proc_t) {
if (dst_name->jobid == pptr->name.jobid &&
ORTE_VPID_WILDCARD == pptr->name.vpid &&
NULL != pptr->subscribers) {
OBJ_RETAIN(pptr->subscribers);
proct->subscribers = pptr->subscribers;
break;
}
}
}
proct->revstdout->active = true;
opal_event_add(proct->revstdout->ev, 0);
proct->revstderr->active = true;

3
orte/mca/iof/hnp/iof_hnp_component.c
Просмотреть файл

@ -13,6 +13,7 @@
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -90,7 +91,7 @@ static int orte_iof_hnp_close(void)
static int orte_iof_hnp_query(mca_base_module_t **module, int *priority)
{
/* if we are not the HNP, then don't use this module */
if (!ORTE_PROC_IS_HNP) {
if (!ORTE_PROC_IS_HNP && !ORTE_PROC_IS_MASTER) {
*priority = -1;
*module = NULL;
return ORTE_ERROR;

47
orte/mca/iof/hnp/iof_hnp_read.c
Просмотреть файл

@ -202,30 +202,33 @@ void orte_iof_hnp_read_local_handler(int fd, short event, void *cbdata)
}
/* this must be output from one of my local procs - see
* if anyone else has requested a copy of this info
* if anyone else has requested a copy of this info. If
* we were directed to put it into a file, then
*/
exclusive = false;
OPAL_LIST_FOREACH(sink, &proct->subscribers, orte_iof_sink_t) {
/* if the target isn't set, then this sink is for another purpose - ignore it */
if (ORTE_JOBID_INVALID == sink->daemon.jobid) {
continue;
}
if ((sink->tag & rev->tag) &&
sink->name.jobid == proct->name.jobid &&
(ORTE_VPID_WILDCARD == sink->name.vpid || sink->name.vpid == proct->name.vpid)) {
/* need to send the data to the remote endpoint - if
* the connection closed, numbytes will be zero, so
* the remote endpoint will know to close its local fd.
* In this case, we pass rev->name to indicate who the
* data came from.
*/
OPAL_OUTPUT_VERBOSE((1, orte_iof_base_framework.framework_output,
"%s sending data to tool %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&sink->daemon)));
orte_iof_hnp_send_data_to_endpoint(&sink->daemon, &proct->name, rev->tag, data, numbytes);
if (sink->exclusive) {
exclusive = true;
if (NULL != proct->subscribers) {
OPAL_LIST_FOREACH(sink, proct->subscribers, orte_iof_sink_t) {
/* if the target isn't set, then this sink is for another purpose - ignore it */
if (ORTE_JOBID_INVALID == sink->daemon.jobid) {
continue;
}
if ((sink->tag & rev->tag) &&
sink->name.jobid == proct->name.jobid &&
(ORTE_VPID_WILDCARD == sink->name.vpid || sink->name.vpid == proct->name.vpid)) {
/* need to send the data to the remote endpoint - if
* the connection closed, numbytes will be zero, so
* the remote endpoint will know to close its local fd.
* In this case, we pass rev->name to indicate who the
* data came from.
*/
OPAL_OUTPUT_VERBOSE((1, orte_iof_base_framework.framework_output,
"%s sending data to tool %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&sink->daemon)));
orte_iof_hnp_send_data_to_endpoint(&sink->daemon, &proct->name, rev->tag, data, numbytes);
if (sink->exclusive) {
exclusive = true;
}
}
}
}

48
orte/mca/iof/hnp/iof_hnp_receive.c
Просмотреть файл

@ -61,7 +61,7 @@ void orte_iof_hnp_recv(int status, orte_process_name_t* sender,
int rc;
bool exclusive;
orte_iof_proc_t *proct;
orte_ns_cmp_bitmask_t mask=ORTE_NS_CMP_ALL;
orte_ns_cmp_bitmask_t mask=ORTE_NS_CMP_ALL | ORTE_NS_CMP_WILD;
OPAL_OUTPUT_VERBOSE((1, orte_iof_base_framework.framework_output,
"%s received IOF from proc %s",
@ -102,9 +102,8 @@ void orte_iof_hnp_recv(int status, orte_process_name_t* sender,
}
OPAL_OUTPUT_VERBOSE((1, orte_iof_base_framework.framework_output,
"%s received IOF cmd from sender %s for source %s",
"%s received IOF cmd for source %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&requestor),
ORTE_NAME_PRINT(&origin)));
/* check to see if a tool has requested something */
@ -144,26 +143,29 @@ void orte_iof_hnp_recv(int status, orte_process_name_t* sender,
/* a tool is requesting that we send it a copy of the specified stream(s)
* from the specified process(es), so create a sink for it
*/
if (NULL == proct->subscribers) {
proct->subscribers = OBJ_NEW(opal_list_t);
}
if (ORTE_IOF_STDOUT & stream) {
ORTE_IOF_SINK_DEFINE(&sink, &origin, -1, ORTE_IOF_STDOUT, NULL);
sink->daemon.jobid = requestor.jobid;
sink->daemon.vpid = requestor.vpid;
sink->exclusive = exclusive;
opal_list_append(&proct->subscribers, &sink->super);
opal_list_append(proct->subscribers, &sink->super);
}
if (ORTE_IOF_STDERR & stream) {
ORTE_IOF_SINK_DEFINE(&sink, &origin, -1, ORTE_IOF_STDERR, NULL);
sink->daemon.jobid = requestor.jobid;
sink->daemon.vpid = requestor.vpid;
sink->exclusive = exclusive;
opal_list_append(&proct->subscribers, &sink->super);
opal_list_append(proct->subscribers, &sink->super);
}
if (ORTE_IOF_STDDIAG & stream) {
ORTE_IOF_SINK_DEFINE(&sink, &origin, -1, ORTE_IOF_STDDIAG, NULL);
sink->daemon.jobid = requestor.jobid;
sink->daemon.vpid = requestor.vpid;
sink->exclusive = exclusive;
opal_list_append(&proct->subscribers, &sink->super);
opal_list_append(proct->subscribers, &sink->super);
}
goto CLEAN_RETURN;
}
@ -181,7 +183,7 @@ void orte_iof_hnp_recv(int status, orte_process_name_t* sender,
if (OPAL_EQUAL != orte_util_compare_name_fields(mask, &proct->name, &origin)) {
continue;
}
OPAL_LIST_FOREACH_SAFE(sink, next, &proct->subscribers, orte_iof_sink_t) {
OPAL_LIST_FOREACH_SAFE(sink, next, proct->subscribers, orte_iof_sink_t) {
/* if the target isn't set, then this sink is for another purpose - ignore it */
if (ORTE_JOBID_INVALID == sink->daemon.jobid) {
continue;
@ -196,7 +198,7 @@ void orte_iof_hnp_recv(int status, orte_process_name_t* sender,
* completed sending anything to that requestor before it exits
*/
orte_iof_hnp_send_data_to_endpoint(&sink->daemon, &origin, ORTE_IOF_CLOSE, NULL, 0);
opal_list_remove_item(&proct->subscribers, &sink->super);
opal_list_remove_item(proct->subscribers, &sink->super);
OBJ_RELEASE(sink);
}
}
@ -233,20 +235,22 @@ void orte_iof_hnp_recv(int status, orte_process_name_t* sender,
NSTEP:
/* cycle through the endpoints to see if someone else wants a copy */
exclusive = false;
OPAL_LIST_FOREACH(sink, &proct->subscribers, orte_iof_sink_t) {
/* if the target isn't set, then this sink is for another purpose - ignore it */
if (ORTE_JOBID_INVALID == sink->daemon.jobid) {
continue;
}
if ((stream & sink->tag) &&
sink->name.jobid == origin.jobid &&
(ORTE_VPID_WILDCARD == sink->name.vpid ||
ORTE_VPID_WILDCARD == origin.vpid ||
sink->name.vpid == origin.vpid)) {
/* send the data to the tool */
orte_iof_hnp_send_data_to_endpoint(&sink->daemon, &origin, stream, data, numbytes);
if (sink->exclusive) {
exclusive = true;
if (NULL != proct->subscribers) {
OPAL_LIST_FOREACH(sink, proct->subscribers, orte_iof_sink_t) {
/* if the target isn't set, then this sink is for another purpose - ignore it */
if (ORTE_JOBID_INVALID == sink->daemon.jobid) {
continue;
}
if ((stream & sink->tag) &&
sink->name.jobid == origin.jobid &&
(ORTE_VPID_WILDCARD == sink->name.vpid ||
ORTE_VPID_WILDCARD == origin.vpid ||
sink->name.vpid == origin.vpid)) {
/* send the data to the tool */
orte_iof_hnp_send_data_to_endpoint(&sink->daemon, &origin, stream, data, numbytes);
if (sink->exclusive) {
exclusive = true;
}
}
}
}

2
orte/mca/iof/orted/iof_orted_component.c
Просмотреть файл

@ -88,7 +88,7 @@ static int orte_iof_orted_query(mca_base_module_t **module, int *priority)
return ORTE_ERROR;
}
*priority = 100;
*priority = 80;
*module = (mca_base_module_t *) &orte_iof_orted_module;
return ORTE_SUCCESS;

1
orte/mca/plm/base/plm_base_launch_support.c
Просмотреть файл

@ -1726,6 +1726,7 @@ int orte_plm_base_setup_virtual_machine(orte_job_t *jdata)
/* if the app provided a dash-host, and we are not treating
* them as requested or "soft" locations, then use those nodes
*/
hosts = NULL;
if (!orte_soft_locations &&
orte_get_attribute(&app->attributes, ORTE_APP_DASH_HOST, (void**)&hosts, OPAL_STRING)) {
OPAL_OUTPUT_VERBOSE((5, orte_plm_base_framework.framework_output,

2
orte/mca/ras/base/ras_base_allocate.c
Просмотреть файл

@ -113,7 +113,7 @@ void orte_ras_base_allocate(int fd, short args, void *cbdata)
orte_std_cntr_t i;
orte_app_context_t *app;
orte_state_caddy_t *caddy = (orte_state_caddy_t*)cbdata;
char *hosts;
char *hosts=NULL;
OPAL_OUTPUT_VERBOSE((5, orte_ras_base_framework.framework_output,
"%s ras:base:allocate",

3
orte/mca/rmaps/base/rmaps_base_binding.c
Просмотреть файл

@ -12,7 +12,7 @@
* Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
@ -484,6 +484,7 @@ static int bind_in_place(orte_job_t *jdata,
continue;
}
/* bozo check */
locale = NULL;
if (!orte_get_attribute(&proc->attributes, ORTE_PROC_HWLOC_LOCALE, (void**)&locale, OPAL_PTR)) {
orte_show_help("help-orte-rmaps-base.txt", "rmaps:no-locale", true, ORTE_NAME_PRINT(&proc->name));
return ORTE_ERR_SILENT;

3
orte/mca/rmaps/base/rmaps_base_support_fns.c
Просмотреть файл

@ -12,7 +12,7 @@
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -166,6 +166,7 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr
/* if the app provided a dash-host, and we are not treating
* them as requested or "soft" locations, then use those nodes
*/
hosts = NULL;
if (!orte_soft_locations &&
orte_get_attribute(&app->attributes, ORTE_APP_DASH_HOST, (void**)&hosts, OPAL_STRING)) {
OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base_framework.framework_output,

2
orte/mca/state/dvm/state_dvm.c
Просмотреть файл

@ -436,13 +436,11 @@ static void check_complete(int fd, short args, void *cbdata)
if (ORTE_FLAG_TEST(jdata, ORTE_JOB_FLAG_DEBUGGER_DAEMON)) {
/* this was a debugger daemon. notify that a debugger has detached */
OBJ_RETAIN(jdata);
ORTE_ACTIVATE_JOB_STATE(jdata, ORTE_JOB_STATE_DEBUGGER_DETACH);
} else if (jdata->state != ORTE_JOB_STATE_NOTIFIED) {
OPAL_OUTPUT_VERBOSE((2, orte_state_base_framework.framework_output,
"%s state:dvm:check_job_completed state is terminated - activating notify",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
OBJ_RETAIN(jdata);
ORTE_ACTIVATE_JOB_STATE(jdata, ORTE_JOB_STATE_NOTIFY_COMPLETED);
/* mark the job as notified */
jdata->state = ORTE_JOB_STATE_NOTIFIED;