Skip to content

Commit 5f9428b

Browse files
committed
Add reference counter of users of TRACKER
Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 87ea9a2 commit 5f9428b

File tree

4 files changed

+33
-0
lines changed

4 files changed

+33
-0
lines changed

src/provider/provider_tracking.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,20 @@ static umf_result_t trackingInitialize(void *params, void **ret) {
158158

159159
*provider = *((umf_tracking_memory_provider_t *)params);
160160
*ret = provider;
161+
umfMemoryTrackerIncRef();
161162
return UMF_RESULT_SUCCESS;
162163
}
163164

164165
static void trackingFinalize(void *provider) {
165166
umf_tracking_memory_provider_t *p =
166167
(umf_tracking_memory_provider_t *)provider;
167168

169+
if (umfMemoryTrackerDecRef()) {
170+
// it is not the last user of the TRACKER
171+
free(provider);
172+
return;
173+
}
174+
168175
uintptr_t rkey;
169176
void *rvalue;
170177
size_t n_items = 0;

src/provider/provider_tracking.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ void umfTrackingMemoryProviderGetUpstreamProvider(
3939
umf_memory_provider_handle_t hTrackingProvider,
4040
umf_memory_provider_handle_t *hUpstream);
4141

42+
void umfMemoryTrackerIncRef(void);
43+
44+
// returns 0 only if n_ref_TRACKER==0 (at exit), !=0 otherwise
45+
int umfMemoryTrackerDecRef(void);
46+
4247
#ifdef __cplusplus
4348
}
4449
#endif

src/provider/provider_tracking_linux.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <stddef.h>
1414

1515
static critnib *TRACKER = NULL;
16+
static int n_ref_TRACKER = 0;
1617

1718
void __attribute__((constructor)) createLibTracker(void) {
1819
TRACKER = critnib_new();
@@ -28,3 +29,12 @@ void umfTrackingMemoryProviderInit(void) {
2829
umf_memory_tracker_handle_t umfMemoryTrackerGet(void) {
2930
return (umf_memory_tracker_handle_t)TRACKER;
3031
}
32+
33+
void umfMemoryTrackerIncRef(void) {
34+
__atomic_fetch_add(&n_ref_TRACKER, 1, __ATOMIC_SEQ_CST);
35+
}
36+
37+
// returns 0 only if n_ref_TRACKER==0 (at exit), !=0 otherwise
38+
int umfMemoryTrackerDecRef(void) {
39+
return (__atomic_fetch_sub(&n_ref_TRACKER, 1, __ATOMIC_SEQ_CST) != 1);
40+
}

src/provider/provider_tracking_windows.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
#include "provider_tracking.h"
1212

1313
#include <windows.h>
14+
#include <winnt.h>
1415

1516
static critnib *TRACKER = NULL;
17+
static long n_ref_TRACKER = 0;
1618

1719
#if defined(UMF_SHARED_LIBRARY)
1820
BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
@@ -47,3 +49,12 @@ void umfTrackingMemoryProviderInit(void) {
4749
umf_memory_tracker_handle_t umfMemoryTrackerGet(void) {
4850
return (umf_memory_tracker_handle_t)TRACKER;
4951
}
52+
53+
void umfMemoryTrackerIncRef(void) {
54+
InterlockedExchangeAdd((volatile long *)&n_ref_TRACKER, 1);
55+
}
56+
57+
// returns 0 only if n_ref_TRACKER==0 (at exit), !=0 otherwise
58+
int umfMemoryTrackerDecRef(void) {
59+
return (InterlockedExchangeAdd(&n_ref_TRACKER, -1) != 1);
60+
}

0 commit comments

Comments
 (0)