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

*** empty log message *** 

svn path=/trunk/boinc/; revision=11826
This commit is contained in:
David Anderson 2007-01-10 20:29:44 +00:00
parent dacd93bf8e
commit 61ed72da89
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -375,3 +375,13 @@ Charlie 9 Jan 2007
ViewResources.cp ViewResources.cp
common/ common/
wxPieCtrl.cpp,h wxPieCtrl.cpp,h
David 10 Jan 2007
- core client: fix problems when user aborts result
(mark it as CPU_SCHED_PREEMPTED so scheduler doesn't
try to preempt it; that confuses things)
- changed format of Deferring Comm messages
client/
app_control.C
cs_scheduler.C

2
client/app_control.C
View File

@ -559,6 +559,8 @@ bool ACTIVE_TASK_SET::check_rsc_limits_exceeded() {
int ACTIVE_TASK::abort_task(int exit_status, const char* msg) { int ACTIVE_TASK::abort_task(int exit_status, const char* msg) {
if (task_state == PROCESS_EXECUTING || task_state == PROCESS_SUSPENDED) { if (task_state == PROCESS_EXECUTING || task_state == PROCESS_SUSPENDED) {
task_state = PROCESS_ABORT_PENDING; task_state = PROCESS_ABORT_PENDING;
scheduler_state = CPU_SCHED_PREEMPTED;
// so scheduler doesn't try to preempt it
abort_time = gstate.now; abort_time = gstate.now;
request_abort(); request_abort();
} else { } else {

5
client/cs_scheduler.C
View File

@ -99,9 +99,10 @@ void PROJECT::set_min_rpc_time(double future_time, const char* reason) {
min_rpc_time = future_time; min_rpc_time = future_time;
possibly_backed_off = true; possibly_backed_off = true;
msg_printf(this, MSG_INFO, msg_printf(this, MSG_INFO,
"Deferring communication %s, because %s\n", "Deferring communication for %s",
timediff_format(min_rpc_time - gstate.now).c_str(), reason timediff_format(min_rpc_time - gstate.now).c_str()
); );
msg_printf(this, MSG_INFO, "Reason: %s\n", reason);
} }
} }