Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

pmix: fix finalize ordering issue #753

Merged
merged 1 commit into from
Nov 10, 2015
Merged

pmix: fix finalize ordering issue #753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions opal/mca/pmix/pmix1xx/pmix/src/client/pmix_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Artem Y. Polyakov <artpol84@gmail.com>.
* All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -404,10 +405,6 @@ pmix_status_t PMIx_Finalize(void)
}

pmix_stop_progress_thread(pmix_globals.evbase);
event_base_free(pmix_globals.evbase);
#ifdef HAVE_LIBEVENT_GLOBAL_SHUTDOWN
libevent_global_shutdown();
#endif

pmix_usock_finalize();
PMIX_DESTRUCT(&pmix_client_globals.myserver);
Expand All @@ -416,6 +413,12 @@ pmix_status_t PMIx_Finalize(void)
if (0 <= pmix_client_globals.myserver.sd) {
CLOSE_THE_SOCKET(pmix_client_globals.myserver.sd);
}

event_base_free(pmix_globals.evbase);
#ifdef HAVE_LIBEVENT_GLOBAL_SHUTDOWN
libevent_global_shutdown();
#endif

pmix_bfrop_close();
pmix_sec_finalize();

Expand Down