Skip to content

interlib: fix thread safety issue #13433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −3
Open

interlib: fix thread safety issue #13433

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
9 changes: 6 additions & 3 deletions ompi/interlib/interlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* All rights reserved.
* Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015-2025 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015-2020 Intel, Inc. All rights reserved.
* Copyright (c) 2017 IBM Corporation. All rights reserved.
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
Expand All @@ -37,6 +37,8 @@

#include "mpi.h"

static bool show_model_callback = false;

static void model_callback(size_t refid, pmix_status_t status,
const pmix_proc_t *source,
pmix_info_t *info, size_t ninfo,
Expand All @@ -46,7 +48,7 @@ static void model_callback(size_t refid, pmix_status_t status,
{
size_t n;

if (NULL != getenv("OMPI_SHOW_MODEL_CALLBACK")) {
if (show_model_callback) {
/* we can ignore our own callback as we obviously
* know that we are MPI */
if (NULL != info) {
Expand Down Expand Up @@ -90,6 +92,7 @@ int ompi_interlib_declare(int threadlevel, char *version)
pmix_status_t code = PMIX_MODEL_DECLARED;
opal_pmix_lock_t mylock;

show_model_callback = (NULL != getenv("OMPI_SHOW_MODEL_CALLBACK"));
/* Register an event handler for library model declarations */
/* give it a name so we can distinguish it */
PMIX_INFO_LOAD(&directives, PMIX_EVENT_HDLR_NAME, "MPI-Model-Declarations", PMIX_STRING);
Expand Down
Loading