From e8d8a28e63228ace7d169c9627a9ff552e4bc0ee Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 11 Jun 2007 21:56:56 +0000
Subject: [PATCH] - client: enforce_schedule(): if try to preempt a     process
 that's not running, at least mark it as preempted.     (this should never
 happen in principle) - API: compile fix for Mac

api/
    graphics2_unix.C
client/
    cpu_sched.C

svn path=/trunk/boinc/; revision=12895
---
 api/graphics2_unix.C |  5 +++++
 checkin_notes        | 11 +++++++++++
 client/cpu_sched.C   |  3 ++-
 doc/links.php        |  2 ++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/api/graphics2_unix.C b/api/graphics2_unix.C
index 5c9d1b144e..d7eeae129e 100644
--- a/api/graphics2_unix.C
+++ b/api/graphics2_unix.C
@@ -22,6 +22,11 @@ static int win_width = 600, win_height = 400;
 static int clicked_button;
 static int win=0;
 
+#ifdef __APPLE__
+extern void CloseWindow();
+static bool need_show = false;
+#endif
+
 bool fullscreen;
 
 static void close_window() {
diff --git a/checkin_notes b/checkin_notes
index 41a28cf88c..c41a669059 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6074,3 +6074,14 @@ David  11 June 2007
 		log_flags.C
 	lib/
 		parse.C,h
+
+David  11 June 2007
+    - client: enforce_schedule(): if try to preempt a
+        process that's not running, at least mark it as preempted.
+        (this should never happen in principle)
+    - API: compile fix for Mac
+
+    api/
+        graphics2_unix.C
+    client/
+        cpu_sched.C
diff --git a/client/cpu_sched.C b/client/cpu_sched.C
index bd65c6bf2c..e647aedbfb 100644
--- a/client/cpu_sched.C
+++ b/client/cpu_sched.C
@@ -889,9 +889,9 @@ bool CLIENT_STATE::enforce_schedule() {
                     preempt_by_quit = true;
                 }
                 atp->preempt(preempt_by_quit);
-                atp->scheduler_state = CPU_SCHED_PREEMPTED;
                 break;
             }
+            atp->scheduler_state = CPU_SCHED_PREEMPTED;
             break;
         case CPU_SCHED_SCHEDULED:
             switch (atp->task_state()) {
@@ -913,6 +913,7 @@ bool CLIENT_STATE::enforce_schedule() {
             }
             atp->scheduler_state = CPU_SCHED_SCHEDULED;
             swap_left -= atp->procinfo.swap_size;
+            break;
         }
     }
     if (action) {
diff --git a/doc/links.php b/doc/links.php
index d9000799a0..43a8213b5c 100644
--- a/doc/links.php
+++ b/doc/links.php
@@ -159,6 +159,7 @@ language("Chinese", array(
     site("http://boinc.equn.com/", "boinc.equn.com")
 ));
 language("Czech", array(
+    site("http://www.czechnationalteam.cz/", "Czech National Team"),
     site("http://www.boincteamcz.net/", "BOINC Team CZ"),
     site("http://www.boinc.cz/", "www.boinc.cz")
 ));
@@ -214,6 +215,7 @@ language("French", array(
     site("http://boinc-quebec.org", "boinc-quebec.org")
 ));
 language("German", array(
+    site("http://www.boinc-gemeinschaft.de/", "BOINC Gemeinschaft"),
     site("http://www.swissteam.net/", "SwissTeam.net"),
     site("http://www.unitedmacs.com/", "United Macs"),
     site("http://www.rechenkraft.net/", "Rechenkraft"),