*** empty log message ***

svn path=/trunk/boinc/; revision=11826

checkin_notes

@@ -375,3 +375,13 @@ Charlie 9 Jan 2007
         ViewResources.cp
         common/
             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

client/app_control.C

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

client/cs_scheduler.C

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