diff --git a/checkin_notes b/checkin_notes index 2ffeaf7f17..d4122c47cb 100755 --- a/checkin_notes +++ b/checkin_notes @@ -17862,3 +17862,12 @@ Jeff 28 Sep 2004 sched/ feeder.C + +David 29 Sept 2004 + - handle GUI RPCs even if we're running benchmarks + - report PROJECT::suspended_via_gui in RPC reply + + client/ + client_state.C + client_types.C + gui_rpc_server.C diff --git a/client/client_state.C b/client/client_state.C index 082b234db1..f347639c21 100644 --- a/client/client_state.C +++ b/client/client_state.C @@ -361,7 +361,7 @@ bool CLIENT_STATE::do_something() { previous_activities_suspended = activities_suspended; activities_suspended = (reason != 0); - // if we're doing CPU benchmarks, don't do anything else + // if we're doing CPU benchmarks, don't do much else // if (reason & SUSPEND_REASON_BENCHMARKS) { // wait for applications to become suspended @@ -371,7 +371,7 @@ bool CLIENT_STATE::do_something() { } else { cpu_benchmarks_poll(); } - return false; + return gui_rpcs.poll(); } check_suspend_network(reason); diff --git a/client/client_types.C b/client/client_types.C index c36ad804f4..1e03b1de4a 100644 --- a/client/client_types.C +++ b/client/client_types.C @@ -459,7 +459,10 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) { ); #endif if (gui_rpc) { - out.printf("%s", gui_urls.c_str()); + out.printf("%s%s", + gui_urls.c_str(), + suspended_via_gui?" \n":"" + ); } else { for (i=0; i\n"); + fout.printf("no such project\n"); } if (!strcmp(op, "reset")) { gstate.reset_project(p);