*** empty log message ***

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

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
+

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
 

lib/parse.C

@@ -31,6 +31,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef _USING_FCGI_
+#include "/usr/local/include/fcgi_stdio.h"
+#endif
+
 #include "parse.h"
 
 bool match_tag(char* buf, char* tag) {

sched/feeder.C

@@ -46,6 +46,8 @@
 #include <unistd.h>
 #endif
 
+#include "/usr/local/include/fcgi_stdio.h"
+
 #include "db.h"
 #include "shmem.h"
 #include "sched_shmem.h"

sched/handle_request.C

@@ -21,6 +21,8 @@
 #include <sys/wait.h>
 #include <time.h>
 
+#include "/usr/local/include/fcgi_stdio.h"
+
 #include "db.h"
 #include "backend_lib.h"
 #include "parse.h"

sched/main.C

@@ -20,6 +20,9 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#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);
+    }
 }

sched/sched_shmem.C

@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "/usr/local/include/fcgi_stdio.h"
+
 #include "db.h"
 
 #include "sched_shmem.h"

sched/server_types.C

@@ -19,6 +19,8 @@
 
 #include <strings.h>
 
+#include "/usr/local/include/fcgi_stdio.h"
+
 #include "parse.h"
 #include "server_types.h"
 

sched/show_shmem.C

@@ -1,5 +1,7 @@
 #include <stdio.h>
 
+#include "/usr/local/include/fcgi_stdio.h"
+
 #include "shmem.h"
 #include "sched_shmem.h"