X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.c;h=867f7d45e1787684bd833e4cdd7aaaf13fa24ac6;hb=9e7cfbbc6137056bba8ed8644fc6ecfe398553fe;hp=a1513121fd42bf851537e0d0ce05c23cb92a633c;hpb=f44384c0c76c6621f049ade9e2de00be4bfeafd0;p=matches%2FMCTX3420.git

diff --git a/server/sensor.c b/server/sensor.c
index a151312..867f7d4 100644
--- a/server/sensor.c
+++ b/server/sensor.c
@@ -69,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
  */
@@ -94,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
  */
@@ -325,23 +358,14 @@ void Sensor_Handler(FCGIContext *context, char * params)
 
 	DataFormat format = Data_GetFormat(&(values[FORMAT]));
 
-	if (Control_Lock())
-	{
-		// Begin response
-		Sensor_BeginResponse(context, id, format);
-
-		// Print Data
-		Data_Handler(&(s->data_file), &(values[START_TIME]), &(values[END_TIME]), format, current_time);
-		
-		// Finish response
-		Sensor_EndResponse(context, id, format);
+	// Begin response
+	Sensor_BeginResponse(context, id, format);
 
-		Control_Unlock();
-	}
-	else
-	{
-		FCGI_RejectJSON(context, "Experiment is not running.");
-	}
+	// Print Data
+	Data_Handler(&(s->data_file), &(values[START_TIME]), &(values[END_TIME]), format, current_time);
+	
+	// Finish response
+	Sensor_EndResponse(context, id, format);
 }