Skip to content

Commit

Permalink
Fix the failures on non-concurrent builds
Browse files Browse the repository at this point in the history 
Signed-off-by: Quincey Koziol <[email protected]>
  • Loading branch information
@qkoziol
qkoziol committed Nov 23, 2024
1 parent 963c6c3 commit 3303567
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 121 deletions.
186 changes: 93 additions & 93 deletions .github/workflows/cmake.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ permissions:
contents: read

jobs:
# call-workflow-special-cmake:
# name: "CMake Special Workflows"
# uses: ./.github/workflows/main-cmake-spc.yml
call-workflow-special-cmake:
name: "CMake Special Workflows"
uses: ./.github/workflows/main-cmake-spc.yml

# call-debug-concurrent-cmake:
# name: "CMake Debug Concurrency Workflows"
# uses: ./.github/workflows/main-cmake.yml
# with:
# concurrent: "CC"
# thread_safety: ""
# build_mode: "Debug"
call-debug-concurrent-cmake:
name: "CMake Debug Concurrency Workflows"
uses: ./.github/workflows/main-cmake.yml
with:
concurrent: "CC"
thread_safety: ""
build_mode: "Debug"

# call-release-concurrent-cmake:
# name: "CMake Release Concurrency Workflows"
# uses: ./.github/workflows/main-cmake.yml
# with:
# concurrent: "CC"
# thread_safety: ""
# build_mode: "Release"
call-release-concurrent-cmake:
name: "CMake Release Concurrency Workflows"
uses: ./.github/workflows/main-cmake.yml
with:
concurrent: "CC"
thread_safety: ""
build_mode: "Release"

call-debug-thread-cmake:
name: "CMake Debug Thread-Safety Workflows"
Expand All @@ -52,97 +52,97 @@ jobs:
thread_safety: "TS"
build_mode: "Debug"

# call-release-thread-cmake:
# name: "CMake Release Thread-Safety Workflows"
# uses: ./.github/workflows/main-cmake.yml
# with:
# concurrent: ""
# thread_safety: "TS"
# build_mode: "Release"
call-release-thread-cmake:
name: "CMake Release Thread-Safety Workflows"
uses: ./.github/workflows/main-cmake.yml
with:
concurrent: ""
thread_safety: "TS"
build_mode: "Release"

# call-debug-cmake:
# name: "CMake Debug Workflows"
# uses: ./.github/workflows/main-cmake.yml
# with:
# concurrent: ""
# thread_safety: ""
# build_mode: "Debug"
call-debug-cmake:
name: "CMake Debug Workflows"
uses: ./.github/workflows/main-cmake.yml
with:
concurrent: ""
thread_safety: ""
build_mode: "Debug"

# call-release-cmake:
# name: "CMake Release Workflows"
# uses: ./.github/workflows/main-cmake.yml
# with:
# concurrent: ""
# thread_safety: ""
# build_mode: "Release"

# call-release-bintest:
# name: "CMake Test Release Binaries"
# needs: call-release-cmake
# uses: ./.github/workflows/cmake-bintest.yml
# with:
# build_mode: "Release"
call-release-cmake:
name: "CMake Release Workflows"
uses: ./.github/workflows/main-cmake.yml
with:
concurrent: ""
thread_safety: ""
build_mode: "Release"

# call-release-par:
# name: "CMake Parallel Release Workflows"
# uses: ./.github/workflows/main-cmake-par.yml
# with:
# build_mode: "Release"
call-release-bintest:
name: "CMake Test Release Binaries"
needs: call-release-cmake
uses: ./.github/workflows/cmake-bintest.yml
with:
build_mode: "Release"

# call-debug-par:
# name: "CMake Parallel Debug Workflows"
# uses: ./.github/workflows/main-cmake-par.yml
# with:
# build_mode: "Debug"
call-release-par:
name: "CMake Parallel Release Workflows"
uses: ./.github/workflows/main-cmake-par.yml
with:
build_mode: "Release"

# call-release-special-par:
# name: "CMake Parallel Release Special Workflows"
# uses: ./.github/workflows/main-cmake-par-spc.yml
# with:
# build_mode: "Release"
call-debug-par:
name: "CMake Parallel Debug Workflows"
uses: ./.github/workflows/main-cmake-par.yml
with:
build_mode: "Debug"

# call-debug-special-par:
# name: "CMake Parallel Debug Special Workflows"
# uses: ./.github/workflows/main-cmake-par-spc.yml
# with:
# build_mode: "Debug"
call-release-special-par:
name: "CMake Parallel Release Special Workflows"
uses: ./.github/workflows/main-cmake-par-spc.yml
with:
build_mode: "Release"

# call-release-cmake-intel:
# name: "CMake Intel Workflows"
# uses: ./.github/workflows/intel-cmake.yml
# with:
# build_mode: "Release"
call-debug-special-par:
name: "CMake Parallel Debug Special Workflows"
uses: ./.github/workflows/main-cmake-par-spc.yml
with:
build_mode: "Debug"

# call-release-cmake-nvhpc:
# name: "CMake nvhpc Workflows"
# uses: ./.github/workflows/nvhpc-cmake.yml
# with:
# build_mode: "Release"
call-release-cmake-intel:
name: "CMake Intel Workflows"
uses: ./.github/workflows/intel-cmake.yml
with:
build_mode: "Release"

# call-release-cmake-aocc:
# name: "CMake aocc Workflows"
# uses: ./.github/workflows/aocc-cmake.yml
# with:
# build_mode: "Release"
call-release-cmake-nvhpc:
name: "CMake nvhpc Workflows"
uses: ./.github/workflows/nvhpc-cmake.yml
with:
build_mode: "Release"

