diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2023-12-23 09:34:11 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2023-12-23 09:34:11 +0100 |
| commit | c774cb0c27b4d0dc35b53aba774bf8a332b96aea (patch) | |
| tree | d41f74956be4b1aa9a63524b111eefb56a576582 /src/tools | |
| parent | 8ff9427a04c4c2e5aea2439e75a03eb1de07f58c (diff) | |
| download | box64-c774cb0c27b4d0dc35b53aba774bf8a332b96aea.tar.gz box64-c774cb0c27b4d0dc35b53aba774bf8a332b96aea.zip | |
[RCFILE] Made so that BOX64_MAXCPU is the minimum value if set both on command line and a/many profile
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/rcfile.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/rcfile.c b/src/tools/rcfile.c index 39fba1df..13e50b09 100644 --- a/src/tools/rcfile.c +++ b/src/tools/rcfile.c @@ -109,7 +109,7 @@ ENTRYBOOL(BOX64_EXIT, want_exit) \ ENTRYBOOL(BOX64_LIBCEF, box64_libcef) \ ENTRYBOOL(BOX64_SDL2_JGUID, box64_sdl2_jguid) \ ENTRYINT(BOX64_MALLOC_HACK, box64_malloc_hack, 0, 2, 2) \ -ENTRYINTPOS(BOX64_MAXCPU, box64_maxcpu) \ +ENTRYINTPOS(BOX64_MAXCPU, new_maxcpu) \ ENTRYSTRING_(BOX64_ENV, new_env) \ #ifdef HAVE_TRACE @@ -470,6 +470,7 @@ void ApplyParams(const char* name) return; static char old_name[256] = ""; int new_cycle_log = cycle_log; + int new_maxcpu = box64_maxcpu; if(!strcmp(name, old_name)) { return; } @@ -517,6 +518,10 @@ void ApplyParams(const char* name) cycle_log = new_cycle_log; initCycleLog(my_context); } + if(new_maxcpu!=box64_maxcpu && box64_maxcpu && box64_maxcpu<new_maxcpu) { + printf_log(LOG_INFO, "Not applying BOX64_MAXCPU=%d because a lesser value is already active: %d\n", new_maxcpu, box64_maxcpu); + } else + box64_maxcpu = new_maxcpu; if(param->is_ld_library_path_present) AppendList(&my_context->box64_ld_lib, param->ld_library_path, 1); if(param->is_box64_path_present) AppendList(&my_context->box64_path, param->box64_path, 1); if(param->is_trace_file_present) { |