Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ldorau committed Nov 19, 2024
1 parent fe27216 commit 797dfa6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reusable_proxy_lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Run "ctest --output-on-failure" with proxy library and size.threshold=128
working-directory: ${{env.BUILD_DIR}}
run: >
UMF_PROXY="size.threshold=128"
UMF_PROXY="page.disposition=shared-shm;size.threshold=128"
LD_PRELOAD=./lib/libumf_proxy.so
ctest --output-on-failure -E provider_file_memory_ipc
Expand Down
1 change: 1 addition & 0 deletions src/proxy_lib/proxy_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ static __TLS int was_called_from_malloc_usable_size = 0;
#ifndef _WIN32
static size_t get_size_threshold(void) {
char *str_threshold = utils_env_var_get_str("UMF_PROXY", "size.threshold=");
LOG_DEBUG("UMF_PROXY[size.threshold] = %s", str_threshold);
long threshold = utils_get_size_threshold(str_threshold);
if (threshold < 0) {
LOG_ERR("incorrect size threshold: %s", str_threshold);
Expand Down
6 changes: 2 additions & 4 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -420,10 +420,8 @@ if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
NAME test_proxy_lib_size_threshold
SRCS ${BA_SOURCES_FOR_TEST} test_proxy_lib_size_threshold.cpp
LIBS ${UMF_UTILS_FOR_TEST} umf_proxy)
set_property(
TEST umf-test_proxy_lib_size_threshold
PROPERTY ENVIRONMENT
UMF_PROXY="page.disposition=shared-shm;size.threshold=64")
set_property(TEST umf-test_proxy_lib_size_threshold
PROPERTY ENVIRONMENT UMF_PROXY="size.threshold=64")
endif()

# the memoryPool test run with the proxy library
Expand Down

0 comments on commit 797dfa6

Please sign in to comment.