fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 06:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

VDev: Switch to a timed wait semaphore

Browse Source
This commit is contained in:
Lorenz Meier
2015-11-23 19:51:45 +01:00
parent 1b91f78430
commit f42b338f16
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/device/vdev_posix.cpp
+5 -14
View File
@@ -56,13 +56,6 @@ pthread_mutex_t filemutex = PTHREAD_MUTEX_INITIALIZER;
extern "C" {
static void timer_cb(void *data)
{
px4_sem_t *p_sem = (px4_sem_t *)data;
px4_sem_post(p_sem);
PX4_DEBUG("timer_handler: Timer expired");
}
#define PX4_MAX_FD 200
static device::file_t *filemap[PX4_MAX_FD] = {};
@@ -269,15 +262,13 @@ extern "C" {
if (ret >= 0) {
if (timeout > 0) {
// Use a work queue task
work_s _hpwork = {};
hrt_work_queue(&_hpwork, (worker_t)&timer_cb, (void *)&sem, 1000 * timeout);
px4_sem_wait(&sem);
struct timespec ts;
px4_clock_gettime(CLOCK_REALTIME, &ts);
ts.tv_sec += timeout / 1000;
ts.tv_nsec += (1000 * 1000 * timeout) % (1000 * 1000 * 1000);
// Make sure timer thread is killed before sem goes
// out of scope
hrt_work_cancel(&_hpwork);
px4_sem_timedwait(&sem, &ts);
} else if (timeout < 0) {
px4_sem_wait(&sem);