- 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

@@ -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

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;

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

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();
 };