Skip to content

Adapt to lib-musl and the new threading interface #12

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

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

Adapt to lib-musl and the new threading interface #12

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
907fc5c
Config.uk: change dependency; glue.c: adapt to new threading interface
huyang531 Jun 15, 2024
90cfb4c
mimaloc*.h: include stddef.h to silence compiler errors
huyang531 Jun 16, 2024
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
3 changes: 1 addition & 2 deletions Config.uk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ menuconfig LIBMIMALLOC
bool "mimalloc: a compact general purpose allocator with excellent performance"
default n
select LIBUKSCHED
select LIBNEWLIBC
select LIBMUSL
select LIBPOSIX_SYSINFO
select LIBPTHREAD_EMBEDDED
select LIBUKALLOCREGION
if LIBMIMALLOC
config MIMALLOC_DEBUG
Expand Down
4 changes: 2 additions & 2 deletions glue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
* 4. Transition EBT allocator -> Mimalloc:
* We transition as soon as the TLS has been allocated and the %fs register
* set. This is checked at every EBT allocation by inspecting
* uk_thread_current()->prv which typically points to the thread local
* uk_thread_current()->priv which typically points to the thread local
* storage. Since memory allocations might happen during Mimalloc's
* initialization itself (e.g. calls to malloc() by pthread) the early boot
* time allocator continues to satisfy requests until Mimalloc is ready
Expand All @@ -88,7 +88,7 @@ static inline int _tls_ready(void)
/* Is the thread local storage ready? */
struct uk_thread *current = uk_thread_current();

return current && current->prv != NULL;
return current && current->priv != NULL;
}

/* boot-time malloc interface */
Expand Down
1 change: 1 addition & 0 deletions include/uk/mimalloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#define __LIBMIMALLOC_H__

#include <uk/alloc.h>
#include <stddef.h>

#ifdef __cplusplus
extern "C" {
Expand Down
1 change: 1 addition & 0 deletions include/uk/mimalloc_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#define __LIBMIMALLOC_IMPL_H__

#include <uk/alloc.h>
#include <stddef.h>

#ifdef __cplusplus
extern "C" {
Expand Down