From cd8d27a07b4a4f2ee8f9e3b5da883572fcbc5546 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 18 May 2005 22:50:32 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=6192 --- checkin_notes | 3 +++ client/ss_logic.C | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 545306292d..f24f33ecb4 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6743,6 +6743,9 @@ Rom 18 May 2005 to establish the listening socket for the next rpc request. - Convert the remaining #ifdef'ed debug messages into scoped messages so they can be tracked in debug/release builds on all platforms. + - We store most if not all time values internally as doubles, so make + the calls to time(0) to dtime() to see if that fixes a deadline + problem on the mac with the screensaver. client/ app_graphics.C diff --git a/client/ss_logic.C b/client/ss_logic.C index 4238f75483..3bc131700c 100644 --- a/client/ss_logic.C +++ b/client/ss_logic.C @@ -24,6 +24,7 @@ #include "client_state.h" #include "client_msgs.h" #include "ss_logic.h" +#include "util.h" SS_LOGIC::SS_LOGIC() { do_ss = false; @@ -37,7 +38,7 @@ void SS_LOGIC::ask_app(ACTIVE_TASK* atp, GRAPHICS_MSG& m) { atp->request_graphics_mode(m); atp->is_ss_app = true; - ack_deadline = time(0) + 5; + ack_deadline = dtime() + 5.0; scope_messages.printf("SS_LOGIC::ask_app(): starting %s\n", atp->result->name); } @@ -126,7 +127,7 @@ void SS_LOGIC::poll(double now) { // check if it's time to go to black screen // - if (blank_time && (time(0) > blank_time)) { + if (blank_time && (dtime() > blank_time)) { if (SS_STATUS_BLANKED != ss_status) { scope_messages.printf("SS_LOGIC::poll(): going to black\n"); reset(); @@ -142,7 +143,7 @@ void SS_LOGIC::poll(double now) { stop_app_ss = true; } } else { - if (time(0) > ack_deadline) { + if (dtime() > ack_deadline) { scope_messages.printf("SS_LOGIC::poll(): app %s not respond\n", atp->result->name); stop_app_ss = true; }