Skip to content

Replace linear base allocator with the global one in tracking provider #243

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.

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

Merged
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions src/provider/provider_tracking.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/

#include "provider_tracking.h"
#include "base_alloc_global.h"
#include "critnib.h"
#include "utils_concurrency.h"

Expand Down Expand Up @@ -325,11 +326,9 @@ static umf_result_t trackingFree(void *hProvider, void *ptr, size_t size) {
}

static umf_result_t trackingInitialize(void *params, void **ret) {
umf_tracking_memory_provider_t *p =
(umf_tracking_memory_provider_t *)params;
umf_tracking_memory_provider_t *provider =
(umf_tracking_memory_provider_t *)umf_ba_linear_alloc(
p->hTracker->pool_linear, sizeof(umf_tracking_memory_provider_t));
(umf_tracking_memory_provider_t *)umf_ba_global_alloc(
sizeof(umf_tracking_memory_provider_t));
if (!provider) {
return UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
}
Expand Down Expand Up @@ -381,10 +380,7 @@ static void trackingFinalize(void *provider) {
check_if_tracker_is_empty(p->hTracker, p->pool);
#endif /* NDEBUG */

(void)provider; // unused in Release build
// provider was allocated from the linear allocator,
// so it will be freed, when the linear allocator is destroyed
// in umfMemoryTrackerDestroy()
umf_ba_global_free(provider, sizeof(umf_tracking_memory_provider_t));
}

static void trackingGetLastError(void *provider, const char **msg,
Expand Down