9613b3176c
After much work by Jeff and myself, and quite a lot of discussion, it has become clear that we simply cannot resolve the infinite loops caused by RML-involved subsystems calling orte_output. The original rationale for the change to orte_output has also been reduced by shifting the output of XML-formatted vs human readable messages to an alternative approach. I have globally replaced the orte_output/ORTE_OUTPUT calls in the code base, as well as the corresponding .h file name. I have test compiled and run this on the various environments within my reach, so hopefully this will prove minimally disruptive. This commit was SVN r18619.
134 строки
4.3 KiB
C
134 строки
4.3 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* Copyright (c) 2007 Cisco, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "orte_config.h"
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
#include <errno.h>
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_FCNTL_H
|
|
#include <sys/fcntl.h>
|
|
#endif
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#include "orte/util/show_help.h"
|
|
#include "orte/mca/oob/base/base.h"
|
|
#include "orte/mca/iof/base/base.h"
|
|
#include "orte/mca/iof/base/iof_base_endpoint.h"
|
|
#include "orte/mca/iof/base/iof_base_fragment.h"
|
|
|
|
/**
|
|
* timer callback out of the event loop
|
|
*/
|
|
|
|
static void orte_iof_base_timer_cb(int fd, short flags, void *cbdata)
|
|
{
|
|
int *flushed = (int*)cbdata;
|
|
OPAL_THREAD_LOCK(&orte_iof_base.iof_lock);
|
|
*flushed = 1;
|
|
opal_condition_signal(&orte_iof_base.iof_condition);
|
|
OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock);
|
|
}
|
|
|
|
|
|
/*
|
|
* flush output streams and block until there is no pending I/O
|
|
* on any of the current endpoints.
|
|
*/
|
|
|
|
int orte_iof_base_flush(void)
|
|
{
|
|
opal_list_item_t* item;
|
|
opal_event_t ev;
|
|
struct timeval tv = { 0, 0 };
|
|
int flushed = 0;
|
|
size_t pending;
|
|
static int32_t lock = 0;
|
|
|
|
opal_output_verbose(1, orte_iof_base.iof_output, "CALLING IOF BASE FLUSH!");
|
|
if(OPAL_THREAD_ADD32(&lock,1) > 1) {
|
|
OPAL_THREAD_ADD32(&lock,-1);
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
/* flush any pending output */
|
|
fflush(NULL);
|
|
|
|
/* force all file descriptors to be progressed at least once,
|
|
* wait on a timer callback to be called out of the event loop
|
|
*/
|
|
|
|
opal_output_verbose(1, orte_iof_base.iof_output,
|
|
"IOF BASE FLUSH: tweaking all endpoints once");
|
|
if(opal_event_progress_thread() == false) {
|
|
OPAL_THREAD_LOCK(&orte_iof_base.iof_lock);
|
|
opal_evtimer_set(&ev, orte_iof_base_timer_cb, &flushed);
|
|
opal_event_add(&ev, &tv);
|
|
while(0 == flushed) {
|
|
opal_condition_wait(&orte_iof_base.iof_condition, &orte_iof_base.iof_lock);
|
|
}
|
|
} else {
|
|
opal_event_loop(OPAL_EVLOOP_NONBLOCK);
|
|
OPAL_THREAD_LOCK(&orte_iof_base.iof_lock);
|
|
}
|
|
opal_output_verbose(1, orte_iof_base.iof_output,
|
|
"IOF BASE FLUSH: done tweaking all endpoints once");
|
|
orte_iof_base.iof_waiting++;
|
|
|
|
/* wait for all of the endpoints to reach an idle state */
|
|
do {
|
|
pending = 0;
|
|
/* Count how many endpoints have fragments pending to be
|
|
written */
|
|
for (item = opal_list_get_first(&orte_iof_base.iof_endpoints);
|
|
item != opal_list_get_end(&orte_iof_base.iof_endpoints);
|
|
item = opal_list_get_next(item)) {
|
|
orte_iof_base_endpoint_t* endpoint =
|
|
(orte_iof_base_endpoint_t*)item;
|
|
if (orte_iof_base_endpoint_have_pending_frags(endpoint)) {
|
|
++pending;
|
|
}
|
|
}
|
|
/* If there were any with pending writes, try to make some
|
|
progress */
|
|
if (pending > 0) {
|
|
if (!opal_event_progress_thread()) {
|
|
opal_condition_wait(&orte_iof_base.iof_condition,
|
|
&orte_iof_base.iof_lock);
|
|
} else {
|
|
OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock);
|
|
opal_event_loop(OPAL_EVLOOP_ONCE);
|
|
OPAL_THREAD_LOCK(&orte_iof_base.iof_lock);
|
|
}
|
|
}
|
|
} while (pending > 0);
|
|
opal_output_verbose(1, orte_iof_base.iof_output, "IOF BASE FLUSH: done waiting");
|
|
orte_iof_base.iof_waiting--;
|
|
OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock);
|
|
OPAL_THREAD_ADD32(&lock,-1);
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|