diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2025-02-07 18:55:32 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2025-02-07 18:55:43 +0100 |
| commit | 997140f500c3e8ae61acdb5c81aaedfa39cc9332 (patch) | |
| tree | 6c6aea5f8d21b6b73d8e5138c39365307b607825 /src | |
| parent | 16f0adec6fa029699145f639e5bb3a7c0950ace4 (diff) | |
| download | box64-997140f500c3e8ae61acdb5c81aaedfa39cc9332.tar.gz box64-997140f500c3e8ae61acdb5c81aaedfa39cc9332.zip | |
[RCFILE] Fixed ROLLING_LOG when setup in a profile only
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/env.h | 3 | ||||
| -rw-r--r-- | src/tools/env.c | 16 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/include/env.h b/src/include/env.h index 8577e9d1..c6f3b39f 100644 --- a/src/include/env.h +++ b/src/include/env.h @@ -96,7 +96,7 @@ extern char* ftrace_name; STRING(BOX64_RCFILE, envfile) \ BOOLEAN(BOX64_RDTSC_1GHZ, rdtsc_1ghz, 0) \ BOOLEAN(BOX64_RESERVE_HIGH, reserve_high, 0) \ - BOOLEAN(BOX64_ROLLING_LOG, rolling_log, 0) \ + BOOLEAN(BOX64_ROLLING_LOG, cycle_log, 0) \ BOOLEAN(BOX64_SDL2_JGUID, sdl2_jguid, 0) \ BOOLEAN(BOX64_SHAEXT, shaext, 1) \ BOOLEAN(BOX64_SHOWBT, showbt, 0) \ @@ -186,6 +186,7 @@ typedef struct box64env_s { int maxcpu; int dynarec_test; int avx2; + int rolling_log; uintptr_t dynarec_test_start; uintptr_t dynarec_test_end; uintptr_t nodynarec_start; diff --git a/src/tools/env.c b/src/tools/env.c index 80b5543c..9fd54e0e 100644 --- a/src/tools/env.c +++ b/src/tools/env.c @@ -92,11 +92,17 @@ static void applyCustomRules() SET_BOX64ENV(dump, 1); } - if (BOX64ENV(rolling_log) == 1) { - SET_BOX64ENV(rolling_log, 16); - } - if (BOX64ENV(rolling_log) && BOX64ENV(log) > LOG_INFO) { - SET_BOX64ENV(rolling_log, 0); + if(box64env.is_cycle_log_overridden) { + freeCycleLog(my_context); + box64env.rolling_log = BOX64ENV(cycle_log); + + if (BOX64ENV(rolling_log) == 1) { + box64env.rolling_log = 16; + } + if (BOX64ENV(rolling_log) && BOX64ENV(log) > LOG_INFO) { + box64env.rolling_log = 0; + } + initCycleLog(my_context); } if (box64env.is_dynarec_test_str_overridden) { |