Skip to content
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

Jump to bottom

Multiple commits #1737

Merged
merged 2 commits into from
Apr 20, 2023
Merged

Multiple commits #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a57f08
Add debug output in fence upcall
rhc54 Apr 14, 2023
1202645
Silence TSan data race warning.
samuelkgutierrez Apr 19, 2023
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
4 changes: 4 additions & 0 deletions src/include/prte_stdatomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
* Copyright (c) 2021 Amazon.com, Inc. or its affiliates. All Rights
* reserved.
* Copyright (c) 2023 Triad National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -18,6 +19,7 @@
# define PRTE_STDATOMIC_H

# include "prte_stdint.h"
# include <stdbool.h>

# if PRTE_ATOMIC_C11

Expand All @@ -26,6 +28,7 @@
typedef atomic_int prte_atomic_int_t;
typedef atomic_long prte_atomic_long_t;

typedef _Atomic bool prte_atomic_bool_t;
typedef _Atomic int32_t prte_atomic_int32_t;
typedef _Atomic uint32_t prte_atomic_uint32_t;
typedef _Atomic int64_t prte_atomic_int64_t;
Expand All @@ -41,6 +44,7 @@ typedef _Atomic uintptr_t prte_atomic_uintptr_t;
typedef volatile int prte_atomic_int_t;
typedef volatile long prte_atomic_long_t;

typedef volatile bool prte_atomic_bool_t;
typedef volatile int32_t prte_atomic_int32_t;
typedef volatile uint32_t prte_atomic_uint32_t;
typedef volatile int64_t prte_atomic_int64_t;
Expand Down
4 changes: 3 additions & 1 deletion src/mca/oob/tcp/oob_tcp_component.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* Copyright (c) 2020 Amazon.com, Inc. or its affiliates. All Rights
* reserved.
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
* Copyright (c) 2023 Triad National Security, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -34,6 +35,7 @@
# include <sys/time.h>
#endif

#include "src/include/prte_stdatomic.h"
#include "src/class/pmix_bitmap.h"
#include "src/class/pmix_list.h"
#include "src/class/pmix_pointer_array.h"
Expand Down Expand Up @@ -79,7 +81,7 @@ typedef struct {
int num_hnp_ports; /**< number of ports the HNP should listen on */
pmix_list_t listeners; /**< List of sockets being monitored by event or thread */
pmix_thread_t listen_thread; /**< handle to the listening thread */
bool listen_thread_active;
prte_atomic_bool_t listen_thread_active;
struct timeval listen_thread_tv; /**< Timeout when using listen thread */
int stop_thread[2]; /**< pipe used to exit the listen thread */
int keepalive_probes; /**< number of keepalives that can be missed before declaring error */
Expand Down
6 changes: 6 additions & 0 deletions src/prted/pmix/pmix_server_fence.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "src/threads/pmix_threads.h"
#include "src/util/name_fns.h"
#include "src/util/pmix_show_help.h"
#include "src/util/proc_info.h"

#include "src/prted/pmix/pmix_server.h"
#include "src/prted/pmix/pmix_server_internal.h"
Expand Down Expand Up @@ -88,6 +89,11 @@ pmix_status_t pmix_server_fencenb_fn(const pmix_proc_t procs[], size_t nprocs,
pmix_byte_object_t payload;
int rc;

pmix_output_verbose(2, prte_pmix_server_globals.output,
"%s FENCE UPCALLED ON NODE %s",
PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
prte_process_info.nodename);

cd = PMIX_NEW(prte_pmix_mdx_caddy_t);
cd->mdxcbfunc = cbfunc;
cd->cbdata = cbdata;
Expand Down