From ca75ff2569e336faa12142376a63de9747aca33a Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Thu, 6 Apr 2006 14:31:38 +0000 Subject: [PATCH] In the case we have support for threads, then the opal library have it's own thread, which will do progress independently of MPI. So in this case we have to call opal_event_loop instead of opal_progress. This commit was SVN r9551. --- orte/mca/oob/tcp/oob_tcp_msg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/orte/mca/oob/tcp/oob_tcp_msg.c b/orte/mca/oob/tcp/oob_tcp_msg.c index 21d31a5da7..d36a3017f3 100644 --- a/orte/mca/oob/tcp/oob_tcp_msg.c +++ b/orte/mca/oob/tcp/oob_tcp_msg.c @@ -119,9 +119,8 @@ int mca_oob_tcp_msg_timedwait(mca_oob_tcp_msg_t* msg, int* rc, struct timespec* if(opal_event_progress_thread()) { int rc; OPAL_THREAD_UNLOCK(&msg->msg_lock); - opal_progress(); - /*rc = opal_event_loop(OPAL_EVLOOP_ONCE); - assert(rc >= 0);*/ + rc = opal_event_loop(OPAL_EVLOOP_ONCE); + assert(rc >= 0); OPAL_THREAD_LOCK(&msg->msg_lock); } else { opal_condition_timedwait(&msg->msg_condition, &msg->msg_lock, abstime); @@ -134,7 +133,6 @@ int mca_oob_tcp_msg_timedwait(mca_oob_tcp_msg_t* msg, int* rc, struct timespec* while(msg->msg_complete == false && ((uint32_t)tv.tv_sec <= secs || ((uint32_t)tv.tv_sec == secs && (uint32_t)tv.tv_usec < usecs))) { - /*(void)opal_event_loop(OPAL_EVLOOP_ONCE);*/ opal_progress(); gettimeofday(&tv,NULL); }