- Move wait object instance code out of the #ifdef block, so that systems with waitpid and Windows can both use it. Thanks to Ralph.
This commit was SVN r19003.
Этот коммит содержится в:
родитель
1fd5b0402a
Коммит
0646cd2491
@ -60,13 +60,6 @@
|
|||||||
#include "orte/runtime/orte_wait.h"
|
#include "orte/runtime/orte_wait.h"
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_WAITPID
|
|
||||||
|
|
||||||
static volatile int cb_enabled = true;
|
|
||||||
static opal_mutex_t mutex;
|
|
||||||
static opal_list_t pending_pids;
|
|
||||||
static opal_list_t registered_cb;
|
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
*
|
*
|
||||||
* Wait Object Declarations
|
* Wait Object Declarations
|
||||||
@ -100,6 +93,12 @@ OBJ_CLASS_INSTANCE(orte_message_event_t,
|
|||||||
message_event_constructor,
|
message_event_constructor,
|
||||||
message_event_destructor);
|
message_event_destructor);
|
||||||
|
|
||||||
|
#ifdef HAVE_WAITPID
|
||||||
|
|
||||||
|
static volatile int cb_enabled = true;
|
||||||
|
static opal_mutex_t mutex;
|
||||||
|
static opal_list_t pending_pids;
|
||||||
|
static opal_list_t registered_cb;
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
*
|
*
|
||||||
@ -711,26 +710,6 @@ static opal_mutex_t mutex;
|
|||||||
static opal_list_t pending_pids;
|
static opal_list_t pending_pids;
|
||||||
static opal_list_t registered_cb;
|
static opal_list_t registered_cb;
|
||||||
|
|
||||||
|
|
||||||
/*********************************************************************
|
|
||||||
*
|
|
||||||
* Wait Object Declarations
|
|
||||||
*
|
|
||||||
********************************************************************/
|
|
||||||
static void message_event_destructor(orte_message_event_t *ev)
|
|
||||||
{
|
|
||||||
OBJ_RELEASE(ev->buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void message_event_constructor(orte_message_event_t *ev)
|
|
||||||
{
|
|
||||||
ev->buffer = OBJ_NEW(opal_buffer_t);
|
|
||||||
}
|
|
||||||
OBJ_CLASS_INSTANCE(orte_message_event_t,
|
|
||||||
opal_object_t,
|
|
||||||
message_event_constructor,
|
|
||||||
message_event_destructor);
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
opal_list_item_t super;
|
opal_list_item_t super;
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user