Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4291 from BOINC/RH_RPC_fix 

Client: fix app_config write from RPC
This commit is contained in:
Vitalii Koshura 2021-03-31 00:59:45 +02:00 committed by GitHub
parent 2996c9350e 8d8d4e0b8d
commit 5da2a58858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/gui_rpc_server_ops.cpp
View File

@ -1195,7 +1195,6 @@ static void handle_get_app_config(GUI_RPC_CONN& grc) {
return;
}
sprintf(path, "%s/%s", p->project_dir(), APP_CONFIG_FILE_NAME);
printf("path: %s\n", path);
int retval = read_file_string(path, s);
if (retval) {
grc.mfout.printf("<error>app_config.xml not found</error>\n");

40
lib/cc_config.cpp
View File

@ -864,19 +864,21 @@ int APP_CONFIGS::parse_file(FILE* f, MSG_VEC& mv, LOG_FLAGS& log_flags) {
void APP_CONFIGS::write(MIOFILE& out) {
out.printf(
" <app_config>\n"
"<app_config>\n"
);
for (unsigned int i=0; i<app_configs.size(); i++) {
APP_CONFIG& ac = app_configs[i];
out.printf(
" <app>\n"
" <name>%s</name>\n"
" <max_concurrent>%d</max_concurrent>\n"
" <gpu_gpu_usage>%f</gpu_gpu_usage>\n"
" <gpu_cpu_usage>%f</gpu_cpu_usage>\n"
" <fraction_done_exact>%d</fraction_done_exact>\n"
" <report_results_immediately>%d</report_results_immediately>\n"
" </app>\n",
" <app>\n"
" <name>%s</name>\n"
" <max_concurrent>%d</max_concurrent>\n"
" <gpu_versions>\n"
" <gpu_usage>%f</gpu_usage>\n"
" <cpu_usage>%f</cpu_usage>\n"
" </gpu_versions>\n"
" <fraction_done_exact>%d</fraction_done_exact>\n"
" <report_results_immediately>%d</report_results_immediately>\n"
" </app>\n",
ac.name,
ac.max_concurrent,
ac.gpu_gpu_usage,
@ -888,13 +890,13 @@ void APP_CONFIGS::write(MIOFILE& out) {
for (unsigned int i=0; i<app_version_configs.size(); i++) {
APP_VERSION_CONFIG& avc = app_version_configs[i];
out.printf(
" <app_version>\n"
" <app_name>%s</app_name>\n"
" <plan_class>%s</plan_class>\n"
" <cmdline>%s</cmdline>\n"
" <avg_ncpus>%f</avg_ncpus>\n"
" <ngpus>%f</ngpus>\n"
" </app_version>\n",
" <app_version>\n"
" <app_name>%s</app_name>\n"
" <plan_class>%s</plan_class>\n"
" <cmdline>%s</cmdline>\n"
" <avg_ncpus>%f</avg_ncpus>\n"
" <ngpus>%f</ngpus>\n"
" </app_version>\n",
avc.app_name,
avc.plan_class,
avc.cmdline,
@ -903,9 +905,9 @@ void APP_CONFIGS::write(MIOFILE& out) {
);
}
out.printf(
" <project_max_concurrent>%d</project_max_concurrent>\n"
" <report_results_immediately>%d</report_results_immediately>\n"
" </app_config>\n",
" <project_max_concurrent>%d</project_max_concurrent>\n"
" <report_results_immediately>%d</report_results_immediately>\n"
"</app_config>\n",
project_max_concurrent,
report_results_immediately?1:0
);