s->init = init; // Set init function
// Start by averaging values taken over a second
- s->sample_us = 1e6;
+ DOUBLE_TO_TIMEVAL(1e-4, &(s->sample_time));
s->averages = 1;
+ s->num_read = 0;
// Set sanity function
s->sanity = sanity;
Fatal("Couldn't init sensor %s", name);
}
-
+ s->current_data.time_stamp = 0;
+ s->current_data.value = 0;
return g_num_sensors;
}
{
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("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", STRAIN0, Strain_Read, Strain_Init, 5000,0,5000,0);
//Sensor_Add("strain1", STRAIN1, Strain_Read, Strain_Init, 5000,0,5000,0);
{
// Set filename
char filename[BUFSIZ];
- const char *experiment_name = (const char*) arg;
+ const char *experiment_path = (const char*) arg;
+ int ret;
- if (snprintf(filename, BUFSIZ, "%s_%d", experiment_name, s->id) >= BUFSIZ)
+ ret = snprintf(filename, BUFSIZ, "%s/sensor_%d", experiment_path, s->id);
+
+ if (ret >= BUFSIZ)
{
- Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ);
+ Fatal("Experiment path \"%s\" too long (%d, limit %d)",
+ experiment_path, ret, BUFSIZ);
}
Log(LOGDEBUG, "Sensor %d with DataFile \"%s\"", s->id, filename);
d.value = 0;
bool success = s->read(s->user_id, &(d.value));
- struct timeval t;
- gettimeofday(&t, NULL);
+ struct timespec t;
+ clock_gettime(CLOCK_MONOTONIC, &t);
d.time_stamp = TIMEVAL_DIFF(t, *Control_GetStartTime());
if (success)
Fatal("Sensor %s (%d,%d) reads unsafe value", s->name, s->id, s->user_id);
}
}
- Data_Save(&(s->data_file), &d, 1); // Record it
+ s->current_data.time_stamp += d.time_stamp;
+ s->current_data.value += d.value;
+
+ if (++(s->num_read) >= s->averages)
+ {
+ s->current_data.time_stamp /= s->averages;
+ s->current_data.value /= s->averages;
+ Data_Save(&(s->data_file), &(s->current_data), 1); // Record it
+ s->num_read = 0;
+ s->current_data.time_stamp = 0;
+ s->current_data.value = 0;
+ }
}
else
Log(LOGWARN, "Failed to read sensor %s (%d,%d)", s->name, s->id,s->user_id);
- usleep(s->sample_us);
+
+ clock_nanosleep(CLOCK_MONOTONIC, 0, &(s->sample_time), NULL);
+
}
// Needed to keep pthreads happy
*/
void Sensor_Handler(FCGIContext *context, char * params)
{
- struct timeval now;
- gettimeofday(&now, NULL);
+ 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;
FCGI_RejectJSON(context, "Negative sampling speed!");
return;
}
- s->sample_us = 1e6*sample_s;
+ DOUBLE_TO_TIMEVAL(sample_s, &(s->sample_time));
}