X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Ffastcgi.c;h=62978eabf2cfc12339a4ae2ac6de656cf1bd5c3a;hb=851c1d78e4530ecaac3aca9d39b19932d8607431;hp=8c6355a50c83daedc3567ab482ad664105241a9a;hpb=a0c96fa8feb1938db84d95b14c320e6c7511c282;p=matches%2FMCTX3420.git

diff --git a/server/fastcgi.c b/server/fastcgi.c
index 8c6355a..62978ea 100644
--- a/server/fastcgi.c
+++ b/server/fastcgi.c
@@ -12,8 +12,10 @@
 
 #include "common.h"
 #include "sensor.h"
+#include "actuator.h"
 #include "control.h"
 #include "options.h"
+#include "image.h"
 
 /**The time period (in seconds) before the control key expires @ */
 #define CONTROL_TIMEOUT 180
@@ -40,7 +42,7 @@ struct FCGIContext {
 static void IdentifyHandler(FCGIContext *context, char *params) {
 	bool ident_sensors = false, ident_actuators = false;
 	//const char *key, *value;
-	struct timeval now;
+
 	int i;
 
 	FCGIValue values[2] = {{"sensors", &ident_sensors, FCGI_BOOL_T},
@@ -62,12 +64,6 @@ static void IdentifyHandler(FCGIContext *context, char *params) {
 	FCGI_JSONPair("build_date", __DATE__ " " __TIME__);
 	FCGI_JSONLong("api_version", API_VERSION);
 
-	//Time and running statistics
-	gettimeofday(&now, NULL);
-	FCGI_JSONDouble("start_time", TIMEVAL_TO_DOUBLE(g_options.start_time));
-	FCGI_JSONDouble("current_time", TIMEVAL_TO_DOUBLE(now));
-	FCGI_JSONDouble("running_time", TIMEVAL_DIFF(now, g_options.start_time));
-
 	//Sensor and actuator information
 	if (ident_sensors) {
 		FCGI_JSONKey("sensors");
@@ -243,14 +239,19 @@ bool FCGI_ParseRequest(FCGIContext *context, char *params, FCGIValue values[], s
 					case FCGI_BOOL_T:
 						*((bool*) val->value) = true;
 						break;
-					case FCGI_LONG_T:
-						*((long*) val->value) = strtol(value, &ptr, 10);
+					case FCGI_INT_T: case FCGI_LONG_T: {
+						long parsed = strtol(value, &ptr, 10);
 						if (!*value || *ptr) {
 							snprintf(buf, BUFSIZ, "Expected int for '%s' but got '%s'", key, value);
 							FCGI_RejectJSON(context, FCGI_EscapeJSON(buf));
 							return false;
 						}
-						break;
+
+						if (FCGI_TYPE(val->flags) == FCGI_INT_T)
+							*((int*) val->value) = parsed;
+						else
+							*((long*) val->value) = parsed;
+					}	break;
 					case FCGI_DOUBLE_T:
 						*((double*) val->value) = strtod(value, &ptr);
 						if (!*value || *ptr) {
@@ -297,6 +298,12 @@ void FCGI_BeginJSON(FCGIContext *context, StatusCodes status_code)
 	printf("{\r\n");
 	printf("\t\"module\" : \"%s\"", context->current_module);
 	FCGI_JSONLong("status", status_code);
+	//Time and running statistics
+	struct timeval now;
+	gettimeofday(&now, NULL);
+	FCGI_JSONDouble("start_time", TIMEVAL_TO_DOUBLE(g_options.start_time));
+	FCGI_JSONDouble("current_time", TIMEVAL_TO_DOUBLE(now));
+	FCGI_JSONDouble("running_time", TIMEVAL_DIFF(now, g_options.start_time));
 }
 
 /**
@@ -427,6 +434,17 @@ void FCGI_PrintRaw(const char *format, ...)
 	va_end(list);
 }
 
+
+/**
+ * Write binary data
+ * See fwrite
+ */
+void FCGI_WriteBinary(void * data, size_t size, size_t num_elem)
+{
+	Log(LOGDEBUG,"Writing!");
+	fwrite(data, size, num_elem, stdout);
+}
+
 /**
  * Main FCGI request loop that receives/responds to client requests.
  * @param data Reserved.
@@ -438,19 +456,7 @@ void * FCGI_RequestLoop (void *data)
 	FCGIContext context = {0};
 	
 	Log(LOGDEBUG, "First request...");
-	//TODO: The FCGI_Accept here is blocking. 
-	//		That means that if another thread terminates the program, this thread
-	//		 will not terminate until the next request is made.
 	while (FCGI_Accept() >= 0) {
-
-		if (Thread_Runstate() != RUNNING)
-		{
-			//TODO: Yeah... deal with this better :P
-			Log(LOGERR, "FIXME; FCGI gets request after other threads have finished.");
-			printf("Content-type: text/plain\r\n\r\n+++OUT OF CHEESE ERROR+++\n");
-			break;
-		}
-		
 		Log(LOGDEBUG, "Got request #%d", context.response_number);
 		ModuleHandler module_handler = NULL;
 		char module[BUFSIZ], params[BUFSIZ];
@@ -474,6 +480,10 @@ void * FCGI_RequestLoop (void *data)
 			module_handler = Control_Handler;
 		} else if (!strcmp("sensors", module)) {
 			module_handler = Sensor_Handler;
+		} else if (!strcmp("actuators", module)) {
+			module_handler = Actuator_Handler;
+		} else if (!strcmp("image", module)) {
+			module_handler = Image_Handler;
 		}
 
 		context.current_module = module;
@@ -488,7 +498,6 @@ void * FCGI_RequestLoop (void *data)
 	}
 
 	Log(LOGDEBUG, "Thread exiting.");
-	Thread_QuitProgram(false);
 	// NOTE: Don't call pthread_exit, because this runs in the main thread. Just return.
 	return NULL;
 }