# call-release-cmake-xpr:
# name: "CMake TestExpress Workflows"
# uses: ./.github/workflows/testxpr-cmake.yml
call-release-cmake-aocc:
name: "CMake aocc Workflows"
uses: ./.github/workflows/aocc-cmake.yml
with:
build_mode: "Release"

call-release-cmake-xpr:
name: "CMake TestExpress Workflows"
uses: ./.github/workflows/testxpr-cmake.yml

# call-release-cmake-julia:
# name: "CMake Julia Workflows"
# uses: ./.github/workflows/julia-cmake.yml
# with:
# build_mode: "Release"

# call-release-cmake-msys2:
# name: "CMake Msys2 Workflows"
# uses: ./.github/workflows/msys2-cmake.yml
# with:
# build_mode: "Release"
call-release-cmake-msys2:
name: "CMake Msys2 Workflows"
uses: ./.github/workflows/msys2-cmake.yml
with:
build_mode: "Release"

# call-release-cmake-i386:
# name: "CMake i386 Workflows"
# uses: ./.github/workflows/i386-cmake.yml
# with:
# build_mode: "Release"
call-release-cmake-i386:
name: "CMake i386 Workflows"
uses: ./.github/workflows/i386-cmake.yml
with:
build_mode: "Release"
40 changes: 12 additions & 28 deletions src/H5FL.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@ typedef struct H5FL_reg_gc_list_t {
#ifdef H5_HAVE_CONCURRENCY
bool init; /* Whether the mutex has been initialized */
H5TS_dlftt_mutex_t mutex; /* Guard access to the list of free lists */
#endif /* H5_HAVE_CONCURRENCY */
H5TS_atomic_size_t mem_freed; /* Amount of free memory on list */
#else /* H5_HAVE_CONCURRENCY */
size_t mem_freed; /* Amount of free memory on list */
#endif /* H5_HAVE_CONCURRENCY */
struct H5FL_reg_gc_node_t *first; /* Pointer to the first node in the list of things to garbage collect */
} H5FL_reg_gc_list_t;

Expand All @@ -126,8 +128,10 @@ typedef struct H5FL_gc_arr_list_t {
#ifdef H5_HAVE_CONCURRENCY
bool init; /* Whether the mutex has been initialized */
H5TS_dlftt_mutex_t mutex; /* Guard access to the list of free lists */
#endif /* H5_HAVE_CONCURRENCY */
H5TS_atomic_size_t mem_freed; /* Amount of free memory on list */
#else /* H5_HAVE_CONCURRENCY */
size_t mem_freed; /* Amount of free memory on list */
#endif /* H5_HAVE_CONCURRENCY */
struct H5FL_gc_arr_node_t *first; /* Pointer to the first node in the list of things to garbage collect */
} H5FL_gc_arr_list_t;

Expand All @@ -145,8 +149,10 @@ typedef struct H5FL_blk_gc_list_t {
#ifdef H5_HAVE_CONCURRENCY
bool init; /* Whether the mutex has been initialized */
H5TS_dlftt_mutex_t mutex; /* Guard access to the list of free lists */
#endif /* H5_HAVE_CONCURRENCY */
H5TS_atomic_size_t mem_freed; /* Amount of free memory on list */
#else /* H5_HAVE_CONCURRENCY */
size_t mem_freed; /* Amount of free memory on list */
#endif /* H5_HAVE_CONCURRENCY */
struct H5FL_blk_gc_node_t *first; /* Pointer to the first node in the list of things to garbage collect */
} H5FL_blk_gc_list_t;

Expand All @@ -164,9 +170,11 @@ typedef struct H5FL_fac_gc_list_t {
#ifdef H5_HAVE_CONCURRENCY
bool init; /* Whether the mutex has been initialized */
H5TS_dlftt_mutex_t mutex; /* Guard access to this free list */
H5TS_atomic_size_t mem_freed; /* Amount of free memory on list */
#else /* H5_HAVE_CONCURRENCY */
size_t mem_freed; /* Amount of free memory on list */
#endif /* H5_HAVE_CONCURRENCY */

H5TS_atomic_size_t mem_freed; /* Amount of free memory on list */
struct H5FL_fac_gc_node_t *first; /* Pointer to the first node in the list of things to garbage collect */
} H5FL_fac_gc_list_t;

Expand Down Expand Up @@ -272,30 +280,6 @@ H5FL_init(void)
} /* end H5FL_init() */
#endif /* H5_HAVE_CONCURRENCY */

#ifdef H5_HAVE_THREADS
#pragma message("H5_HAVE_THREADS")
#else /* H5_HAVE_THREADS */
#pragma message("NOT H5_HAVE_THREADS")
#endif /* H5_HAVE_THREADS */

#ifdef H5_HAVE_THREADSAFE_API
#pragma message("H5_HAVE_THREADSAFE_API")
#else /* H5_HAVE_THREADSAFE_API */
#pragma message("NOT H5_HAVE_THREADSAFE_API")
#endif /* H5_HAVE_THREADSAFE_API */

#ifdef H5_HAVE_CONCURRENCY
#pragma message("H5_HAVE_CONCURRENCY")
#else /* H5_HAVE_CONCURRENCY */
#pragma message("NOT H5_HAVE_CONCURRENCY")
#endif /* H5_HAVE_CONCURRENCY */

#ifdef H5_HAVE_STDATOMIC_H
#pragma message("H5_HAVE_STDATOMIC_H")
#else /* H5_HAVE_STDATOMIC_H */
#pragma message("NOT H5_HAVE_STDATOMIC_H")
#endif /* H5_HAVE_STDATOMIC_H */

/*--------------------------------------------------------------------------
NAME
H5FL_term_package
Expand Down

0 comments on commit 3303567

Please sign in to comment.