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

Client: tweaks to last commit

This commit is contained in:
David Anderson 2014-04-02 01:49:00 -07:00
parent b1a6fa39fc
commit 1193a874ed
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/app_control.cpp
View File

@ -853,9 +853,11 @@ bool ACTIVE_TASK_SET::check_rsc_limits_exceeded() {
did_anything = true;
continue;
}
if (do_disk_check && atp->check_max_disk_exceeded()) {
did_anything = true;
continue;
if (do_disk_check || atp->peak_disk_usage == 0) {
if (atp->check_max_disk_exceeded()) {
did_anything = true;
continue;
}
}
// don't count RAM usage of non-CPU-intensive jobs
@ -1498,9 +1500,9 @@ void ACTIVE_TASK::write_task_state_file() {
" <checkpoint_cpu_time>%f</checkpoint_cpu_time>\n"
" <checkpoint_elapsed_time>%f</checkpoint_elapsed_time>\n"
" <fraction_done>%f</fraction_done>\n"
" <peak_working_set_size>%f</peak_working_set_size>\n"
" <peak_swap_size>%f</peak_swap_size>\n"
" <peak_disk_usage>%f</peak_disk_usage>\n"
" <peak_working_set_size>%.0f</peak_working_set_size>\n"
" <peak_swap_size>%.0f</peak_swap_size>\n"
" <peak_disk_usage>%.0f</peak_disk_usage>\n"
"</active_task>\n",
result->project->master_url,
result->name,

6
client/result.cpp
View File

@ -211,9 +211,9 @@ int RESULT::write(MIOFILE& out, bool to_server) {
if (to_server) {
out.printf(
" <app_version_num>%d</app_version_num>\n"
" <final_peak_working_set_size>%f</final_peak_working_set_size>\n"
" <final_peak_swap_size>%f</final_peak_swap_size>\n"
" <final_peak_disk_usage>%f</final_peak_disk_usage>\n",
" <final_peak_working_set_size>%.0f</final_peak_working_set_size>\n"
" <final_peak_swap_size>%.0f</final_peak_swap_size>\n"
" <final_peak_disk_usage>%.0f</final_peak_disk_usage>\n",
wup->version_num,
final_peak_working_set_size,
final_peak_swap_size,