From 9796a5e881d83afa3d3d0b09a7ffdcf68ba42141 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 30 Aug 2002 22:11:36 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=399
---
 client/client_state.C | 26 ++++++++++++++++----------
 client/cs_files.C     |  8 ++++++++
 client/cs_scheduler.C |  7 -------
 sched/main.h          |  3 +++
 4 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 sched/main.h

diff --git a/client/client_state.C b/client/client_state.C
index 88a5c0d3e0..96aa6be898 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -129,26 +129,36 @@ bool CLIENT_STATE::run_time_tests() {
 // so it should be called very seldom
 //
 int CLIENT_STATE::time_tests() {
+    if (log_flags.measurement_debug) {
+        printf("Getting general host information.\n");
+    }
+    get_host_info(host_info);       // this is platform dependent
 #if 0
     double fpop_test_secs = 2.0;
     double iop_test_secs = 2.0;
     double mem_test_secs = 2.0;
 
     if (log_flags.measurement_debug) {
-        printf( "Running floating point test for about %.1f seconds.\n",
-                fpop_test_secs );
+        printf(
+            "Running floating point test for about %.1f seconds.\n",
+            fpop_test_secs
+        );
     }
     host_info.p_fpops = run_double_prec_test(fpop_test_secs); //these are not
 
     if (log_flags.measurement_debug) {
-        printf( "Running integer test for about %.1f seconds.\n",
-                iop_test_secs );
+        printf(
+            "Running integer test for about %.1f seconds.\n",
+            iop_test_secs
+        );
     }
     host_info.p_iops = run_int_test(iop_test_secs);
 
     if (log_flags.measurement_debug) {
-        printf( "Running memory bandwidth test for about %.1f seconds.\n",
-                mem_test_secs );
+        printf(
+            "Running memory bandwidth test for about %.1f seconds.\n",
+            mem_test_secs
+        );
     }
     host_info.p_membw = run_mem_bandwidth_test(mem_test_secs);
 #else
@@ -157,10 +167,6 @@ int CLIENT_STATE::time_tests() {
     host_info.p_membw = 1000000000;
     host_info.m_cache = 1000000;
 #endif
-    if (log_flags.measurement_debug) {
-        printf( "Getting general host information.\n" );
-    }
-    get_host_info(host_info); // this is platform dependent
 
     host_info.p_calculated = (double)time(0); //set time calculated
     return 0;
diff --git a/client/cs_files.C b/client/cs_files.C
index 9085c2fbfe..8162d7fc3c 100644
--- a/client/cs_files.C
+++ b/client/cs_files.C
@@ -39,6 +39,14 @@
 #include "client_state.h"
 #include "error_numbers.h"
 
+// Decide whether to start a new file transfer
+//
+bool CLIENT_STATE::start_new_file_xfer() {
+    // TODO: limit the number of file xfers in some way
+    return true;
+}
+
+
 // Make a directory for each of the projects present
 // in the client state
 //
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 5e43e7a964..69e80f0bbc 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -43,13 +43,6 @@
 #define EXP_DECAY_RATE  (1./(3600*24*7))
 #define SECONDS_IN_DAY 86400
 
-// Decide whether to start a new file transfer
-//
-bool CLIENT_STATE::start_new_file_xfer() {
-    // **** this should do a little more than this
-    return true;
-}
-
 // estimate the days of work remaining
 //
 double CLIENT_STATE::current_water_days() {
diff --git a/sched/main.h b/sched/main.h
new file mode 100644
index 0000000000..4696c00950
--- /dev/null
+++ b/sched/main.h
@@ -0,0 +1,3 @@
+#include "db.h"
+
+extern PROJECT gproject;