Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge pull request #3303 from PX4/linux_errno

Browse Source 
fix sem error for linux
This commit is contained in:
Roman Bapst
2015-12-01 17:20:01 +01:00
parent bbc307e254 f91af2221f
commit 3f984092a9
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/device/vdev_posix.cpp
+3
View File
@@ -301,6 +301,9 @@ extern "C" {
// Execute a blocking wait for that time in the future // Execute a blocking wait for that time in the future
errno = 0; errno = 0;
ret = px4_sem_timedwait(&sem, &ts); ret = px4_sem_timedwait(&sem, &ts);
#ifndef __PX4_DARWIN
ret = errno;
#endif
// Ensure ret is negative on failure // Ensure ret is negative on failure
if (ret > 0) { if (ret > 0) {
src/platforms/posix/px4_layer/px4_sem.cpp
+3 -5
View File
@@ -95,6 +95,7 @@ int px4_sem_timedwait(px4_sem_t *s, const struct timespec *abstime)
} }
s->value--; s->value--;
errno = 0;
if (s->value < 0) { if (s->value < 0) {
ret = pthread_cond_timedwait(&(s->wait), &(s->lock), abstime); ret = pthread_cond_timedwait(&(s->wait), &(s->lock), abstime);
@@ -103,10 +104,7 @@ int px4_sem_timedwait(px4_sem_t *s, const struct timespec *abstime)
ret = 0; ret = 0;
} }
int err = errno; int err = ret;
#ifdef __PX4_DARWIN
err = ret;
#endif
if (err != 0 && err != ETIMEDOUT) { if (err != 0 && err != ETIMEDOUT) {
setbuf(stdout, NULL); setbuf(stdout, NULL);
@@ -119,7 +117,7 @@ int px4_sem_timedwait(px4_sem_t *s, const struct timespec *abstime)
int mret = pthread_mutex_unlock(&(s->lock)); int mret = pthread_mutex_unlock(&(s->lock));
return (ret) ? ret : mret; return (err) ? err : mret;
} }
int px4_sem_post(px4_sem_t *s) int px4_sem_post(px4_sem_t *s)