RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:27:45 +00:00
Code Issues Activity Actions

DynamicLoader: Call libc's exit when exitting, to flush standard streams

Browse source
This commit is contained in:
Sahan Fernando 2020-12-24 23:06:59 +11:00 • committed by Andreas Kling
parent 12f214e2f0
commit bcecd2fa2f
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/DynamicLoader/main.cpp
View file

@ -61,9 +61,13 @@ char* __static_environ[] = { nullptr }; // We don't get the environment without
static HashMap<String, NonnullRefPtr<ELF::DynamicLoader>> g_loaders; static HashMap<String, NonnullRefPtr<ELF::DynamicLoader>> g_loaders;
static HashMap<String, NonnullRefPtr<ELF::DynamicObject>> g_loaded_objects; static HashMap<String, NonnullRefPtr<ELF::DynamicObject>> g_loaded_objects;
using MainFunction = int (*)(int, char**, char**);
using LibCExitFunction = void (*)(int);
static size_t g_current_tls_offset = 0; static size_t g_current_tls_offset = 0;
static size_t g_total_tls_size = 0; static size_t g_total_tls_size = 0;
static char** g_envp = nullptr; static char** g_envp = nullptr;
static LibCExitFunction g_libc_exit = nullptr;
static void init_libc() static void init_libc()
{ {
@ -208,6 +212,10 @@ static void initialize_libc()
ASSERT(res.found); ASSERT(res.found);
*((bool*)res.address) = false; *((bool*)res.address) = false;
res = global_symbol_lookup("exit");
ASSERT(res.found);
g_libc_exit = (LibCExitFunction)res.address;
res = global_symbol_lookup("__libc_init"); res = global_symbol_lookup("__libc_init");
ASSERT(res.found); ASSERT(res.found);
typedef void libc_init_func(); typedef void libc_init_func();
@ -262,7 +270,7 @@ static FlatPtr loader_main(auxv_t* auxvp)
VERBOSE("loaded all dependencies"); VERBOSE("loaded all dependencies");
for ([[maybe_unused]] auto& lib : g_loaders) { for ([[maybe_unused]] auto& lib : g_loaders) {
VERBOSE("%s - tls size: $u, tls offset: %u", lib.key.characters(), lib.value->tls_size(), lib.value->tls_offset()); VERBOSE("%s - tls size: %u, tls offset: %u", lib.key.characters(), lib.value->tls_size(), lib.value->tls_offset());
} }
allocate_tls(); allocate_tls();
@ -284,8 +292,6 @@ extern "C" {
// The compiler expects a previous declaration // The compiler expects a previous declaration
void _start(int, char**, char**); void _start(int, char**, char**);
using MainFunction = int (*)(int, char**, char**);
void _start(int argc, char** argv, char** envp) void _start(int argc, char** argv, char** envp)
{ {
g_envp = envp; g_envp = envp;
@ -307,6 +313,10 @@ void _start(int argc, char** argv, char** envp)
VERBOSE("jumping to main program entry point: %p", main_function); VERBOSE("jumping to main program entry point: %p", main_function);
int rc = main_function(argc, argv, envp); int rc = main_function(argc, argv, envp);
VERBOSE("rc: %d", rc); VERBOSE("rc: %d", rc);
_exit(rc); if (g_libc_exit != nullptr) {
g_libc_exit(rc);
} else {
_exit(rc);
}
} }
} }