From a8660b2a3fbf9fbab89cb10b16f1d85f889be94b Mon Sep 17 00:00:00 2001 From: Michael Gary Date: Fri, 7 Jun 2002 21:21:55 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=97 --- TODO | 3 ++- checkin_notes | 15 +++++++++++++++ lib/parse.C | 4 ++++ sched/feeder.C | 2 ++ sched/handle_request.C | 2 ++ sched/main.C | 5 +++++ sched/sched_shmem.C | 2 ++ sched/server_types.C | 2 ++ sched/show_shmem.C | 2 ++ 9 files changed, 36 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index b274949154..ce5c644e65 100644 --- a/TODO +++ b/TODO @@ -45,7 +45,7 @@ HIGH-PRIORITY (must be done to support SETI@home) - complete client side and test hi/lo water mark scheme - initialize rsc_fpops and rsc_iops in client WORKUNIT - - ensure server sends correct number of work units + - check server sends correct number of work units - check client requests correct number of seconds of work - measure hardware parameters: CPU speed, #CPUs, memory, disk @@ -178,3 +178,4 @@ DONE (may need test) - measure bandwidth on each network xfer maintain exponential average, weighted by #bytes xferred + diff --git a/checkin_notes b/checkin_notes index 89ff129a8d..399482723b 100755 --- a/checkin_notes +++ b/checkin_notes @@ -378,4 +378,19 @@ Michael Gary June 06, 2002 test_min_water_prefs.php (new) test_normal_water_prefs.php (new) +Michael Gary June 07, 2002 + - Converted scheduling server to Fast CGI + + sched/ + feeder.C + handle_request.C + main.C + sched_shmem.C + main.C + sched_shmem.C + server_types.C + show_shmem.C + Makefile + lib/ + parse.C diff --git a/lib/parse.C b/lib/parse.C index 0cbc8e6c1d..af4ce7ab3c 100644 --- a/lib/parse.C +++ b/lib/parse.C @@ -31,6 +31,10 @@ #include #include +#ifdef _USING_FCGI_ +#include "/usr/local/include/fcgi_stdio.h" +#endif + #include "parse.h" bool match_tag(char* buf, char* tag) { diff --git a/sched/feeder.C b/sched/feeder.C index f55ca6f629..ce58dcdd76 100644 --- a/sched/feeder.C +++ b/sched/feeder.C @@ -46,6 +46,8 @@ #include #endif +#include "/usr/local/include/fcgi_stdio.h" + #include "db.h" #include "shmem.h" #include "sched_shmem.h" diff --git a/sched/handle_request.C b/sched/handle_request.C index 058dbf3e37..b515ec1d0d 100644 --- a/sched/handle_request.C +++ b/sched/handle_request.C @@ -21,6 +21,8 @@ #include #include +#include "/usr/local/include/fcgi_stdio.h" + #include "db.h" #include "backend_lib.h" #include "parse.h" diff --git a/sched/main.C b/sched/main.C index c648321485..ddaff2f67e 100644 --- a/sched/main.C +++ b/sched/main.C @@ -20,6 +20,9 @@ #include #include +#include "/usr/local/include/fcgi_stdio.h" +#define _USING_FCGI_ //used to tell lib to inlcude fcgi_stdio.h + #include "db.h" #include "parse.h" #include "shmem.h" @@ -48,6 +51,7 @@ int main() { SCHED_SHMEM* ssp; void* p; + while(FCGI_Accept() >= 0) { retval = attach_shmem(BOINC_KEY, &p); if (retval) { printf("can't attach shmem\n"); @@ -110,4 +114,5 @@ int main() { unlink(req_path); unlink(reply_path); + } } diff --git a/sched/sched_shmem.C b/sched/sched_shmem.C index 011cb14295..e75edb768f 100644 --- a/sched/sched_shmem.C +++ b/sched/sched_shmem.C @@ -1,6 +1,8 @@ #include #include +#include "/usr/local/include/fcgi_stdio.h" + #include "db.h" #include "sched_shmem.h" diff --git a/sched/server_types.C b/sched/server_types.C index 231c08a09a..42d312ba61 100644 --- a/sched/server_types.C +++ b/sched/server_types.C @@ -19,6 +19,8 @@ #include +#include "/usr/local/include/fcgi_stdio.h" + #include "parse.h" #include "server_types.h" diff --git a/sched/show_shmem.C b/sched/show_shmem.C index 4c80045979..b3ff7225d6 100644 --- a/sched/show_shmem.C +++ b/sched/show_shmem.C @@ -1,5 +1,7 @@ #include +#include "/usr/local/include/fcgi_stdio.h" + #include "shmem.h" #include "sched_shmem.h"