Skip to content

Commit

Permalink
LibC: Remove the initialization workaround from s_allocation_enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
timschumi authored and awesomekling committed Jul 20, 2022
1 parent 3f59cb5 commit 7c824b8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
10 changes: 1 addition & 9 deletions Userland/Libraries/LibC/malloc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,7 @@ enum class CallerWillInitializeMemory {
};

#ifndef NO_TLS
// HACK: This is a __thread - marked thread-local variable. If we initialize it globally here, VERY weird errors happen.
// The initialization happens in __malloc_init() and pthread_create_helper().
__thread bool s_allocation_enabled;
__thread bool s_allocation_enabled = true;
#endif

static ErrorOr<void*> malloc_impl(size_t size, size_t align, CallerWillInitializeMemory caller_will_initialize_memory)
Expand Down Expand Up @@ -697,12 +695,6 @@ void* realloc(void* ptr, size_t size)

void __malloc_init()
{
#ifndef NO_TLS
// HACK: This is a __thread - marked thread-local variable. If we initialize it globally, VERY weird errors happen.
// Therefore, we need to do the initialization here and in pthread_create_helper().
s_allocation_enabled = true;
#endif

s_in_userspace_emulator = (int)syscall(SC_emuctl, 0) != -ENOSYS;
if (s_in_userspace_emulator) {
// Don't bother scrubbing memory if we're running in UE since it
Expand Down
3 changes: 0 additions & 3 deletions Userland/Libraries/LibC/pthread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ extern "C" {

static void* pthread_create_helper(void* (*routine)(void*), void* argument, void* stack_location, size_t stack_size)
{
// HACK: This is a __thread - marked thread-local variable. If we initialize it globally, VERY weird errors happen.
// Therefore, we need to do the initialization here and in __malloc_init().
s_allocation_enabled = true;
s_stack_location = stack_location;
s_stack_size = stack_size;
void* ret_val = routine(argument);
Expand Down

0 comments on commit 7c824b8

Please sign in to comment.