From c669422dbbd0bb3949ecd968eb558350507170fa Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sun, 9 Nov 2003 23:45:31 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=2653
---
 api/graphics_api.C    |  2 --
 apps/upper_case.C     | 10 ++++++++--
 checkin_notes         | 21 +++++++++++++++++++++
 client/client_state.C |  8 +++++---
 client/cs_scheduler.C |  1 +
 client/scheduler_op.C |  2 +-
 lib/filesys.C         |  2 +-
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/api/graphics_api.C b/api/graphics_api.C
index bc343ec2f4..90d866712f 100755
--- a/api/graphics_api.C
+++ b/api/graphics_api.C
@@ -20,8 +20,6 @@
 // The part of the BOINC app lib having to do with graphics.
 // This code is NOT linked into the core client.
 
-#include "config.h"
-
 #ifdef _WIN32
 #include <afxwin.h>
 extern DWORD WINAPI win_graphics_event_loop( LPVOID duff );
diff --git a/apps/upper_case.C b/apps/upper_case.C
index 0e2290ce43..68755573f8 100755
--- a/apps/upper_case.C
+++ b/apps/upper_case.C
@@ -132,6 +132,12 @@ int main(int argc, char **argv) {
     retval = boinc_init(standalone);
     if (retval) exit(retval);
 
+    // can't write to stderr until after boinc_init()
+    //
+    for (i=0; i<argc; i++) {
+        fprintf(stderr, "APP: upper_case: argv[%d] is %s\n", i, argv[i]);
+    }
+
 #ifdef BOINC_APP_GRAPHICS
     strcpy(display_buf, "(none)\0");
     retval = boinc_init_opengl();
@@ -187,7 +193,7 @@ int main(int argc, char **argv) {
         if (cpu_time) {
             n = 0;
             j = 3.14159;
-            for (i=0; i<200000; i++) {
+            for(i=0; i<20000000; i++) {
                 n++;
                 j *= n+j-3.14159;
                 j /= (float)n;
@@ -206,7 +212,7 @@ int main(int argc, char **argv) {
         }
 #endif
         if (random_exit) {
-            if ((random()%20) == 0) {
+            if (drand() < 0.05) {
                 exit(-10);
             }
         }
diff --git a/checkin_notes b/checkin_notes
index 7c801c586c..648ee2fd4f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7622,3 +7622,24 @@ Karl 2003-11-07
 
     client/win
         wingui_mainwindow.cpp
+
+David  9 Nov 2003
+	- change upper_case app so that -cpu_time actually uses
+		significant CPU time (36 secs on my laptop)
+	- core state file writes sometimes fail if another app (e.g. text editor)
+		has the file open.  Show error code.
+	- don't start a scheduler RPC if we're suspended
+	- don't show parse error messages for empty lines in scheduler reply
+	- if reset a project during a scheduler RPC, set the scheduler_op state
+		to IDLE (else will never do another RPC)
+
+	api/
+		graphics_api.C
+	apps/
+		upper_case.C
+	client/
+		client_state.C
+		cs_scheduler.C
+		scheduler_op.C
+	lib/
+		filesys.C
diff --git a/client/client_state.C b/client/client_state.C
index 487c2abd4b..55da8b128a 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -298,7 +298,7 @@ int CLIENT_STATE::net_sleep(double x) {
 // (in which case should call this again immediately)
 //
 bool CLIENT_STATE::do_something() {
-    int actions = 0, reason;
+    int actions = 0, reason, retval;
     ScopeMessages scope_messages(log_messages, ClientMessages::DEBUG_POLL);
 
     check_suspend_activities(reason);
@@ -347,8 +347,9 @@ bool CLIENT_STATE::do_something() {
         POLL_ACTION(update_results         , update_results         );
     }
 
-    if (write_state_file_if_needed()) {
-        msg_printf(NULL, MSG_ERROR, "Couldn't write state file");
+    retval = write_state_file_if_needed();
+    if (retval) {
+        msg_printf(NULL, MSG_ERROR, "Couldn't write state file: %d", retval);
     }
     --log_messages;
     scope_messages.printf(
@@ -988,6 +989,7 @@ int CLIENT_STATE::reset_project(PROJECT* project) {
         && scheduler_op->project == project
     ) {
         http_ops->remove(&scheduler_op->http_op);
+        scheduler_op->state = SCHEDULER_OP_STATE_IDLE;
     }
 
     // mark results as server-acked.
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 7ff242924d..03762a4782 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -342,6 +342,7 @@ bool CLIENT_STATE::scheduler_rpc_poll() {
 
     switch(scheduler_op->state) {
     case SCHEDULER_OP_STATE_IDLE:
+        if (activities_suspended) break;
         if (exit_when_idle && contacted_sched_server) {
             should_get_work = false;
         } else {
diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index 32f0bcf8a9..1280b597cf 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -646,7 +646,7 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
         } else if (parse_str(buf, "<message", message, sizeof(message))) {
             parse_attr(buf, "priority", message_priority, sizeof(message_priority));
             continue;
-        } else {
+        } else if (strlen(buf)>1){
             msg_printf(project, MSG_ERROR, "SCHEDULER_REPLY::parse(): unrecognized %s\n", buf);
         }
     }
diff --git a/lib/filesys.C b/lib/filesys.C
index 5f6fc5cd86..657ecfde1a 100755
--- a/lib/filesys.C
+++ b/lib/filesys.C
@@ -77,7 +77,7 @@ int is_file(char* path) {
     return sbuf.st_mode & S_IFREG;
 }
 
-int is_dir(char* path) {
+int is_dir(const char* path) {
     struct stat sbuf;
     memset(&sbuf, 0, sizeof(struct stat));
     stat(path, &sbuf);