From 2177a6bd95cd3a876b6ba151d631f61c3467567e Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 29 Jun 2011 23:00:39 +0000
Subject: [PATCH] - server: restore fpops/intops_cumulative to RESULT    
 (structure, not table) for AQUA - client, Windows: when wake up from
 hibernation,     get the time before printing log msg

svn path=/trunk/boinc/; revision=23784
---
 checkin_notes         | 12 ++++++++++++
 client/client_state.h |  2 ++
 client/sysmon_win.cpp |  1 +
 db/boinc_db.h         |  5 +++++
 4 files changed, 20 insertions(+)

diff --git a/checkin_notes b/checkin_notes
index bb9838bae7..9cc9f78f1e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3832,3 +3832,15 @@ David  29 Jun 2011
         str_util.cpp
     samples/wrappture/
         wrappture.cpp
+
+David  29 Jun 2011
+    - server: restore fpops/intops_cumulative to RESULT
+        (structure, not table) for AQUA
+    - client, Windows: when wake up from hibernation,
+        get the time before printing log msg
+
+    db/
+        boinc_db.h
+    client/
+        client_state.h
+        sysmon_win.cpp
diff --git a/client/client_state.h b/client/client_state.h
index 8b94226233..cb4579a5c8 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -265,6 +265,8 @@ struct CLIENT_STATE {
     inline void set_now() {
         double x = dtime();
         if (x < (now-60)) {
+            // if time went backward significantly, clear delays
+            //
             clear_absolute_times();
         }
         now = x;
diff --git a/client/sysmon_win.cpp b/client/sysmon_win.cpp
index da87624479..2019efe3e4 100644
--- a/client/sysmon_win.cpp
+++ b/client/sysmon_win.cpp
@@ -139,6 +139,7 @@ static LRESULT CALLBACK WindowsMonitorSystemPowerWndProc(
 
                 // System is resuming from a normal power event
                 case PBT_APMRESUMESUSPEND:
+                    gstate.set_now();
                     msg_printf(NULL, MSG_INFO, "Windows is resuming operations");
 
                     // Check for a proxy
diff --git a/db/boinc_db.h b/db/boinc_db.h
index af49cbf745..409b5ad8b4 100644
--- a/db/boinc_db.h
+++ b/db/boinc_db.h
@@ -549,6 +549,11 @@ struct RESULT {
         // -1 anon platform, unknown resource type (relic)
         // -2/-3/-4 anonymous platform (see variants above)
 
+    // the following used by AQUA; delete when they don't need any more
+    //
+    double fpops_cumulative;
+    double intops_cumulative;
+
     void clear();
 };