Skip to content

Guard buddy_tree_buddy with BUDDY_EXPERIMENTAL_CHANGE_TRACKING #135

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.

Sign up for GitHub

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
spaskalev merged 2 commits into from
Feb 21, 2025
Merged

Guard buddy_tree_buddy with BUDDY_EXPERIMENTAL_CHANGE_TRACKING #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b23277
Guard buddy_tree_buddy with BUDDY_EXPERIMENTAL_CHANGE_TRACKING
spaskalev Feb 21, 2025
be03688
Update tests.c to support the change tracking feature
spaskalev Feb 21, 2025
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
4 changes: 4 additions & 0 deletions buddy_alloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,10 @@ static bool buddy_tree_can_shrink(struct buddy_tree *t);
* Integration functions
*/

#ifdef BUDDY_EXPERIMENTAL_CHANGE_TRACKING
/* Get a pointer to the parent buddy struct */
static struct buddy* buddy_tree_buddy(struct buddy_tree* t);
#endif /* BUDDY_EXPERIMENTAL_CHANGE_TRACKING */

/*
* Debug functions
Expand Down Expand Up @@ -1851,9 +1853,11 @@ static bool buddy_tree_can_shrink(struct buddy_tree *t) {
return true;
}

#ifdef BUDDY_EXPERIMENTAL_CHANGE_TRACKING
static struct buddy* buddy_tree_buddy(struct buddy_tree* t) {
return (struct buddy*)(((unsigned char*)t) - sizeof(struct buddy));
}
#endif /* BUDDY_EXPERIMENTAL_CHANGE_TRACKING */

static void buddy_tree_debug(struct buddy_tree *t, struct buddy_tree_pos pos,
size_t start_size) {
Expand Down
13 changes: 4 additions & 9 deletions tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include <stdlib.h>
#include <string.h>

#define BUDDY_EXPERIMENTAL_CHANGE_TRACKING

#define BUDDY_ALLOC_IMPLEMENTATION
#include "buddy_alloc.h"
#undef BUDDY_ALLOC_IMPLEMENTATION
Expand Down Expand Up @@ -1894,15 +1896,14 @@ void test_buddy_invalid_slot_alignment(void) {
assert(buddy_embed_alignment(arena, 4096, 3) == NULL);
}

#ifdef BUDDY_EXPERIMENTAL_CHANGE_TRACKING
struct buddy_change_tracker_context {
size_t total_length;
size_t total_calls;
};

void buddy_change_tracker_cb(void* context, unsigned char* addr, size_t length) {
struct buddy_change_tracker_context *tracker_context = (struct buddy_change_tracker_context *) context;
tracker_context->total_length += length;
(void) addr;
(void) length;
tracker_context->total_calls++;
}

Expand All @@ -1913,18 +1914,12 @@ void test_buddy_change_tracking() {
void *slot;
START_TEST;
buddy_enable_change_tracking(buddy, &context, buddy_change_tracker_cb);
assert(context.total_length == 0);
assert(context.total_calls == 0);
slot = buddy_malloc(buddy, 512);
assert(context.total_length == 2);
assert(context.total_calls == 2);
buddy_free(buddy, slot);
assert(context.total_length == 4);
assert(context.total_calls == 4);
}
#else
#define test_buddy_change_tracking()
#endif /* BUDDY_EXPERIMENTAL_CHANGE_TRACKING */

void test_buddy_tree_init(void) {
unsigned char buddy_tree_buf[4096];
Expand Down
Loading