Skip to content

Commit 3796b8a

Browse files
committed
enable tracker in ProxyLib by default
1 parent d69a241 commit 3796b8a

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/provider/provider_tracking.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,14 @@ static umf_result_t umfMemoryTrackerAdd(umf_memory_tracker_handle_t hTracker,
4848
int ret = critnib_insert(hTracker->map, (uintptr_t)ptr, value, 0);
4949

5050
if (ret == 0) {
51-
LOG_DEBUG("memory region is added, tracker=%p, ptr=%p, size=%zu",
52-
(void *)hTracker, ptr, size);
51+
LOG_DEBUG(
52+
"memory region is added, tracker=%p, ptr=%p, pool=%p, size=%zu",
53+
(void *)hTracker, ptr, (void *)pool, size);
5354
return UMF_RESULT_SUCCESS;
5455
}
5556

56-
LOG_ERR("failed to insert tracker value, ret=%d, ptr=%p, size=%zu", ret,
57-
ptr, size);
57+
LOG_ERR("failed to insert tracker value, ret=%d, ptr=%p, pool=%p, size=%zu",
58+
ret, ptr, (void *)pool, size);
5859

5960
umf_ba_free(hTracker->tracker_allocator, value);
6061

@@ -330,6 +331,8 @@ static umf_result_t trackingAllocationMerge(void *hProvider, void *lowPtr,
330331

331332
err:
332333
utils_mutex_unlock(&provider->hTracker->splitMergeMutex);
334+
assert(0);
335+
333336
err_lock:
334337
umf_ba_free(provider->hTracker->tracker_allocator, mergedValue);
335338
return ret;

src/proxy_lib/proxy_lib.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ void proxy_lib_create_common(void) {
124124

125125
} else if (utils_env_var_has_str("UMF_PROXY",
126126
"page.disposition=shared-shm")) {
127-
LOG_DEBUG("proxy_lib: using the MAP_SHARED visibility mode with the "
128-
"named shared memory");
129127
os_params.visibility = UMF_MEM_MAP_SHARED;
130128

131129
memset(shm_name, 0, NAME_MAX);
@@ -145,9 +143,8 @@ void proxy_lib_create_common(void) {
145143
exit(-1);
146144
}
147145

148-
umf_result =
149-
umfPoolCreate(umfPoolManagerOps(), OS_memory_provider, NULL,
150-
UMF_POOL_CREATE_FLAG_DISABLE_TRACKING, &Proxy_pool);
146+
umf_result = umfPoolCreate(umfPoolManagerOps(), OS_memory_provider, NULL, 0,
147+
&Proxy_pool);
151148
if (umf_result != UMF_RESULT_SUCCESS) {
152149
LOG_ERR("creating UMF pool manager failed");
153150
exit(-1);

0 commit comments

Comments
 (0)