#include <stdlib.h>
#include <ctype.h>
#include <fcntl.h>
+#include <pthread.h>
#include <sys/epoll.h>
#include <sys/socket.h>
#include <utils/Log.h>
#include "utils.h"
#include "transform.h"
#include "calibration.h"
+#include "description.h"
/* Currently active sensors count, per device */
static int poll_sensors_per_dev[MAX_DEVICES]; /* poll-mode sensors */
static int poll_fd; /* epoll instance covering all enabled sensors */
-static int poll_socket_pair[2]; /* used to unblock the poll loop */
-
-/* Timestamp for the moment when we last exited a poll operation */
-static int64_t last_poll_exit_ts;
-
static int active_poll_sensors; /* Number of enabled poll-mode sensors */
-#define INVALID_DEV_NUM ((uint32_t) -1)
+/* We use pthread condition variables to get worker threads out of sleep */
+static pthread_cond_t thread_release_cond [MAX_SENSORS];
+static pthread_mutex_t thread_release_mutex [MAX_SENSORS];
+
+/*
+ * We associate tags to each of our poll set entries. These tags have the
+ * following values:
+ * - a iio device number if the fd is a iio character device fd
+ * - THREAD_REPORT_TAG_BASE + sensor handle if the fd is the receiving end of a
+ * pipe used by a sysfs data acquisition thread
+ * */
+#define THREAD_REPORT_TAG_BASE 0x00010000
static int enable_buffer(int dev_num, int enabled)
break;
case SENSOR_TYPE_GYROSCOPE:
+ case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
gyro_cal_init(&sensor_info[s]);
break;
}
ALOGI("Disabling sensor %d (iio device %d: %s)\n", s, dev_num,
sensor_info[s].friendly_name);
- if (sensor_type == SENSOR_TYPE_MAGNETIC_FIELD)
- compass_store_data(&sensor_info[s]);
-
sensor_info[s].enable_count--;
if (sensor_info[s].enable_count > 0)
/* Sensor disabled, lower report available flag */
sensor_info[s].report_pending = 0;
+
+ if (sensor_type == SENSOR_TYPE_MAGNETIC_FIELD)
+ compass_store_data(&sensor_info[s]);
}
+
+ /* If uncalibrated type and pair is already active don't adjust counters */
+ if (sensor_type == SENSOR_TYPE_GYROSCOPE_UNCALIBRATED &&
+ sensor_info[sensor_info[s].pair_idx].enable_count != 0)
+ return 0;
+
/* We changed the state of a sensor - adjust per iio device counters */
/* If this is a regular event-driven sensor */
}
+static int get_field_count (int s)
+{
+ int catalog_index = sensor_info[s].catalog_index;
+ int sensor_type = sensor_catalog[catalog_index].type;
+
+ switch (sensor_type) {
+ case SENSOR_TYPE_ACCELEROMETER: /* m/s^2 */
+ case SENSOR_TYPE_MAGNETIC_FIELD: /* micro-tesla */
+ case SENSOR_TYPE_ORIENTATION: /* degrees */
+ case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
+ case SENSOR_TYPE_GYROSCOPE: /* radians/s */
+ return 3;
+
+ case SENSOR_TYPE_LIGHT: /* SI lux units */
+ case SENSOR_TYPE_AMBIENT_TEMPERATURE: /* °C */
+ case SENSOR_TYPE_TEMPERATURE: /* °C */
+ case SENSOR_TYPE_PROXIMITY: /* centimeters */
+ case SENSOR_TYPE_PRESSURE: /* hecto-pascal */
+ case SENSOR_TYPE_RELATIVE_HUMIDITY: /* percent */
+ return 1;
+
+ case SENSOR_TYPE_ROTATION_VECTOR:
+ return 4;
+
+ default:
+ ALOGE("Unknown sensor type!\n");
+ return 0; /* Drop sample */
+ }
+}
+
+
+static void time_add(struct timespec *out, struct timespec *in, int64_t ns)
+{
+ int64_t target_ts = 1000000000LL * in->tv_sec + in->tv_nsec + ns;
+
+ out->tv_sec = target_ts / 1000000000;
+ out->tv_nsec = target_ts % 1000000000;
+}
+
+
+static void* acquisition_routine (void* param)
+{
+ /*
+ * Data acquisition routine run in a dedicated thread, covering a single
+ * sensor. This loop will periodically retrieve sampling data through
+ * sysfs, then package it as a sample and transfer it to our master poll
+ * loop through a report fd. Checks for a cancellation signal quite
+ * frequently, as the thread may be disposed of at any time. Note that
+ * Bionic does not provide pthread_cancel / pthread_testcancel...
+ */
+
+ int s = (int) param;
+ int num_fields;
+ struct sensors_event_t data = {0};
+ int c;
+ int ret;
+ struct timespec entry_time;
+ struct timespec target_time;
+ int64_t period;
+
+ ALOGV("Entering data acquisition thread for sensor %d\n", s);
+
+ if (s < 0 || s >= sensor_count) {
+ ALOGE("Invalid sensor handle!\n");
+ return NULL;
+ }
+
+ if (!sensor_info[s].sampling_rate) {
+ ALOGE("Zero rate in acquisition routine for sensor %d\n", s);
+ return NULL;
+ }
+
+ num_fields = get_field_count(s);
+
+ /*
+ * Each condition variable is associated to a mutex that has to be
+ * locked by the thread that's waiting on it. We use these condition
+ * variables to get the acquisition threads out of sleep quickly after
+ * the sampling rate is adjusted, or the sensor is disabled.
+ */
+ pthread_mutex_lock(&thread_release_mutex[s]);
+
+ while (1) {
+ /* Pinpoint the moment we start sampling */
+ clock_gettime(CLOCK_REALTIME, &entry_time);
+
+ ALOGV("Acquiring sample data for sensor %d through sysfs\n", s);
+
+ /* Read values through sysfs */
+ for (c=0; c<num_fields; c++) {
+ data.data[c] = acquire_immediate_value(s, c);
+
+ /* Check and honor termination requests */
+ if (sensor_info[s].thread_data_fd[1] == -1)
+ goto exit;
+
+ ALOGV("\tfield %d: %f\n", c, data.data[c]);
+
+ }
+
+ /* If the sample looks good */
+ if (sensor_info[s].ops.finalize(s, &data)) {
+
+ /* Pipe it for transmission to poll loop */
+ ret = write( sensor_info[s].thread_data_fd[1],
+ data.data,
+ num_fields * sizeof(float));
+ }
+
+ /* Check and honor termination requests */
+ if (sensor_info[s].thread_data_fd[1] == -1)
+ goto exit;
+
+
+ period = (int64_t) (1000000000.0/ sensor_info[s].sampling_rate);
+
+ time_add(&target_time, &entry_time, period);
+
+ /*
+ * Wait until the sampling time elapses, or a rate change is
+ * signaled, or a thread exit is requested.
+ */
+ ret = pthread_cond_timedwait( &thread_release_cond[s],
+ &thread_release_mutex[s],
+ &target_time);
+
+ /* Check and honor termination requests */
+ if (sensor_info[s].thread_data_fd[1] == -1)
+ goto exit;
+ }
+
+exit:
+ ALOGV("Acquisition thread for S%d exiting\n", s);
+ pthread_mutex_unlock(&thread_release_mutex[s]);
+ pthread_exit(0);
+ return NULL;
+}
+
+
+static void start_acquisition_thread (int s)
+{
+ int incoming_data_fd;
+ int ret;
+
+ struct epoll_event ev = {0};
+
+ ALOGV("Initializing acquisition context for sensor %d\n", s);
+
+ /* Create condition variable and mutex for quick thread release */
+ ret = pthread_cond_init(&thread_release_cond[s], NULL);
+ ret = pthread_mutex_init(&thread_release_mutex[s], NULL);
+
+ /* Create a pipe for inter thread communication */
+ ret = pipe(sensor_info[s].thread_data_fd);
+
+ incoming_data_fd = sensor_info[s].thread_data_fd[0];
+
+ ev.events = EPOLLIN;
+ ev.data.u32 = THREAD_REPORT_TAG_BASE + s;
+
+ /* Add incoming side of pipe to our poll set, with a suitable tag */
+ ret = epoll_ctl(poll_fd, EPOLL_CTL_ADD, incoming_data_fd , &ev);
+
+ /* Create and start worker thread */
+ ret = pthread_create( &sensor_info[s].acquisition_thread,
+ NULL,
+ acquisition_routine,
+ (void*) s);
+}
+
+
+static void stop_acquisition_thread (int s)
+{
+ int incoming_data_fd = sensor_info[s].thread_data_fd[0];
+ int outgoing_data_fd = sensor_info[s].thread_data_fd[1];
+
+ ALOGV("Tearing down acquisition context for sensor %d\n", s);
+
+ /* Delete the incoming side of the pipe from our poll set */
+ epoll_ctl(poll_fd, EPOLL_CTL_DEL, incoming_data_fd, NULL);
+
+ /* Mark the pipe ends as invalid ; that's a cheap exit flag */
+ sensor_info[s].thread_data_fd[0] = -1;
+ sensor_info[s].thread_data_fd[1] = -1;
+
+ /* Close both sides of our pipe */
+ close(incoming_data_fd);
+ close(outgoing_data_fd);
+
+ /* Stop acquisition thread and clean up thread handle */
+ pthread_cond_signal(&thread_release_cond[s]);
+ pthread_join(sensor_info[s].acquisition_thread, NULL);
+
+ /* Clean up our sensor descriptor */
+ sensor_info[s].acquisition_thread = -1;
+
+ /* Delete condition variable and mutex */
+ pthread_cond_destroy(&thread_release_cond[s]);
+ pthread_mutex_destroy(&thread_release_mutex[s]);
+}
+
+
int sensor_activate(int s, int enabled)
{
char device_name[PATH_MAX];
- char trigger_name[MAX_NAME_SIZE + 16];
- int c;
struct epoll_event ev = {0};
int dev_fd;
int ret;
int dev_num = sensor_info[s].dev_num;
- int i = sensor_info[s].catalog_index;
int is_poll_sensor = !sensor_info[s].num_channels;
+ /* If we want to activate gyro calibrated and gyro uncalibrated is activated
+ * Deactivate gyro uncalibrated - Uncalibrated releases handler
+ * Activate gyro calibrated - Calibrated has handler
+ * Reactivate gyro uncalibrated - Uncalibrated gets data from calibrated */
+
+ /* If we want to deactivate gyro calibrated and gyro uncalibrated is active
+ * Deactivate gyro uncalibrated - Uncalibrated no longer gets data from handler
+ * Deactivate gyro calibrated - Calibrated releases handler
+ * Reactivate gyro uncalibrated - Uncalibrated has handler */
+
+ if (sensor_catalog[sensor_info[s].catalog_index].type == SENSOR_TYPE_GYROSCOPE &&
+ sensor_info[s].pair_idx && sensor_info[sensor_info[s].pair_idx].enable_count != 0) {
+
+ sensor_activate(sensor_info[s].pair_idx, 0);
+ ret = sensor_activate(s, enabled);
+ sensor_activate(sensor_info[s].pair_idx, 1);
+ return ret;
+ }
+
ret = adjust_counters(s, enabled);
/* If the operation was neutral in terms of state, we're done */
if (ret <= 0)
return ret;
+
if (!is_poll_sensor) {
/* Stop sampling */
/* If there's at least one sensor enabled on this iio device */
if (trig_sensors_per_dev[dev_num]) {
- sprintf(trigger_name, "%s-dev%d",
- sensor_info[s].internal_name, dev_num);
/* Start sampling */
- setup_trigger(dev_num, trigger_name);
+ setup_trigger(dev_num, sensor_info[s].trigger_name);
enable_buffer(dev_num, 1);
}
}
dev_fd = device_fd[dev_num];
if (!enabled) {
+ if (is_poll_sensor)
+ stop_acquisition_thread(s);
+
if (dev_fd != -1 && !poll_sensors_per_dev[dev_num] &&
!trig_sensors_per_dev[dev_num]) {
/*
close(dev_fd);
device_fd[dev_num] = -1;
}
+
+ /* If we recorded a trail of samples for filtering, delete it */
+ if (sensor_info[s].history) {
+ free(sensor_info[s].history);
+ sensor_info[s].history = NULL;
+ sensor_info[s].history_size = 0;
+ }
return 0;
}
}
}
- /* Release the polling loop so an updated timeout gets used */
- write(poll_socket_pair[1], "", 1);
+ /* Ensure that on-change sensors send at least one event after enable */
+ sensor_info[s].prev_val = -1;
+
+ if (is_poll_sensor)
+ start_acquisition_thread(s);
return 0;
}
unsigned char *target;
unsigned char *source;
int size;
- int ts;
+ int64_t ts;
- /* There's an incoming report on the specified fd */
+ /* There's an incoming report on the specified iio device char dev fd */
if (dev_num < 0 || dev_num >= MAX_DEVICES) {
ALOGE("Event reported on unexpected iio device %d\n", dev_num);
ALOGV("Read %d bytes from iio device %d\n", len, dev_num);
+ /* Map device report to sensor reports */
+
for (s=0; s<MAX_SENSORS; s++)
if (sensor_info[s].dev_num == dev_num &&
sensor_info[s].enable_count) {
sensor_info[s].report_ts = ts;
sensor_info[s].report_pending = 1;
+ sensor_info[s].report_initialized = 1;
}
return 0;
}
-static int propagate_sensor_report(int s, struct sensors_event_t* data)
+static int propagate_sensor_report(int s, struct sensors_event_t *data)
{
/* There's a sensor report pending for this sensor ; transmit it */
int catalog_index = sensor_info[s].catalog_index;
- int sensor_type = sensor_catalog[catalog_index].type;
- int num_fields;
+ int sensor_type = sensor_catalog[catalog_index].type;
+ int num_fields = get_field_count(s);
int c;
unsigned char* current_sample;
- int64_t current_ts = get_timestamp();
- int64_t delta;
-
- memset(data, 0, sizeof(sensors_event_t));
- data->version = sizeof(sensors_event_t);
- data->sensor = s;
- data->type = sensor_type;
-
- if (sensor_info[s].report_ts)
- data->timestamp = sensor_info[s].report_ts;
- else
- data->timestamp = current_ts;
-
- switch (sensor_type) {
- case SENSOR_TYPE_ACCELEROMETER: /* m/s^2 */
- case SENSOR_TYPE_MAGNETIC_FIELD: /* micro-tesla */
- case SENSOR_TYPE_ORIENTATION: /* degrees */
- case SENSOR_TYPE_GYROSCOPE: /* radians/s */
- num_fields = 3;
- break;
+ /* If there's nothing to return... we're done */
+ if (!num_fields)
+ return 0;
- case SENSOR_TYPE_LIGHT: /* SI lux units */
- case SENSOR_TYPE_AMBIENT_TEMPERATURE: /* °C */
- case SENSOR_TYPE_TEMPERATURE: /* °C */
- case SENSOR_TYPE_PROXIMITY: /* centimeters */
- case SENSOR_TYPE_PRESSURE: /* hecto-pascal */
- case SENSOR_TYPE_RELATIVE_HUMIDITY: /* percent */
- num_fields = 1;
- break;
- case SENSOR_TYPE_ROTATION_VECTOR:
- num_fields = 4;
- break;
+ /* Only return uncalibrated event if also gyro active */
+ if (sensor_type == SENSOR_TYPE_GYROSCOPE_UNCALIBRATED &&
+ sensor_info[sensor_info[s].pair_idx].enable_count != 0)
+ return 0;
- case SENSOR_TYPE_DEVICE_PRIVATE_BASE: /* Hidden for now */
- return 0; /* Drop sample */
+ memset(data, 0, sizeof(sensors_event_t));
- default:
- ALOGE("Unknown sensor type!\n");
- return 0; /* Drop sample */
- }
+ data->version = sizeof(sensors_event_t);
+ data->sensor = s;
+ data->type = sensor_type;
+ data->timestamp = sensor_info[s].report_ts;
ALOGV("Sample on sensor %d (type %d):\n", s, sensor_type);
- /* Take note of current time counter value for rate control purposes */
- sensor_info[s].last_integration_ts = current_ts;
+ current_sample = sensor_info[s].report_buffer;
- /* If we're dealing with a poll-mode sensor */
+ /* If this is a poll sensor */
if (!sensor_info[s].num_channels) {
-
- /* Read values through sysfs rather than from a report buffer */
- for (c=0; c<num_fields; c++) {
-
- data->data[c] = acquire_immediate_value(s, c);
-
- ALOGV("\tfield %d: %f\n", c, data->data[c]);
- }
-
- /* Control acquisition time and flag anything beyond 100 ms */
- delta = get_timestamp() - current_ts;
-
- if (delta > 100 * 1000 * 1000) {
- ALOGI("Sensor %d (%s) sampling time: %d ms\n", s,
- sensor_info[s].friendly_name, (int) (delta / 1000000));
- }
-
- return sensor_info[s].ops.finalize(s, data);
+ /* Use the data provided by the acquisition thread */
+ ALOGV("Reporting data from worker thread for S%d\n", s);
+ memcpy(data->data, current_sample, num_fields * sizeof(float));
+ return 1;
}
/* Convert the data into the expected Android-level format */
-
- current_sample = sensor_info[s].report_buffer;
-
for (c=0; c<num_fields; c++) {
data->data[c] = sensor_info[s].ops.transform
}
-static int get_poll_time (void)
+static void synthetize_duplicate_samples (void)
{
- int64_t target_ts;
- int64_t lowest_target_ts;
- int64_t current_ts;
+ /*
+ * Some sensor types (ex: gyroscope) are defined as continuously firing
+ * by Android, despite the fact that we can be dealing with iio drivers
+ * that only report events for new samples. For these we generate
+ * reports periodically, duplicating the last data we got from the
+ * driver. This is not necessary for polling sensors.
+ */
+
int s;
+ int64_t current_ts;
+ int64_t target_ts;
+ int64_t period;
- if (!active_poll_sensors)
- return -1; /* Infinite wait */
+ for (s=0; s<sensor_count; s++) {
- /* Check if we should schedule a poll-mode sensor event delivery */
+ /* Ignore disabled sensors */
+ if (!sensor_info[s].enable_count)
+ continue;
- lowest_target_ts = INT64_MAX;
+ /* If the sensor can generate duplicates, leave it alone */
+ if (!(sensor_info[s].quirks & QUIRK_TERSE_DRIVER))
+ continue;
- for (s=0; s<sensor_count; s++)
- if (sensor_info[s].enable_count &&
- sensor_info[s].sampling_rate > 0 &&
- !sensor_info[s].num_channels) {
- target_ts = sensor_info[s].last_integration_ts +
- 1000000000LL/sensor_info[s].sampling_rate;
+ /* If we haven't seen a sample, there's nothing to duplicate */
+ if (!sensor_info[s].report_initialized)
+ continue;
- if (target_ts < lowest_target_ts)
- lowest_target_ts = target_ts;
- }
+ /* If a sample was recently buffered, leave it alone too */
+ if (sensor_info[s].report_pending)
+ continue;
- if (lowest_target_ts == INT64_MAX)
- return -1;
+ /* We also need a valid sampling rate to be configured */
+ if (!sensor_info[s].sampling_rate)
+ continue;
- current_ts = get_timestamp();
+ period = (int64_t) (1000000000.0/ sensor_info[s].sampling_rate);
- if (lowest_target_ts <= current_ts)
- return 0;
+ current_ts = get_timestamp();
+ target_ts = sensor_info[s].report_ts + period;
- return (lowest_target_ts - current_ts)/1000000; /* ms */
+ if (target_ts <= current_ts) {
+ /* Mark the sensor for event generation */
+ sensor_info[s].report_ts = current_ts;
+ sensor_info[s].report_pending = 1;
+ }
+ }
}
-static void acknowledge_release (void)
+static void integrate_thread_report (uint32_t tag)
{
- /* A write to our socket circuit was performed to release epoll */
- char buf;
- read(poll_socket_pair[0], &buf, 1);
+ int s = tag - THREAD_REPORT_TAG_BASE;
+ int len;
+ int expected_len;
+
+ expected_len = get_field_count(s) * sizeof(float);
+
+ len = read(sensor_info[s].thread_data_fd[0],
+ sensor_info[s].report_buffer,
+ expected_len);
+
+ if (len == expected_len) {
+ sensor_info[s].report_ts = get_timestamp();
+ sensor_info[s].report_pending = 1;
+ }
+}
+
+
+static int get_poll_wait_timeout (void)
+{
+ /*
+ * Compute an appropriate timeout value, in ms, for the epoll_wait
+ * call that's going to await for iio device reports and incoming
+ * reports from our sensor sysfs data reader threads.
+ */
+
+ int s;
+ int64_t target_ts = INT64_MAX;
+ int64_t ms_to_wait;
+ int64_t period;
+
+ /*
+ * Check if have have to deal with "terse" drivers that only send events
+ * when there is motion, despite the fact that the associated Android
+ * sensor type is continuous rather than on-change. In that case we have
+ * to duplicate events. Check deadline for the nearest upcoming event.
+ */
+ for (s=0; s<sensor_count; s++)
+ if (sensor_info[s].enable_count &&
+ (sensor_info[s].quirks & QUIRK_TERSE_DRIVER) &&
+ sensor_info[s].sampling_rate) {
+ period = (int64_t) (1000000000.0 /
+ sensor_info[s].sampling_rate);
+
+ if (sensor_info[s].report_ts + period < target_ts)
+ target_ts = sensor_info[s].report_ts + period;
+ }
+
+ /* If we don't have such a driver to deal with */
+ if (target_ts == INT64_MAX)
+ return -1; /* Infinite wait */
+
+ ms_to_wait = (target_ts - get_timestamp()) / 1000000;
+
+ /*
+ * If the target timestamp is very close or already behind us, wait
+ * nonetheless for a millisecond in order to a) avoid busy loops, and
+ * b) give a chance for the driver to report data before we repeat the
+ * last received sample.
+ */
+ if (ms_to_wait <= 0)
+ return 1;
+
+ return ms_to_wait;
}
int s;
int i;
int nfds;
- int delta;
struct epoll_event ev[MAX_DEVICES];
- int64_t target_ts;
+ int returned_events;
+ int event_count;
/* Get one or more events from our collection of sensors */
-return_first_available_sensor_report:
+return_available_sensor_reports:
- /* If there's at least one available report */
- for (s=0; s<sensor_count; s++)
- if (sensor_info[s].report_pending) {
+ returned_events = 0;
+ /* Check our sensor collection for available reports */
+ for (s=0; s<sensor_count && returned_events < count; s++)
+ if (sensor_info[s].report_pending) {
+ event_count = 0;
/* Lower flag */
sensor_info[s].report_pending = 0;
- if (propagate_sensor_report(s, data)) {
- /* Return that up */
- ALOGV("Report on sensor %d\n", s);
- return 1;
+ /* Report this event if it looks OK */
+ event_count = propagate_sensor_report(s, &data[returned_events]);
+
+ /* Duplicate only if both cal & uncal are active */
+ if (sensor_catalog[sensor_info[s].catalog_index].type == SENSOR_TYPE_GYROSCOPE &&
+ sensor_info[s].pair_idx && sensor_info[sensor_info[s].pair_idx].enable_count != 0) {
+ struct gyro_cal* gyro_data = (struct gyro_cal*) sensor_info[s].cal_data;
+
+ memcpy(&data[returned_events + event_count], &data[returned_events],
+ sizeof(struct sensors_event_t) * event_count);
+ for (i = 0; i < event_count; i++) {
+ data[returned_events + i].type = SENSOR_TYPE_GYROSCOPE_UNCALIBRATED;
+ data[returned_events + i].sensor = sensor_info[s].pair_idx;
+
+ data[returned_events + i].data[0] = data[returned_events + i].data[0] + gyro_data->bias[0];
+ data[returned_events + i].data[1] = data[returned_events + i].data[1] + gyro_data->bias[1];
+ data[returned_events + i].data[2] = data[returned_events + i].data[2] + gyro_data->bias[2];
+
+ data[returned_events + i].uncalibrated_gyro.bias[0] = gyro_data->bias[0];
+ data[returned_events + i].uncalibrated_gyro.bias[1] = gyro_data->bias[1];
+ data[returned_events + i].uncalibrated_gyro.bias[2] = gyro_data->bias[2];
+ }
+ event_count <<= 1;
}
-
+ sensor_info[sensor_info[s].pair_idx].report_pending = 0;
+ returned_events += event_count;
/*
* If the sample was deemed invalid or unreportable,
* e.g. had the same value as the previously reported
- * value for a 'on change' sensor, silently drop it
+ * value for a 'on change' sensor, silently drop it.
*/
}
+
+ if (returned_events)
+ return returned_events;
+
await_event:
ALOGV("Awaiting sensor data\n");
- nfds = epoll_wait(poll_fd, ev, MAX_DEVICES, get_poll_time());
-
- last_poll_exit_ts = get_timestamp();
+ nfds = epoll_wait(poll_fd, ev, MAX_DEVICES, get_poll_wait_timeout());
if (nfds == -1) {
- ALOGI("epoll_wait returned -1 (%s)\n", strerror(errno));
+ ALOGE("epoll_wait returned -1 (%s)\n", strerror(errno));
goto await_event;
}
+ /* Synthetize duplicate samples if needed */
+ synthetize_duplicate_samples();
+
ALOGV("%d fds signalled\n", nfds);
- /* For each of the devices for which a report is available */
+ /* For each of the signalled sources */
for (i=0; i<nfds; i++)
- if (ev[i].events == EPOLLIN) {
- if (ev[i].data.u32 == INVALID_DEV_NUM) {
- acknowledge_release();
- goto await_event;
- } else
- /* Read report */
- integrate_device_report(ev[i].data.u32);
- }
-
- /* Check poll-mode sensors and fire up an event if it's time to do so */
- if (active_poll_sensors)
- for (s=0; s<sensor_count; s++)
- if (sensor_info[s].enable_count &&
- !sensor_info[s].num_channels &&
- sensor_info[s].sampling_rate > 0) {
- target_ts = sensor_info[s].last_integration_ts +
- 1000000000LL/sensor_info[s].sampling_rate;
-
- if (last_poll_exit_ts >= target_ts)
- sensor_info[s].report_pending = 1;
+ if (ev[i].events == EPOLLIN)
+ switch (ev[i].data.u32) {
+ case 0 ... MAX_DEVICES-1:
+ /* Read report from iio char dev fd */
+ integrate_device_report(ev[i].data.u32);
+ break;
+
+ case THREAD_REPORT_TAG_BASE ...
+ THREAD_REPORT_TAG_BASE + MAX_SENSORS-1:
+ /* Get report from acquisition thread */
+ integrate_thread_report(ev[i].data.u32);
+ break;
+
+ default:
+ ALOGW("Unexpected event source!\n");
+ break;
}
- goto return_first_available_sensor_report;
+ goto return_available_sensor_reports;
}
const char *prefix = sensor_catalog[i].tag;
float new_sampling_rate; /* Granted sampling rate after arbitration */
float cur_sampling_rate; /* Currently used sampling rate */
- float req_sampling_rate; /* Requested ; may be different from granted */
int per_sensor_sampling_rate;
int per_device_sampling_rate;
- int max_supported_rate = 0;
+ float max_supported_rate = 0;
char freqs_buf[100];
char* cursor;
int n;
- int sr;
+ float sr;
if (!ns) {
ALOGE("Rejecting zero delay request on sensor %d\n", s);
return -EINVAL;
}
- new_sampling_rate = req_sampling_rate = 1000000000L/ns;
+ new_sampling_rate = 1000000000LL/ns;
- if (new_sampling_rate < 1) {
- ALOGI("Sub-HZ sampling rate requested on on sensor %d\n", s);
+ /*
+ * Artificially limit ourselves to 1 Hz or higher. This is mostly to
+ * avoid setting up the stage for divisions by zero.
+ */
+ if (new_sampling_rate < 1)
new_sampling_rate = 1;
- }
sensor_info[s].sampling_rate = new_sampling_rate;
- /* If we're dealing with a poll-mode sensor, release poll and return */
- if (!sensor_info[s].num_channels)
- goto exit;
+ /* If we're dealing with a poll-mode sensor */
+ if (!sensor_info[s].num_channels) {
+ /* Interrupt current sleep so the new sampling gets used */
+ pthread_cond_signal(&thread_release_cond[s]);
+ return 0;
+ }
sprintf(sysfs_path, SENSOR_SAMPLING_PATH, dev_num, prefix);
/* Decode a single value */
sr = strtod(cursor, NULL);
- /* Cap sampling rate to CAP_SENSOR_MAX_FREQUENCY*/
- if (sr > CAP_SENSOR_MAX_FREQUENCY)
- break;
-
if (sr > max_supported_rate)
max_supported_rate = sr;
* in the allowed frequencies string.
*/
if (sr > new_sampling_rate) {
- ALOGI(
- "Increasing sampling rate on sensor %d from %g to %g\n",
- s, (double) req_sampling_rate, (double) sr);
-
new_sampling_rate = sr;
break;
}
if (max_supported_rate &&
new_sampling_rate > max_supported_rate) {
new_sampling_rate = max_supported_rate;
- ALOGI( "Can't support %g sampling rate, lowering to %g\n",
- (double) req_sampling_rate, (double) new_sampling_rate);
}
if (new_sampling_rate == cur_sampling_rate)
return 0;
- ALOGI("Sensor %d sampling rate switched to %g\n", s, new_sampling_rate);
+ ALOGI("Sensor %d sampling rate set to %g\n", s, new_sampling_rate);
if (trig_sensors_per_dev[dev_num])
enable_buffer(dev_num, 0);
if (trig_sensors_per_dev[dev_num])
enable_buffer(dev_num, 1);
-exit:
- /* Release the polling loop so an updated timeout value gets used */
- write(poll_socket_pair[1], "", 1);
-
return 0;
}
-
int allocate_control_data (void)
{
int i;
- struct epoll_event ev = {0};
for (i=0; i<MAX_DEVICES; i++)
device_fd[i] = -1;
return -1;
}
- /* Create and add "unblocking" fd to the set of watched fds */
-
- if (socketpair(AF_UNIX, SOCK_STREAM, 0, poll_socket_pair) == -1) {
- ALOGE("Can't create socket pair for iio sensors!\n");
- close(poll_fd);
- return -1;
- }
-
- ev.events = EPOLLIN;
- ev.data.u32 = INVALID_DEV_NUM;
-
- epoll_ctl(poll_fd, EPOLL_CTL_ADD, poll_socket_pair[0], &ev);
-
return poll_fd;
}