Skip to content

Commit d6c5770

Browse files
author
rhc54
committed
Merge pull request #784 from jsquyres/pr/async-event-base-init
Update the opal_progress_thread API
2 parents 1293d9c + 9e1e563 commit d6c5770

File tree

9 files changed

+219
-130
lines changed

9 files changed

+219
-130
lines changed

opal/mca/event/base/event_base_frame.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
2+
* Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
33
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
44
* $COPYRIGHT$
55
*
@@ -65,7 +65,6 @@ static int opal_event_base_close(void)
6565
* Globals
6666
*/
6767
opal_event_base_t *opal_sync_event_base=NULL;
68-
opal_event_base_t *opal_async_event_base=NULL;
6968

7069
static int opal_event_base_open(mca_base_open_flag_t flags)
7170
{

opal/mca/event/external/external.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved.
2+
* Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved.
33
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
44
* Copyright (c) 2015 Intel, Inc. All rights reserved.
55
*
@@ -29,7 +29,6 @@ typedef struct event_base opal_event_base_t;
2929
typedef struct event opal_event_t;
3030

3131
OPAL_DECLSPEC extern opal_event_base_t *opal_sync_event_base;
32-
OPAL_DECLSPEC extern opal_event_base_t *opal_async_event_base;
3332

3433
#define OPAL_EV_TIMEOUT EV_TIMEOUT
3534
#define OPAL_EV_READ EV_READ

opal/mca/event/libevent2022/libevent2022.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
2+
* Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
33
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
44
* Copyright (c) 2012-2013 Los Alamos National Security, LLC.
55
* All rights reserved.
@@ -68,7 +68,6 @@ typedef struct event_base opal_event_base_t;
6868
typedef struct event opal_event_t;
6969

7070
OPAL_DECLSPEC extern opal_event_base_t *opal_sync_event_base;
71-
OPAL_DECLSPEC extern opal_event_base_t *opal_async_event_base;
7271

7372
#define OPAL_EV_TIMEOUT EV_TIMEOUT
7473
#define OPAL_EV_READ EV_READ

opal/mca/pmix/native/pmix_native.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* All rights reserved.
88
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
99
* reserved.
10+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
1011
* $COPYRIGHT$
1112
*
1213
* Additional copyrights may follow
@@ -189,7 +190,8 @@ static int native_init(void)
189190
opal_argv_free(uri);
190191

191192
/* create an event base and progress thread for us */
192-
if (NULL == (mca_pmix_native_component.evbase = opal_start_progress_thread("opal_async", true))) {
193+
if (NULL == (mca_pmix_native_component.evbase =
194+
opal_progress_thread_init(NULL))) {
193195
return OPAL_ERROR;
194196
}
195197
}
@@ -251,7 +253,7 @@ static int native_fini(void)
251253
}
252254

253255
if (NULL != mca_pmix_native_component.evbase) {
254-
opal_stop_progress_thread("opal_async", true);
256+
opal_progress_thread_finalize(NULL);
255257
mca_pmix_native_component.evbase = NULL;
256258
}
257259

0 commit comments

Comments
 (0)