Skip to content

[ENV] Fixed race condition of init/uninit of rolling logs #3289

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
ptitSeb merged 1 commit into from
Dec 19, 2025
Merged

[ENV] Fixed race condition of init/uninit of rolling logs #3289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/box64context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,25 @@ static void atfork_child_box64context(void)
init_mutexes(my_context);
}

int box64_cycle_log_initialized = 0;

void freeCycleLog(box64context_t* ctx)
{
if(BOX64ENV(rolling_log)) {
if (BOX64ENV(rolling_log) && box64_cycle_log_initialized) {
box_free(ctx->log_call);
box_free(ctx->log_ret);
ctx->log_call = NULL;
ctx->log_ret = NULL;
box64_cycle_log_initialized = 0;
}
}

void initCycleLog(box64context_t* context)
{
if(context && BOX64ENV(rolling_log)) {
context->log_call = (char*)box_calloc(BOX64ENV(rolling_log), 256*sizeof(char));
context->log_ret = (char*)box_calloc(BOX64ENV(rolling_log), 128*sizeof(char));
box64_cycle_log_initialized = 1;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/tools/env.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ static void parseRange(const char* s, uintptr_t* start, uintptr_t* end)
void AddNewLibs(const char* list);
int canNCpuBeChanged();

extern int box64_cycle_log_initialized;

static void applyCustomRules()
{
if (BOX64ENV(log) == LOG_NEVER) {
Expand All @@ -152,8 +154,7 @@ static void applyCustomRules()
}

#ifndef _WIN32
if(box64env.is_cycle_log_overridden) {
freeCycleLog(my_context);
if (box64env.is_cycle_log_overridden) {
box64env.rolling_log = BOX64ENV(cycle_log);

if (BOX64ENV(rolling_log) == 1) {
Expand All @@ -162,7 +163,7 @@ static void applyCustomRules()
if (BOX64ENV(rolling_log) && BOX64ENV(log) > LOG_INFO) {
box64env.rolling_log = 0;
}
initCycleLog(my_context);
if (!box64_cycle_log_initialized) initCycleLog(my_context);
}

if (box64env.is_dynarec_gdbjit_str_overridden) {
Expand Down
Loading