diff --git a/opal/event/event.c b/opal/event/event.c index f0ae166d0f..f90f1d5e85 100644 --- a/opal/event/event.c +++ b/opal/event/event.c @@ -604,10 +604,9 @@ opal_event_base_loop(struct event_base *base, int flags) if (base->event_count_active) { opal_event_process_active(base); - if (!base->event_count_active && (flags & OPAL_EVLOOP_ONCE)) + if (!base->event_count_active && (flags & (OPAL_EVLOOP_ONCE|OPAL_EVLOOP_ONELOOP))) done = 1; - } else if ((flags & OPAL_EVLOOP_NONBLOCK) || - (flags & OPAL_EVLOOP_ONELOOP)) + } else if (flags & (OPAL_EVLOOP_NONBLOCK|OPAL_EVLOOP_ONELOOP)) done = 1; } diff --git a/opal/event/event.h b/opal/event/event.h index 8d807f2be1..eeb086bc43 100644 --- a/opal/event/event.h +++ b/opal/event/event.h @@ -176,9 +176,7 @@ int opal_event_base_set(struct event_base *, struct opal_event *); #define OPAL_EVLOOP_ONCE 0x01 #define OPAL_EVLOOP_NONBLOCK 0x02 - /* run once through the loop, but do have the default timeout. - Need to be both something special *AND* EVLOOP_ONCE */ -#define OPAL_EVLOOP_ONELOOP 0x03 +#define OPAL_EVLOOP_ONELOOP 0x04 OMPI_DECLSPEC int opal_event_loop(int); int opal_event_base_loop(struct event_base *, int);