From 882d5d0ac2f730b5332afeb82a73e7fb513ede71 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 4 Mar 2004 19:38:31 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=3030 --- checkin_notes | 17 ++++++++++++++++- client/client_state.h | 2 +- client/cs_scheduler.C | 18 +++++++++++++++++- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 82982e56c5..e30d97caee 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10299,7 +10299,7 @@ Rom Mar 3 2004 *.vcproj boinc.vcproj (removed) -Rom Mar 3 2004 +Rom Mar 4 2004 - Include file overhaul for the Windows platform Basically the linker was linking Windows GUI resources into it because of various @@ -10325,3 +10325,18 @@ Rom Mar 3 2004 I pretty much touched all the source and header files. This checkin should not have any effect on any platform other than Windows. + +Rom Mar 4 2004 (from John Keck) + + Edits to change when the client considers a result to be at its deadline + it was originally 6 hours as defined in _BASE + if I did this right it will use the connected fraction to modify that amount + a 100% connected client will use the base figure, a 0% connected client will + use the base figure times the multiplier in addition to the base figure. + The figures I have here will produce a maximum time before deadline of + 18 hours. 6*2=12+6=18 for debugging that may be too much but + it may not be enough for release. + + client/ + client_state.h + cs_scheduler.c diff --git a/client/client_state.h b/client/client_state.h index 77b7475ca7..5dac2cdf1c 100644 --- a/client/client_state.h +++ b/client/client_state.h @@ -82,6 +82,7 @@ public: SS_LOGIC ss_logic; GUI_RPC_CONN_SET gui_rpcs; LANGUAGE language; + TIME_STATS time_stats; int core_client_major_version; int core_client_minor_version; @@ -122,7 +123,6 @@ public: private: bool client_state_dirty; - TIME_STATS time_stats; int old_major_version; int old_minor_version; char* platform_name; diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C index c7d4049d35..95e25f176b 100644 --- a/client/cs_scheduler.C +++ b/client/cs_scheduler.C @@ -53,7 +53,23 @@ const int SECONDS_BEFORE_REPORTING_MIN_RPC_TIME_AGAIN = 60*60; -const int SECONDS_BEFORE_REPORT_DEADLINE_TO_REPORT = 60*60*6; +//Edits to change when the client considers a result to be at its deadline +//it was originally 6 hours as defined in _BASE +//if I did this right it will use the connected fraction to modify that amount +//a 100% connected client will use the base figure, a 0% connected client will +//use the base figure times the multiplier in addition to the base figure. +//The figures I have here will produce a maximum time before deadline of +//18 hours. 6*2=12+6=18 for debugging that may be too much but +//it may not be enough for release. +// jkeck +const int SECONDS_BEFORE_REPORT_DEADLINE_TO_REPORT_BASE = 60*60*6; +const double DEADLINE_TO_REPORT_MULTIPLIER = 2.0; +const double SECONDS_BEFORE_REPORT_DEADLINE_TO_REPORT = + (SECONDS_BEFORE_REPORT_DEADLINE_TO_REPORT_BASE * + DEADLINE_TO_REPORT_MULTIPLIER * + (1-gstate.time_stats.connected_frac)) + + SECONDS_BEFORE_REPORT_DEADLINE_TO_REPORT_BASE; + // estimate the days of work remaining //