From cc62cce8f73423fd8ebf307bfd739c04267a9b13 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 2 Jun 2009 05:12:06 +0000
Subject: [PATCH] - client: if scheduler request didn't request work, don't
 report 0 tasks - scheduler: fix crash if anonymous platform

svn path=/trunk/boinc/; revision=18259
---
 checkin_notes           |  9 +++++++++
 client/cs_scheduler.cpp | 10 ++++++----
 doc/addon_data.php      | 10 ++++++++++
 doc/boinc_news.php      |  4 ++++
 sched/sched_send.cpp    |  2 +-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index df7bbf50ee..9a3d6b5a59 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4908,3 +4908,12 @@ David  1 June 2009
 
 	py/Boinc/
 		boinc_db.py
+
+David  1 June 2009
+    - client: if scheduler request didn't request work, don't report 0 tasks
+    - scheduler: fix crash if anonymous platform
+
+    client/
+        cs_scheduler.cpp
+    sched/
+        sched_send.cpp
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index 9eaf4f23c4..b879bc3b05 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -450,10 +450,12 @@ int CLIENT_STATE::handle_scheduler_reply(PROJECT* project, char* scheduler_url)
     if (retval) return retval;
 
     if (log_flags.sched_ops) {
-        msg_printf(project, MSG_INFO,
-            "Scheduler request completed: got %d new tasks",
-            (int)sr.results.size()
-        );
+        if (cpu_work_fetch.req_secs || cuda_work_fetch.req_secs) {
+            sprintf(buf, ": got %d new tasks", (int)sr.results.size());
+        } else {
+            strcpy(buf, "");
+        }
+        msg_printf(project, MSG_INFO, "Scheduler request completed%s", buf);
     }
     if (log_flags.sched_op_debug) {
         if (sr.scheduler_version) {
diff --git a/doc/addon_data.php b/doc/addon_data.php
index 785566c0e7..3506c9ce21 100644
--- a/doc/addon_data.php
+++ b/doc/addon_data.php
@@ -374,6 +374,16 @@ array('rc.boinc-slackware-linux-latest.txt',
 );
 
 $mac = array(
+array(
+    'http://brotherbard.com/boinc/',
+    'BOINCMenubar 2',
+    '0.1.11 beta',
+    'Mac GUI for BOINC',
+    'http://brotherbard.com/boinc/',
+    'Mac OS X 10.5 or later',
+    'BOINCMenubar 2 is a status menu item that lives on the right side of your menu bar. When you open the menu you get a quick overview of which projects have tasks running as well as other information about the projects that you set up yourself.  The BOINCMenubar menu also has items for controlling BOINC running on the host computer and for controlling projects that are attached to that computer.  There is a preference panel for setting up BOINCMenubar, for setting up all the preferences for the BOINC application itself and for attaching to and detaching from projects and account managers.',
+    1243918675
+),
 array(
     'http://michaelsprogramming.home.dyndns.org/',
     'BOINC Statistics',
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index 5347d9c4dd..751c2d8057 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,10 @@
 <?
 
 $project_news = array(
+array("June 1, 2009",
+    "Mac users: check out <a href=\"http://boinc.berkeley.edu/addon_item.php?platform=mac&item=http%3A%2F%2Fbrotherbard.com%2Fboinc%2F\">BOINCMenubar 2</a>,
+    an alternative to the BOINC Manager for Mac OS X."
+),
 array("May 17, 2009",
     "Check out <a href=\"http://365daysofastronomy.org/2009/05/17/may-17th-citizen-scientists-making-a-difference-and-having-fun/\">Citizen Scientists</a>,
     a podcast by the 365 Days of Astronomy project."
diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp
index 828b2efdae..c8f1fc8bb1 100644
--- a/sched/sched_send.cpp
+++ b/sched/sched_send.cpp
@@ -1004,7 +1004,7 @@ int add_result_to_reply(
     update_estimated_delay(*bavp, est_dur);
     g_wreq->njobs_sent++;
     g_wreq->njobs_on_host++;
-    if (app_plan_uses_gpu(bavp->avp->plan_class)) {
+    if (bavp->host_usage.ncudas > 0) {
         g_wreq->njobs_on_host_gpu++;
     } else {
         g_wreq->njobs_on_host_cpu++;