Fast CGI now works

svn path=/trunk/boinc/; revision=150

api/api_test.C

@@ -33,7 +33,7 @@ int main() {
     mf.printf("foo\n");
     for(; i<100000000; i++) {
 	if(time_to_checkpoint()) {
-	    mf.printf("checkpoint\n");
+	    mf.printf("checkpoint: %d\n", temp);
 	    mf.flush();
             ao.percent_done = 1;
 	    checkpoint_completed(ao);

checkin_notes

@@ -644,6 +644,26 @@ Michael Gary	6/25/2002
     doc/
         test.html
 
+Michael Gary	6/27/2002
+    - Fixed a bug in add_work and added water level testing to test_uc.php
+
+    test/
+        test_uc.php
+    tools/
+        add_work.C
+
+Michael Gary	6/28/2002
+    - Added an explicit test for water level
+    - Added a -no_time_test argument to the boinc client to stop the time tests
+        from running. 
+
+    client/
+        main.C
+        client_state.h
+        client_state.C
+    test/
+        test_water.php (new)
+
 Eric Heien 7/01/2002
     - Added S@H test scripts, added other testing functionality.
     - Added random WU generation.
@@ -668,3 +688,19 @@ Eric Heien 7/01/2002
     tools/
         create_work.C
 
+Michael Gary	7/01/2002
+    - Fixed fast cgi scheduling server
+    - If low water mark is higher than high water mark, water marks are
+        switched
+    - Updated documentation
+
+    doc/
+        flow.html
+        protocol.html
+    client/
+        client_state.C
+        cs_scheduler.C
+    sched/
+        main.C
+    test/
+        prefs1.xml

client/client_state.C

@@ -92,6 +92,7 @@ int CLIENT_STATE::time_tests() {
     host_info.p_iops = run_int_test(4);
     host_info.p_membw = run_mem_bandwidth_test(4);
     host_info.p_calculated = (double)time(0); //set time calculated
+    //host_info.m_cache = check_cache_size(CACHE_MAX);
     return 0;
 }
 

client/cs_scheduler.C

@@ -63,6 +63,12 @@ double CLIENT_STATE::current_water_days() {
 }
 
 bool CLIENT_STATE::need_work() {
+    double temp;
+    if(prefs->high_water_days < prefs->low_water_days) {
+        temp = prefs->high_water_days;
+        prefs->high_water_days = prefs->low_water_days;
+        prefs->low_water_days = temp;
+    }
     return (current_water_days() <= prefs->low_water_days);
 }
 

doc/flow.html

@@ -13,7 +13,9 @@ the <b>high-water mark</b> and the <b>low-water mark</b>
 Normally the work remaining is between the high- and low-water marks.
 Then the work remaining reaches the low-water mark,
 the core client contacts one or more scheduling servers,
-and attempts to get enough work to exceed the high-water mark.
+and attempts to get enough work to exceed the high-water mark. The
+scheduling server sends a minimum of one hour of work and a maximum of
+four weeks of work. 
 
 <p>
 The amount of work (measured in FP/int ops) sent

doc/protocol.html

@@ -114,8 +114,8 @@ Reply elements include
 <message priority="low">no work available</message>
 <prefs_mod_time>123123</prefs_mod_time>
 <preferences>
-    <low_water>1.2</low_water>
-    <high_water>2.5</high_water>
+    <low_water_days>1.2</low_water_days>
+    <high_water_days>2.5</high_water_days>
     <disk_max_used_gb>0.4</disk_max_used_gb>
     <disk_max_used_pct>50</disk_max_used_pct>
     <disk_min_free_gb>0.4</disk_min_free_gb>

sched/main.C

@@ -49,11 +49,11 @@ int main() {
     SCHED_SHMEM* ssp;
     void* p;
     
-    #ifdef _USING_FCGI_
-    int counter = 0;
-    while(FCGI_Accept >= 0) {
-    counter++;
-    #endif
+#ifdef _USING_FCGI_
+
+    while(FCGI_Accept() >= 0) {
+
+#endif
     retval = attach_shmem(BOINC_KEY, &p);
     if (retval) {
         printf("can't attach shmem\n");
@@ -116,8 +116,8 @@ int main() {
 
     unlink(req_path);
     unlink(reply_path);
-    #ifdef _USING_FCGI_
+#ifdef _USING_FCGI_
+
     }
-    printf("loop cycled %d times\n", counter);
-    #endif
+#endif
 }

test/init.inc

@@ -146,8 +146,8 @@ function create_work($x) {
     PassThru("../tools/create_work $x");
 }
 
-function run_client() {
-    PassThru("../client/".CORE_CLIENT." -exit_when_idle");
+function run_client($args) {
+    PassThru("../client/".CORE_CLIENT." $args");
 }
 
 function start_feeder() {

test/prefs1.xml

@@ -4,7 +4,7 @@
     <low_water_days>1</low_water_days>
     <resource_share>1</resource_share>
     <project>
-        <master_url>http://maggie.ssl.berkeley.edu/index.html</master_url>
+        <master_url>http://maggie.ssl.berkeley.edu/fcgi.html</master_url>
         <authenticator>3f7b90793a0175ad0bda68684e8bd136</authenticator>
     </project>
 </preferences>

test/test_uc.php

@@ -16,7 +16,8 @@
     add_app("upper_case");
     create_work("-appname upper_case -rsc_iops 180000000000.0 -rsc_fpops 0.0 -wu_name uc_wu -wu_template uc_wu -result_template uc_result -nresults 5 input input input input input");
     start_feeder();
-    run_client();
+    //run_client("-exit_after 2");
+    run_client("-exit_when_idle");
     stop_feeder();
 
     check_results_done();

test/tw_correct

@@ -1 +0,0 @@
-3