Update nginx/rsyslog config to add specific log for LOGWARN or above
[matches/MCTX3420.git] / server / sensor.c
index 867f7d4..64c7aa9 100644 (file)
@@ -5,7 +5,6 @@
  */
 
 #include "common.h"
-#include "control.h"
 #include "sensor.h"
 #include "options.h"
 #include <math.h>
@@ -40,100 +39,87 @@ void Sensor_Init()
        {
                g_sensors[i].id = i;
                Data_Init(&(g_sensors[i].data_file));
-               g_sensors[i].record_data = false;       
        }
 }
 
 /**
- * Start a Sensor recording DataPoints
- * @param s - The Sensor to start
- * @param experiment_name - Prepended to DataFile filename
+ * Sets the sensor to the desired control mode. No checks are
+ * done to see if setting to the desired mode will conflict with
+ * the current mode - the caller must guarantee this itself.
+ * @param s The sensor whose mode is to be changed
+ * @param mode The mode to be changed to
+ * @param arg An argument specific to the mode to be set. 
+ *            e.g for CONTROL_START it represents the experiment name.
  */
-void Sensor_Start(Sensor * s, const char * experiment_name)
+void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg)
 {
-       // Set filename
-       char filename[BUFSIZ];
-       if (sprintf(filename, "%s_s%d", experiment_name, s->id) >= BUFSIZ)
+       switch(mode)
        {
-               Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ);
-       }
-
-       Log(LOGDEBUG, "Sensor %d with DataFile \"%s\"", s->id, filename);
-       // Open DataFile
-       Data_Open(&(s->data_file), filename);
-
-       s->record_data = true; // Don't forget this!
-
-       // Create the thread
-       pthread_create(&(s->thread), NULL, Sensor_Loop, (void*)(s));
-}
-
-/**
- * Pause a sensor from recording DataPoints. Blocks until it is paused.
- * @param s - The Sensor to pause
- */
-void Sensor_Pause(Sensor *s)
-{
-       if (s->record_data)
-       {
-               s->record_data = false;
-               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));
+               case CONTROL_START:
+                       {
+                               // Set filename
+                               char filename[BUFSIZ];
+                               const char *experiment_name = (const char*) arg;
+
+                               if (snprintf(filename, BUFSIZ, "%s_s%d", experiment_name, s->id) >= BUFSIZ)
+                               {
+                                       Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ);
+                               }
+
+                               Log(LOGDEBUG, "Sensor %d with DataFile \"%s\"", s->id, filename);
+                               // Open DataFile
+                               Data_Open(&(s->data_file), filename);
+                       }
+               case CONTROL_RESUME: //Case fallthrough, no break before
+                       {
+                               int ret;
+                               s->activated = true; // Don't forget this!
+
+                               // Create the thread
+                               ret = pthread_create(&(s->thread), NULL, Sensor_Loop, (void*)(s));
+                               if (ret != 0)
+                               {
+                                       Fatal("Failed to create Sensor_Loop for Sensor %d", s->id);
+                               }
+
+                               Log(LOGDEBUG, "Resuming sensor %d", s->id);
+                       }
+               break;
+
+               case CONTROL_EMERGENCY:
+               case CONTROL_PAUSE:
+                       s->activated = false;
+                       pthread_join(s->thread, NULL);
+                       Log(LOGDEBUG, "Paused sensor %d", s->id);
+               break;
+               
+               case CONTROL_STOP:
+                       if (s->activated) //May have been paused before
+                       {
+                               s->activated = false;
+                               pthread_join(s->thread, NULL);
+                       }
+
+                       Data_Close(&(s->data_file)); // Close DataFile
+                       s->newest_data.time_stamp = 0;
+                       s->newest_data.value = 0;
+                       Log(LOGDEBUG, "Stopped sensor %d", s->id);
+               break;
+               default:
+                       Fatal("Unknown control mode: %d", mode);
        }
 }
 
 /**
- * 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
+ * Sets all sensors to the desired mode. 
+ * @see Sensor_SetMode for more information.
+ * @param mode The mode to be changed to
+ * @param arg An argument specific to the mode to be set.
  */
-void Sensor_StopAll()
-{
-       for (int i = 0; i < NUMSENSORS; ++i)
-               Sensor_Stop(g_sensors+i);
-}
-
-void Sensor_PauseAll()
+void Sensor_SetModeAll(ControlModes mode, void * arg)
 {
-       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
- */
-void Sensor_StartAll(const char * experiment_name)
-{
-       for (int i = 0; i < NUMSENSORS; ++i)
-               Sensor_Start(g_sensors+i, experiment_name);
+       for (int i = 0; i < NUMSENSORS; i++)
+               Sensor_SetMode(&g_sensors[i], mode, arg);
 }
 
 
@@ -148,6 +134,7 @@ void Sensor_CheckData(SensorId id, double value)
        {
                Log(LOGERR, "Sensor %s is above or below its safety value of %f or %f\n", g_sensor_names[id],thresholds[id].max_error, thresholds[id].min_error);
                //new function that stops actuators?
+               //Control_SetMode(CONTROL_EMERGENCY, NULL)
        }
        else if( value > thresholds[id].max_warn || value < thresholds[id].min_warn)
        {
@@ -229,7 +216,7 @@ void * Sensor_Loop(void * arg)
        Log(LOGDEBUG, "Sensor %d starts", s->id);
 
        // Until the sensor is stopped, record data points
-       while (s->record_data)
+       while (s->activated)
        {
                DataPoint d;
                //Log(LOGDEBUG, "Sensor %d reads data [%f,%f]", s->id, d.time_stamp, d.value);

UCC git Repository :: git.ucc.asn.au