Merge pull request flux-framework#45 from garlick/issue_44

plugin: call notify_destroy() early
garlick · Oct 18, 2021 · fdbd8e8 · fdbd8e8
2 parents a6c5038 + 546c3c7
commit fdbd8e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/shell/plugins/main.c b/src/shell/plugins/main.c
@@ -49,9 +49,9 @@ static void px_destroy (struct px *px)
     if (px) {
         int rc;
         int saved_errno = errno;
+        notify_destroy (px->notify);
         if ((rc = PMIx_server_finalize ()) != PMIX_SUCCESS)
             shell_warn ("PMIx_server_finalize: %s", PMIx_Error_string (rc));
-        notify_destroy (px->notify);
         abort_destroy (px->abort);
         fence_destroy (px->fence);
         dmodex_destroy (px->dmodex);

diff --git a/src/shell/plugins/notify.h b/src/shell/plugins/notify.h
@@ -15,7 +15,8 @@
 #include <pmix_server.h>
 #include "interthread.h"
 
-/* N.B. notify_create() must be called after PMIx_server_init().
+/* N.B. notify_create() must be called after PMIx_server_init()
+ * and notify_destroy() must be called before PMIx_server_finalize().
  */
 struct notify *notify_create (flux_shell_t *shell, struct interthread *it);
 void notify_destroy (struct notify *notify);