X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.c;h=4e8ac7fd6a719024d1b427082bfca7ed7c38415f;hb=40aa63f285b9a2ed67aac67055a205de1a8d95ba;hp=2a0e762cf84056df12708d0cbb4da29a80b852d6;hpb=28f3b3b6ecd1a7ab6686b15c5c885e57cb5fce43;p=matches%2FMCTX3420.git diff --git a/server/sensor.c b/server/sensor.c index 2a0e762..4e8ac7f 100644 --- a/server/sensor.c +++ b/server/sensor.c @@ -7,617 +7,427 @@ #include "common.h" #include "sensor.h" #include "options.h" +#include "bbb_pin.h" #include /** Array of sensors, initialised by Sensor_Init **/ -static Sensor g_sensors[NUMSENSORS]; //global to this file -const char * g_sensor_names[NUMSENSORS] = { - "analog_test0", "analog_test1", - "analog_fail0", "digital_test0", - "digital_test1", "digital_fail0" -}; - -/** - * Checks the sensor data for unsafe or unexpected results - * @param sensor_id - The ID of the sensor - * @param value - The value of the sensor to check +static Sensor g_sensors[SENSORS_MAX]; +/** The number of sensors **/ +int g_num_sensors = 0; + + + +/** + * Add and initialise a Sensor + * @param name - Human readable name of the sensor + * @param user_id - User identifier + * @param read - Function to call whenever the sensor should be read + * @param init - Function to call to initialise the sensor (may be NULL) + * @param max_error - Maximum error threshold; program will exit if this is exceeded for the sensor reading + * @param min_error - Minimum error threshold; program will exit if the sensor reading falls below this value + * @param max_warn - Maximum warning threshold; program will log warnings if the value exceeds this threshold + * @param min_warn - Minimum warning threshold; program will log warnings if the value falls below this threshold + * @returns Number of actuators added so far */ -void CheckSensor( SensorId sensor_id, double value) +int Sensor_Add(const char * name, int user_id, ReadFn read, InitFn init, CleanFn cleanup, SanityFn sanity) { - switch (sensor_id) + if (++g_num_sensors > SENSORS_MAX) { - case ANALOG_FAIL0: - { - if( value > ANALOG_FAIL0_SAFETY || value < ANALOG_FAIL0_MIN_SAFETY) - { - Log(LOGERR, "Sensor analog_fail0 is above or below its safety value of %d or %d\n", ANALOG_FAIL0_SAFETY, ANALOG_FAIL0_MIN_SAFETY); - //new function that stops actuators? - } - else if( value > ANALOG_FAIL0_WARN || value < ANALOG_FAIL0_MIN_WARN) - { - Log(LOGWARN, "Sensor analog_test0 is above or below its warning value of %d or %d\n", ANALOG_FAIL0_WARN, ANALOG_FAIL0_MIN_WARN); - } - break; - } - case DIGITAL_FAIL0: - { - if( value != 0 && value != 1) - { - Log(LOGERR, "Sensor digital_fail0 is not 0 or 1\n"); - } - break; - } - default: - { - //So it doesn't complain about the missing cases - in practice we will need all sensors to be checked as above, no need to include a default as we should only pass valid sensor_id's; unless for some reason we have a sensor we don't need to check (but then why would you pass to this function in the first place :P) - } + Fatal("Too many sensors; Increase SENSORS_MAX from %d in sensor.h and recompile", SENSORS_MAX); + // We could design the program to use realloc(3) + // But since someone who adds a new sensor has to recompile the program anyway... } -} + Sensor * s = &(g_sensors[g_num_sensors-1]); -/** - * Read a data value from a sensor; block until value is read - * @param sensor_id - The ID of the sensor - * @param d - DataPoint to set - * @returns NULL for digital sensors when data is unchanged, otherwise d - */ -DataPoint * GetData(SensorId sensor_id, DataPoint * d) -{ - // switch based on the sensor_id at the moment for testing; - // might be able to just directly access ADC from sensor_id? - //TODO: Implement for real sensors + s->id = g_num_sensors-1; + s->user_id = user_id; + Data_Init(&(s->data_file)); + s->name = name; + s->read = read; // Set read function + s->init = init; // Set init function - - //TODO: We should ensure the time is *never* allowed to change on the server if we use gettimeofday - // Another way people might think of getting the time is to count CPU cycles with clock() - // But this will not work because a) CPU clock speed may change on some devices (RPi?) and b) It counts cycles used by all threads - - struct timeval t; - gettimeofday(&t, NULL); - d->time_stamp = (t.tv_sec - g_options.start_time.tv_sec) + 1e-6*(t.tv_usec - g_options.start_time.tv_usec); + // Start by averaging values taken over a second + DOUBLE_TO_TIMEVAL(1, &(s->sample_time)); + s->averages = 1; + s->num_read = 0; - // Make time relative - //d->time_stamp.tv_sec -= g_options.start_time.tv_sec; - //d->time_stamp.tv_usec -= g_options.start_time.tv_usec; - - switch (sensor_id) + // Set sanity function + s->sanity = sanity; + + if (init != NULL) { - case ANALOG_TEST0: - { - static int count = 0; - d->value = count++; - break; - } - case ANALOG_TEST1: - d->value = (double)(rand() % 100) / 100; - break; - case ANALOG_FAIL0: - d->value = (double)(rand() % 6) * -( rand() % 2) / ( rand() % 100 + 1); - //Gives a value between -5 and 5 - CheckSensor(sensor_id, d->value); - break; - //TODO: For digital sensors, consider only updating when sensor is actually changed - case DIGITAL_TEST0: - d->value = t.tv_sec % 2; - break; - case DIGITAL_TEST1: - d->value = (t.tv_sec+1)%2; - break; - case DIGITAL_FAIL0: - if( rand() % 100 > 98) - d->value = 2; - d->value = rand() % 2; - //Gives 0 or 1 or a 2 every 1/100 times - CheckSensor(sensor_id, d->value); - break; - default: - Fatal("Unknown sensor id: %d", sensor_id); - break; - } - usleep(100000); // simulate delay in sensor polling + if (!init(name, user_id)) + Fatal("Couldn't init sensor %s", name); + } - return d; + s->current_data.time_stamp = 0; + s->current_data.value = 0; + s->averaged_data.time_stamp = 0; + s->averaged_data.value = 0; + return g_num_sensors; } /** - * Destroy a sensor - * @param s - Sensor to destroy + * Initialise all sensors used by the program + * TODO: Edit this to add any extra sensors you need + * TODO: Edit the includes as well */ -void Destroy(Sensor * s) +#include "sensors/resource.h" +#include "sensors/strain.h" +#include "sensors/pressure.h" +#include "sensors/dilatometer.h" +#include "sensors/microphone.h" +void Sensor_Init() { - // Maybe move the binary file into long term file storage? - fclose(s->file); + //Sensor_Add("cpu_stime", RESOURCE_CPU_SYS, Resource_Read, NULL, NULL, NULL); + //Sensor_Add("cpu_utime", RESOURCE_CPU_USER, Resource_Read, NULL, NULL, NULL); + Sensor_Add("pressure_high0", PRES_HIGH0, Pressure_Read, Pressure_Init, Pressure_Cleanup, NULL); + Sensor_Add("pressure_high1", PRES_HIGH1, Pressure_Read, Pressure_Init, Pressure_Cleanup, NULL); + Sensor_Add("pressure_low0", PRES_LOW0, Pressure_Read, Pressure_Init, Pressure_Cleanup, NULL); + //Sensor_Add("../testing/count.py", 0, Piped_Read, Piped_Init, Piped_Cleanup, 1e50,-1e50,1e50,-1e50); + //Sensor_Add("strain0_endhoop", STRAIN0, Strain_Read, Strain_Init, Strain_Cleanup, Strain_Sanity); + //Sensor_Add("strain1_endlong", STRAIN1, Strain_Read, Strain_Init, Strain_Cleanup, Strain_Sanity); + //Sensor_Add("strain2_midhoop", STRAIN2, Strain_Read, Strain_Init, Strain_Cleanup, Strain_Sanity); + //Sensor_Add("strain3_midlong", STRAIN3, Strain_Read, Strain_Init, Strain_Cleanup, Strain_Sanity); + + //Sensor_Add("microphone", 0, Microphone_Read, Microphone_Init, Microphone_Cleanup, Microphone_Sanity); + //Sensor_Add("pressure0", PRESSURE0, Pressure_Read, Pressure_Init, 5000,0,5000,0); + //Sensor_Add("pressure1", PRESSURE1, Pressure_Read, Pressure_Init, 5000,0,5000,0); + //Sensor_Add("pressure_feedback", PRESSURE_FEEDBACK, Pressure_Read, Pressure_Init, 5000,0,5000,0); + //Sensor_Add("enclosure", ENCLOSURE, Enclosure_Read, Enclosure_Init, 1,1,1,1); // Does not exist... + + //NOTE: DO NOT ENABLE DILATOMETER WITHOUT FURTHER TESTING; CAUSES SEGFAULTS + //Sensor_Add("dilatometer0", 0, Dilatometer_Read, Dilatometer_Init, Dilatometer_Cleanup, NULL); + //Sensor_Add("dilatometer1",1, Dilatometer_Read, Dilatometer_Init, Dilatometer_Cleanup, NULL); } - - /** - * Initialise a sensor - * @param s - Sensor to initialise + * Cleanup all sensors */ -void Init(Sensor * s, int id) +void Sensor_Cleanup() { - s->write_index = 0; - s->id = id; - s->points_written = 0; - s->points_read = 0; - - #define FILENAMESIZE 3 - char filename[FILENAMESIZE]; - if (s->id >= pow(10, FILENAMESIZE)) + for (int i = 0; i < g_num_sensors; ++i) { - Fatal("Too many sensors! FILENAMESIZE is %d; increase it and recompile.", FILENAMESIZE); + Sensor * s = g_sensors+i; + if (s->cleanup != NULL) + s->cleanup(s->user_id); } - - pthread_mutex_init(&(s->mutex), NULL); - - sprintf(filename, "%d", s->id); - unlink(filename); //TODO: Move old files somewhere - - s->file = fopen(filename, "a+b"); // open binary file - Log(LOGDEBUG, "Initialised sensor %d; binary file is \"%s\"", id, filename); + g_num_sensors = 0; } - /** - * Run the main sensor polling loop - * @param arg - Cast to Sensor* - Sensor that the thread will handle - * @returns NULL (void* required to use the function with pthreads) + * 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_Main(void * arg) +void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg) { - Sensor * s = (Sensor*)(arg); - - while (Thread_Runstate() == RUNNING) //TODO: Exit condition + switch(mode) { - // The sensor will write data to a buffer until it is full - // Then it will open a file and dump the buffer to the end of it. - // Rinse and repeat + case CONTROL_START: + { + // Set filename + char filename[BUFSIZ]; + const char *experiment_path = (const char*) arg; + int ret; - // The reason I've added the buffer is because locks are expensive - // But maybe it's better to just write data straight to the file - // I'd like to do some tests by changing SENSOR_DATABUFSIZ + ret = snprintf(filename, BUFSIZ, "%s/sensor_%d", experiment_path, s->id); - while (s->write_index < SENSOR_DATABUFSIZ) - { - DataPoint * d = &(s->buffer[s->write_index]); - if (GetData(s->id, d) == NULL) - { - Fatal("Error collecting data"); + if (ret >= BUFSIZ) + { + Fatal("Experiment path \"%s\" too long (%d, limit %d)", + experiment_path, ret, BUFSIZ); + } + + Log(LOGDEBUG, "Sensor %d with DataFile \"%s\"", s->id, filename); + // Open DataFile + Data_Open(&(s->data_file), filename); } - s->write_index += 1; - } + case CONTROL_RESUME: //Case fallthrough, no break before + { + int ret; + s->activated = true; // Don't forget this! - //Log(LOGDEBUG, "Filled buffer"); + // 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); + } - // CRITICAL SECTION (no threads should be able to read/write the file at the same time) - pthread_mutex_lock(&(s->mutex)); - //TODO: Valgrind complains about this fseek: "Syscall param write(buf) points to uninitialised byte(s)" - // Not sure why, but we should find out and fix it. - fseek(s->file, 0, SEEK_END); - int amount_written = fwrite(s->buffer, sizeof(DataPoint), SENSOR_DATABUFSIZ, s->file); - if (amount_written != SENSOR_DATABUFSIZ) + 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 { - Fatal("Wrote %d data points and expected to write %d to \"%s\" - %s", amount_written, SENSOR_DATABUFSIZ, strerror(errno)); + s->activated = false; + pthread_join(s->thread, NULL); } - s->points_written += amount_written; - //Log(LOGDEBUG, "Wrote %d data points for sensor %d", amount_written, s->id); - pthread_mutex_unlock(&(s->mutex)); - // End of critical section - s->write_index = 0; // reset position in buffer - + Data_Close(&(s->data_file)); // Close DataFile + Log(LOGDEBUG, "Stopped sensor %d", s->id); + break; + default: + Fatal("Unknown control mode: %d", mode); } - Log(LOGDEBUG, "Thread for sensor %d exits", s->id); - return NULL; } /** - * Get position in a binary sensor file with a timestamp using a binary search - * @param s - Sensor to use - * @param time_stamp - Timestamp - * @param count - If not NULL, used to provide number of searches required - * @param found - If not NULL, set to the closest DataPoint - * @returns Integer giving the *closest* index in the file - * TODO: Refactor or replace? + * 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. */ -int FindTime(Sensor * s, double time_stamp, int * count, DataPoint * found) +void Sensor_SetModeAll(ControlModes mode, void * arg) { - DataPoint d; + if (mode == CONTROL_START) + Sensor_Init(); + for (int i = 0; i < g_num_sensors; i++) + Sensor_SetMode(&g_sensors[i], mode, arg); + if (mode == CONTROL_STOP) + Sensor_Cleanup(); +} + - int lower = 0; - int upper = s->points_written - 1; - int index = 0; - if (count != NULL) - *count = 0; +/** + * Record data from a single Sensor; to be run in a seperate thread + * @param arg - Cast to Sensor* - Sensor that the thread will handle + * @returns NULL (void* required to use the function with pthreads) + */ +void * Sensor_Loop(void * arg) +{ + Sensor * s = (Sensor*)(arg); + Log(LOGDEBUG, "Sensor %d starts", s->id); - while (upper - lower > 1) + // Until the sensor is stopped, record data points + while (s->activated) { - index = lower + ((upper - lower)/2); - - // Basically anything with fseek is critical; if we don't make it critical the sensor thread may alter data at a random point in the file! - // CRITICAL SECTION (May need to rethink how this is done, but I can't see how to do it without fseek :S) - // Regarding the suggestion that we have 2 file pointers; one for reading and one for writing: - // That seems like it will work... but we will have to be very careful and test it first - pthread_mutex_lock(&s->mutex); - fseek(s->file, index*sizeof(DataPoint), SEEK_SET); - int amount_read = fread(&d, sizeof(DataPoint), 1, s->file); - pthread_mutex_unlock(&s->mutex); - if (amount_read != 1) - { - Fatal("Couldn't read single data point from sensor %d", s->id); - } + bool success = s->read(s->user_id, &(s->current_data.value)); - if (d.time_stamp > time_stamp) + struct timespec t; + clock_gettime(CLOCK_MONOTONIC, &t); + s->current_data.time_stamp = TIMEVAL_DIFF(t, *Control_GetStartTime()); + + if (success) { - upper = index; + if (s->sanity != NULL) + { + if (!s->sanity(s->user_id, s->current_data.value)) + { + Fatal("Sensor %s (%d,%d) reads unsafe value", s->name, s->id, s->user_id); + } + } + s->averaged_data.time_stamp += s->current_data.time_stamp; + s->averaged_data.value = s->current_data.value; + + if (++(s->num_read) >= s->averages) + { + s->averaged_data.time_stamp /= s->averages; + s->averaged_data.value /= s->averages; + Data_Save(&(s->data_file), &(s->averaged_data), 1); // Record it + s->num_read = 0; + s->averaged_data.time_stamp = 0; + s->averaged_data.value = 0; + } } - else if (d.time_stamp < time_stamp) + else { - lower = index; + // Silence because strain sensors fail ~50% of the time :S + //Log(LOGWARN, "Failed to read sensor %s (%d,%d)", s->name, s->id,s->user_id); } - if (count != NULL) - *count += 1; - } - if (found != NULL) - *found = d; - return index; + clock_nanosleep(CLOCK_MONOTONIC, 0, &(s->sample_time), NULL); + + } + // Needed to keep pthreads happy + Log(LOGDEBUG, "Sensor %s (%d,%d) finished", s->name,s->id,s->user_id); + return NULL; } /** - * Print sensor data between two indexes in the file, using a given format - * @param s - Sensor to use - * @param start - Start index - * @param end - End index - * @param output_type - JSON, CSV or TSV output format + * Get a Sensor given its name + * @returns Sensor with the given name, NULL if there isn't one */ -void PrintData(Sensor * s, int start, int end, OutputType output_type) -{ - DataPoint buffer[SENSOR_QUERYBUFSIZ]; - int index = start; - - if (output_type == JSON) - { - FCGI_JSONValue("["); - } - - - while (index < end) - { - int to_read = end - index; - if (to_read > SENSOR_QUERYBUFSIZ) - { - to_read = SENSOR_QUERYBUFSIZ; - } - - int amount_read = 0; - // CRITICAL SECTION - pthread_mutex_lock(&(s->mutex)); - - fseek(s->file, index*sizeof(DataPoint), SEEK_SET); - amount_read = fread(buffer, sizeof(DataPoint), to_read, s->file); - - pthread_mutex_unlock(&(s->mutex)); - // End critical section - - if (amount_read != to_read) - { - Fatal("Failed to read %d DataPoints from sensor %d; read %d instead", to_read, s->id, amount_read); - } - - // Print the data - for (int i = 0; i < amount_read; ++i) - { - //TODO: Reformat? - switch (output_type) - { - case JSON: - FCGI_JSONValue("[%f, %f]", buffer[i].time_stamp, buffer[i].value); - if (i+1 < amount_read) - FCGI_JSONValue(","); - break; - case CSV: - FCGI_PrintRaw("%f,%f\n", buffer[i].time_stamp, buffer[i].value); - break; - case TSV: - default: - FCGI_PrintRaw("%f\t%f\n", buffer[i].time_stamp, buffer[i].value); - break; - } - } - index += amount_read; - } - - if (output_type == JSON) +Sensor * Sensor_Identify(const char * name) +{ + for (int i = 0; i < g_num_sensors; ++i) { - FCGI_JSONValue("]"); + if (strcmp(g_sensors[i].name, name) == 0) + return &(g_sensors[i]); } + return NULL; } /** - * Fill buffer with most recent sensor data - * TODO: This may be obselete; remove? - * @param s - Sensor to use - * @param buffer - Buffer to fill - * @param bufsiz - Size of buffer to fill - * @returns The number of DataPoints actually read + * Helper: Begin sensor response in a given format + * @param context - the FCGIContext + * @param id - ID of sensor + * @param format - Format */ -int Sensor_Query(Sensor * s, DataPoint * buffer, int bufsiz) +void Sensor_BeginResponse(FCGIContext * context, Sensor * s, DataFormat format) { - int amount_read = 0; - //CRITICAL SECTION (Don't access file while sensor thread is writing to it!) - pthread_mutex_lock(&(s->mutex)); - - fseek(s->file, -bufsiz*sizeof(DataPoint), SEEK_END); - amount_read = fread(buffer, sizeof(DataPoint), bufsiz, s->file); - //Log(LOGDEBUG, "Read %d data points", amount_read); - pthread_mutex_unlock(&(s->mutex)); - return amount_read; + // Begin response + switch (format) + { + case JSON: + FCGI_BeginJSON(context, STATUS_OK); + FCGI_JSONLong("id", s->id); + FCGI_JSONLong("user_id", s->user_id); //NOTE: Might not want to expose this? + FCGI_JSONPair("name", s->name); + break; + default: + FCGI_PrintRaw("Content-type: text/plain\r\n\r\n"); + break; + } } /** - * Get a Sensor given an ID string - * @param id_str ID string - * @returns Sensor* identified by the string; NULL on error + * Helper: End sensor response in a given format + * @param context - the FCGIContext + * @param id - ID of the sensor + * @param format - Format */ -Sensor * Sensor_Identify(const char * id_str) +void Sensor_EndResponse(FCGIContext * context, Sensor * s, DataFormat format) { - char * end; - // Parse string as integer - int id = strtol(id_str, &end, 10); - if (*end != '\0') + // End response + switch (format) { - return NULL; + case JSON: + FCGI_EndJSON(); + break; + default: + break; } - // Bounds check - if (id < 0 || id >= NUMSENSORS) - return NULL; - - - Log(LOGDEBUG, "Sensor \"%s\" identified", g_sensor_names[id]); - return g_sensors+id; } /** * Handle a request to the sensor module * @param context - The context to work in * @param params - Parameters passed - * TODO: Seriously need to write more helper functions and decrease the size of this function! */ void Sensor_Handler(FCGIContext *context, char * params) { - StatusCodes status = STATUS_OK; - - OutputType output_type = JSON; + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + double current_time = TIMEVAL_DIFF(now, *Control_GetStartTime()); + int id = 0; + const char * name = ""; + double start_time = 0; + double end_time = current_time; + const char * fmt_str; + double sample_s = 0; + + // key/value pairs + FCGIValue values[] = { + {"id", &id, FCGI_INT_T}, + {"name", &name, FCGI_STRING_T}, + {"format", &fmt_str, FCGI_STRING_T}, + {"start_time", &start_time, FCGI_DOUBLE_T}, + {"end_time", &end_time, FCGI_DOUBLE_T}, + {"sample_s", &sample_s, FCGI_DOUBLE_T} + }; + + // enum to avoid the use of magic numbers + typedef enum { + ID, + NAME, + FORMAT, + START_TIME, + END_TIME, + SAMPLE_S + } SensorParams; - - - const char * key; const char * value; - - Sensor * sensor = NULL; - - struct timeval now; - gettimeofday(&now, NULL); - - double start_time = -1; - double end_time = -1; - double current_time = (now.tv_sec - g_options.start_time.tv_sec) + 1e-6*(now.tv_usec - g_options.start_time.tv_usec); - bool seek_time = false; - bool points_specified = false; - int query_size = SENSOR_QUERYBUFSIZ; - int start_index = -1; - int end_index = -1; - - - while ((params = FCGI_KeyPair(params, &key, &value)) != NULL) - { - Log(LOGDEBUG, "Got key=%s and value=%s", key, value); - if (strcmp(key, "id") == 0) - { - if (sensor != NULL) - { - Log(LOGERR, "Only one sensor id should be specified"); - status = STATUS_ERROR; - break; - } - if (*value == '\0') - { - Log(LOGERR, "No id specified."); - status = STATUS_ERROR; - break; - } - - sensor = Sensor_Identify(value); - if (sensor == NULL) - { - Log(LOGERR, "Invalid sensor id: %s", value); - status = STATUS_ERROR; - break; - } - } - else if (strcmp(key, "format") == 0) - { - if (strcmp(value, "json") == 0) - output_type = JSON; - else if (strcmp(value, "csv") == 0) - output_type = CSV; - else if (strcmp(value, "tsv") == 0) - output_type = TSV; - } - else if (strcmp(key, "points") == 0) - { - points_specified = true; - if (strcmp(value, "all") == 0) - { - query_size = sensor->points_written; - } - else - { - char * end; - query_size = strtol(value, &end, 10); - if (*end != '\0') - { - Log(LOGERR, "Require \"all\" or an integer value: %s = %s", key, value); - status = STATUS_ERROR; - break; - } - } - - } - else if (strcmp(key, "start_time") == 0) - { - seek_time = true; - char * end; - start_time = strtod(value, &end); - if (*end != '\0') - { - Log(LOGERR, "Require a double: %s = %s", key, value); - status = STATUS_ERROR; - break; - } - - // Treat negative values as being relative to the current time - if (start_time < 0) - { - start_time = current_time + start_time; - } - start_time = floor(start_time); - } - else if (strcmp(key, "end_time") == 0) - { - seek_time = true; - char * end; - end_time = strtod(value, &end); - if (*end != '\0') - { - Log(LOGERR, "Require a double: %s = %s", key, value); - status = STATUS_ERROR; - break; - } - - // Treat negative values as being relative to the current time - if (end_time < 0) - { - end_time = current_time + end_time; - } - end_time = ceil(end_time); - } - // For backward compatability: - else if (strcmp(key, "dump") == 0) - { - output_type = TSV; - query_size = sensor->points_written+1; - } - else - { - Log(LOGERR, "Unknown key \"%s\" (value = %s)", key, value); - status = STATUS_ERROR; - break; - } - } - - if (status != STATUS_ERROR && sensor == NULL) + // Fill values appropriately + if (!FCGI_ParseRequest(context, params, values, sizeof(values)/sizeof(FCGIValue))) { - Log(LOGERR, "No valid sensor id given"); - status = STATUS_ERROR; - } - - if (status == STATUS_ERROR) - { - FCGI_RejectJSON(context, "Invalid input parameters"); + // Error occured; FCGI_RejectJSON already called return; } - - if (seek_time) + Sensor * s = NULL; + if (FCGI_RECEIVED(values[NAME].flags)) { - if (end_time < 0 && !points_specified) - end_index = sensor->points_written; - else + if (FCGI_RECEIVED(values[ID].flags)) { - int count = 0; DataPoint d; - end_index = FindTime(sensor, end_time, &count, &d); - Log(LOGDEBUG, "FindTime - Looked for %f; found [%f,%f] after %d iterations; sensor %d, position %d", end_time, d.time_stamp, d.value, count, sensor->id, end_index); + FCGI_RejectJSON(context, "Can't supply both sensor id and name"); + return; } - if (start_time < 0) - start_time = 0; - else + s = Sensor_Identify(name); + if (s == NULL) { - int count = 0; DataPoint d; - start_index = FindTime(sensor, start_time, &count, &d); - Log(LOGDEBUG, "FindTime - Looked for %f; found [%f,%f] after %d iterations; sensor %d, position %d", start_time, d.time_stamp, d.value, count, sensor->id, start_index); + FCGI_RejectJSON(context, "Unknown sensor name"); + return; } - - if (points_specified) - end_index = start_index + query_size; } - else + else if (!FCGI_RECEIVED(values[ID].flags)) { - start_index = sensor->points_written - query_size; - - end_index = sensor->points_written; + FCGI_RejectJSON(context, "No sensor id or name supplied"); + return; } - - if (start_index < 0) + else if (id < 0 || id >= g_num_sensors) { - Log(LOGNOTE, "start_index = %d => Clamped to 0", start_index); - start_index = 0; + FCGI_RejectJSON(context, "Invalid sensor id"); + return; } - if (end_index > sensor->points_written) + else { - Log(LOGNOTE, "end_index = %d => Clamped to %d", end_index, sensor->points_written); - end_index = sensor->points_written; + s = &(g_sensors[id]); } - - switch (output_type) + + // Adjust sample rate if necessary + if (FCGI_RECEIVED(values[SAMPLE_S].flags)) { - case JSON: - FCGI_BeginJSON(context, status); - FCGI_JSONLong("id", sensor->id); - FCGI_JSONKey("data"); - PrintData(sensor, start_index, end_index, output_type); - FCGI_EndJSON(); - break; - default: - FCGI_PrintRaw("Content-type: text/plain\r\n\r\n"); - PrintData(sensor, start_index, end_index, output_type); - //Force download with content-disposition - // Sam: This is cool, but I don't think we should do it - // - letting the user view it in the browser and then save with their own filename is more flexible - //"Content-disposition: attachment;filename=%d.csv\r\n\r\n", sensor->id); - break; + if (sample_s < 0) + { + FCGI_RejectJSON(context, "Negative sampling speed!"); + return; + } + DOUBLE_TO_TIMEVAL(sample_s, &(s->sample_time)); } + + DataFormat format = Data_GetFormat(&(values[FORMAT])); + + // Begin response + Sensor_BeginResponse(context, s, format); + + // Print Data + Data_Handler(&(s->data_file), &(values[START_TIME]), &(values[END_TIME]), format, current_time); + + // Finish response + Sensor_EndResponse(context, s, format); + } /** - * Setup Sensors, start Sensor polling thread(s) + * Get the Name of a Sensor + * @param id - ID number */ -void Sensor_Spawn() +const char * Sensor_GetName(int id) { - // start sensor threads - for (int i = 0; i < NUMSENSORS; ++i) - { - Init(g_sensors+i, i); - pthread_create(&(g_sensors[i].thread), NULL, Sensor_Main, (void*)(g_sensors+i)); - } + return g_sensors[id].name; } -/** - * Quit Sensor loops - */ -void Sensor_Join() +DataPoint Sensor_LastData(int id) { - if (!Thread_Runstate()) - { - Fatal("This function should not be called before Thread_QuitProgram"); - } - for (int i = 0; i < NUMSENSORS; ++i) - { - pthread_join(g_sensors[i].thread, NULL); - Destroy(g_sensors+i); - } + Sensor * s = &(g_sensors[id]); + return s->current_data; } + +