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

- client: restore <slot> element on GUI RPC result XML 

(needed by BOINCSpy)
- client: CPU sched fix

svn path=/trunk/boinc/; revision=13584
This commit is contained in:
David Anderson 2007-09-13 06:53:40 +00:00
parent 61b93d6ea8
commit 3838d16750
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -8450,3 +8450,12 @@ David 12 Sept 2007
BOINCTaskBar.cpp BOINCTaskBar.cpp
lib/ lib/
str_util.C str_util.C
David 13 Sept 2007
- client: restore <slot> element on GUI RPC result XML
(needed by BOINCSpy)
- client: CPU sched fix
client/
app.C
cpu_sched.C

2
client/app.C
View File

@ -462,6 +462,7 @@ int ACTIVE_TASK::write_gui(MIOFILE& fout) {
"<active_task>\n" "<active_task>\n"
" <active_task_state>%d</active_task_state>\n" " <active_task_state>%d</active_task_state>\n"
" <app_version_num>%d</app_version_num>\n" " <app_version_num>%d</app_version_num>\n"
" <slot>%d</slot>\n"
" <scheduler_state>%d</scheduler_state>\n" " <scheduler_state>%d</scheduler_state>\n"
" <checkpoint_cpu_time>%f</checkpoint_cpu_time>\n" " <checkpoint_cpu_time>%f</checkpoint_cpu_time>\n"
" <fraction_done>%f</fraction_done>\n" " <fraction_done>%f</fraction_done>\n"
@ -474,6 +475,7 @@ int ACTIVE_TASK::write_gui(MIOFILE& fout) {
"%s", "%s",
task_state(), task_state(),
app_version->version_num, app_version->version_num,
slot,
scheduler_state, scheduler_state,
checkpoint_cpu_time, checkpoint_cpu_time,
fraction_done, fraction_done,

9
client/cpu_sched.C
View File

@ -211,11 +211,14 @@ RESULT* CLIENT_STATE::earliest_deadline_result() {
if (!best_result || rp->report_deadline<best_result->report_deadline) { if (!best_result || rp->report_deadline<best_result->report_deadline) {
best_result = rp; best_result = rp;
best_atp = atp; best_atp = atp;
continue;
}
if (rp->report_deadline > best_result->report_deadline) {
continue;
} }
if (rp->report_deadline > best_result->report_deadline) continue;
// If there's a tie, pick the one with the least remaining CPU time // If there's a tie, pick the job with the least remaining CPU time
// (but don't pick an unstarted job in preference to one that's started) // (but don't pick an unstarted job over one that's started)
// //
if (best_atp && !atp) continue; if (best_atp && !atp) continue;
if (rp->estimated_cpu_time_remaining(false) if (rp->estimated_cpu_time_remaining(false)