Add semi working control code

[matches/MCTX3420.git] / server / sensor.c

diff --git a/server/sensor.c b/server/sensor.c
index 5d61858..867f7d4 100644 (file)
--- a/server/sensor.c
+++ b/server/sensor.c
@@ -5,6 +5,7 @@
  */
 
 #include "common.h"
+#include "control.h"
 #include "sensor.h"
 #include "options.h"
 #include <math.h>
@@ -18,9 +19,9 @@ const SensorThreshold thresholds[NUMSENSORS]= {
        {1,-1,1,-1},            // ANALOG_TEST0
        {500,0,499,0},          // ANALOG_TEST1
        {5,-5,4,-4},            // ANALOG_FAIL0
-       {1,0,1,0},              // DIGITAL_TEST0
-       {1,0,1,0},              // DIGITAL_TEST1
-       {1,0,1,0}               // DIGITAL_FAIL0
+       {1,0,1,0},                      // DIGITAL_TEST0
+       {1,0,1,0},                      // DIGITAL_TEST1
+       {1,0,1,0}                       // DIGITAL_FAIL0
 };
 
 /** Human readable names for the sensors **/
@@ -52,7 +53,7 @@ void Sensor_Start(Sensor * s, const char * experiment_name)
 {
        // Set filename
        char filename[BUFSIZ];
-       if (sprintf(filename, "%s_%d", experiment_name, s->id) >= BUFSIZ)
+       if (sprintf(filename, "%s_s%d", experiment_name, s->id) >= BUFSIZ)
        {
                Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ);
        }
@@ -68,22 +69,43 @@ void Sensor_Start(Sensor * s, const char * experiment_name)
 }
 
 /**
- * Stop a Sensor from recording DataPoints. Blocks until it has stopped.
- * @param s - The Sensor to stop
+ * Pause a sensor from recording DataPoints. Blocks until it is paused.
+ * @param s - The Sensor to pause
  */
-void Sensor_Stop(Sensor * s)
+void Sensor_Pause(Sensor *s)
 {
-       // Stop
        if (s->record_data)
        {
                s->record_data = false;
-               pthread_join(s->thread, NULL); // Wait for thread to exit
-               Data_Close(&(s->data_file)); // Close DataFile
-               s->newest_data.time_stamp = 0;
-               s->newest_data.value = 0;
+               pthread_join(s->thread, NULL);
+       }
+}
+
+/**
+ * Resumes a paused sensor.
+ * @param s - The Sensor to resume
+ */
+void Sensor_Resume(Sensor *s)
+{
+       if (!s->record_data)
+       {
+               s->record_data = true;
+               pthread_create(&(s->thread), NULL, Sensor_Loop, (void*)(s));
        }
 }
 
+/**
+ * Stop a Sensor from recording DataPoints. Blocks until it has stopped.
+ * @param s - The Sensor to stop
+ */
+void Sensor_Stop(Sensor * s)
+{
+       Sensor_Pause(s);
+       Data_Close(&(s->data_file)); // Close DataFile
+       s->newest_data.time_stamp = 0;
+       s->newest_data.value = 0;
+}
+
 /**
  * Stop all Sensors
  */
@@ -93,6 +115,18 @@ void Sensor_StopAll()
                Sensor_Stop(g_sensors+i);
 }
 
+void Sensor_PauseAll()
+{
+       for (int i = 0; i < NUMSENSORS; ++i)
+               Sensor_Pause(g_sensors+i);
+}
+
+void Sensor_ResumeAll()
+{
+       for (int i = 0; i < NUMSENSORS; ++i)
+               Sensor_Resume(g_sensors+i);
+}
+
 /**
  * Start all Sensors
  */
@@ -134,7 +168,7 @@ bool Sensor_Read(Sensor * s, DataPoint * d)
        // Set time stamp
        struct timeval t;
        gettimeofday(&t, NULL);
-       d->time_stamp = TIMEVAL_DIFF(t, g_options.start_time);
+       d->time_stamp = TIMEVAL_DIFF(t, *Control_GetStartTime());
 
        // Read value based on Sensor Id
        switch (s->id)
@@ -249,7 +283,6 @@ void Sensor_BeginResponse(FCGIContext * context, SensorId id, DataFormat format)
                case JSON:
                        FCGI_BeginJSON(context, STATUS_OK);
                        FCGI_JSONLong("id", id);
-                       FCGI_JSONKey("data");
                        break;
                default:
                        FCGI_PrintRaw("Content-type: text/plain\r\n\r\n");
@@ -285,7 +318,7 @@ void Sensor_Handler(FCGIContext *context, char * params)
 {
        struct timeval now;
        gettimeofday(&now, NULL);
-       double current_time = TIMEVAL_DIFF(now, g_options.start_time);
+       double current_time = TIMEVAL_DIFF(now, *Control_GetStartTime());
 
        int id = 0;
        double start_time = 0;
@@ -314,66 +347,25 @@ void Sensor_Handler(FCGIContext *context, char * params)
                // Error occured; FCGI_RejectJSON already called
                return;
        }
-       else if (id < 0 || id >= NUMSENSORS)
+
+       // Error checking on sensor id
+       if (id < 0 || id >= NUMSENSORS)
        {
-               FCGI_RejectJSON(context, "Invalid sensor id specified");
+               FCGI_RejectJSON(context, "Invalid sensor id");
                return;
        }
-
-       // Get Sensor and format
        Sensor * s = g_sensors+id;
-       DataFormat format = JSON;
 
-       // Check if format type was specified
-       if (FCGI_RECEIVED(values[FORMAT].flags))
-       {
-               if (strcmp(fmt_str, "json") == 0)
-                       format = JSON;
-               else if (strcmp(fmt_str, "tsv") == 0)
-                       format = TSV;
-               else 
-               {
-                       FCGI_RejectJSON(context, "Unknown format type specified.");
-                       return;
-               }
-       }
+       DataFormat format = Data_GetFormat(&(values[FORMAT]));
 
        // Begin response
        Sensor_BeginResponse(context, id, format);
-       
-       // If a time was specified
-       if (FCGI_RECEIVED(values[START_TIME].flags) || FCGI_RECEIVED(values[END_TIME].flags))
-       {
-               // Wrap times relative to the current time
-               if (start_time < 0)
-                       start_time += current_time;
-               if (end_time < 0)
-                       end_time += current_time;
-
-               // Print points by time range
-               Data_PrintByTimes(&(s->data_file), start_time, end_time, format);
-       }
-       else // No time was specified; just return a recent set of points
-       {
-               pthread_mutex_lock(&(s->data_file.mutex));
-                       int start_index = s->data_file.num_points-DATA_BUFSIZ;
-                       int end_index = s->data_file.num_points;
-               pthread_mutex_unlock(&(s->data_file.mutex));
-
-               // Bounds check
-               if (start_index < 0)
-                       start_index = 0;
-               if (end_index < 0)
-                       end_index = 0;
-
-               // Print points by indexes
-               Log(LOGDEBUG, "Sensor %d file \"%s\" indexes %d->%d", s->id, s->data_file.filename, start_index, end_index);
-               Data_PrintByIndexes(&(s->data_file), start_index, end_index, format);
-       }
+
+       // Print Data
+       Data_Handler(&(s->data_file), &(values[START_TIME]), &(values[END_TIME]), format, current_time);
        
        // Finish response
        Sensor_EndResponse(context, id, format);
-       
 }