From 3dc556680a2864c2151b2a4215534b22432a6cd4 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sun, 21 Aug 2011 11:57:00 +0000
Subject: [PATCH] - credit trickle handler: write log messages if sanity checks
 fail

svn path=/trunk/boinc/; revision=24018
---
 checkin_notes            |  6 ++++++
 sched/trickle_credit.cpp | 37 +++++++++++++++++++++++++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 0c6434c57e..ac6d07ac06 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4941,3 +4941,9 @@ David  21 Aug 2011
     client/
         acct_setup.cpp,h
         gui_rpc_server_ops.cpp
+
+David  21 Aug 2011
+    - credit trickle handler: write log messages if sanity checks fail
+
+    sched/
+        trickle_credit.cpp
diff --git a/sched/trickle_credit.cpp b/sched/trickle_credit.cpp
index 9c347859f8..7a7c3db0bb 100644
--- a/sched/trickle_credit.cpp
+++ b/sched/trickle_credit.cpp
@@ -24,6 +24,14 @@
 // NOTE: there is no cheat-prevention mechanism here; add your own.
 // NOTE: doesn't work for GPU apps
 
+// sanity-check bounds:
+#define MIN_FLOPS 1e9
+    // if host FLOPS is < 0, set it to this
+#define MAX_FLOPS 2e10
+    // cap host FLOPS at this
+#define MAX_RUNTIME 3600.
+    // this corresponds to the --trickle arg to vboxwrapper
+
 #include "error_numbers.h"
 #include "util.h"
 
@@ -44,8 +52,8 @@ int handle_trickle(MSG_FROM_HOST& msg) {
         if (xp.parse_double("cpu_time", cpu_time)) break;
         log_messages.printf(MSG_NORMAL, "unexpected tag: %s\n", xp.parsed_tag);
     }
-    if (!cpu_time) {
-        log_messages.printf(MSG_NORMAL, "unexpected zero CPU time\n");
+    if (cpu_time <= 0) {
+        log_messages.printf(MSG_NORMAL, "unexpected nonpositive CPU time: %f\n", cpu_time);
         return ERR_XML_PARSE;
     }
 
@@ -58,10 +66,31 @@ int handle_trickle(MSG_FROM_HOST& msg) {
 
     // sanity checks - customize as needed
     //
-    if (cpu_flops_sec < 0) cpu_flops_sec = 1e9;
-    if (cpu_flops_sec > 2e10) cpu_flops_sec = 2e10;
+    if (cpu_time > MAX_RUNTIME) {
+        log_messages.printf(MSG_NORMAL,
+            "Reported runtime exceeds bound: %f>%f\n", cpu_time, MAX_RUNTIME
+        );
+        return 0;
+    }
+    if (cpu_flops_sec < 0) {
+        log_messages.printf(MSG_NORMAL,
+            "host CPU speed %f < 0.  Using %f instead\n",
+            cpu_flops_sec, MIN_FLOPS
+        );
+        cpu_flops_sec = MIN_FLOPS;
+    }
+    if (cpu_flops_sec > 2e10) {
+        log_messages.printf(MSG_NORMAL,
+            "host CPU speed %f exceeds %f.  Using %f instead\n",
+            cpu_flops_sec, MAX_FLOPS, MAX_FLOPS
+        );
+        cpu_flops_sec = 2e10;
+    }
     double credit = cpu_time_to_credit(cpu_time, cpu_flops_sec);
     grant_credit(host, dtime()-86400, credit);
+    log_messages.printf(MSG_DEBUG,
+        "granting %f credit to host %d\n", credit, host.id
+    );
 
     // update the host's credit fields
     //