35 lines
988 B
Plaintext
35 lines
988 B
Plaintext
$OpenBSD: patch-src_fifo_cpp,v 1.2 2012/06/23 12:23:31 ajacoutot Exp $
|
|
--- src/fifo.cpp.orig Fri Jan 6 18:03:00 2012
|
|
+++ src/fifo.cpp Sat Jun 23 12:40:10 2012
|
|
@@ -39,6 +39,12 @@
|
|
#include "wave.h"
|
|
#include "debug.h"
|
|
|
|
+#ifndef timespeccmp
|
|
+#define timespeccmp(tvp, uvp, cmp) \
|
|
+ (((tvp)->tv_sec == (uvp)->tv_sec) ? \
|
|
+ ((tvp)->tv_nsec cmp (uvp)->tv_nsec) : \
|
|
+ ((tvp)->tv_sec cmp (uvp)->tv_sec))
|
|
+#endif
|
|
|
|
//>
|
|
//<decls and function prototypes
|
|
@@ -310,10 +316,14 @@ static int sleep_until_start_request_or_inactivity()
|
|
to.tv_sec, to.tv_nsec,
|
|
ts.tv_sec, ts.tv_nsec);
|
|
|
|
- while ((err = sem_timedwait(&my_sem_start_is_required, &ts)) == -1
|
|
- && errno == EINTR)
|
|
+ while ((err = sem_trywait(&my_sem_start_is_required)) == -1
|
|
+ && (errno == EINTR || errno == EAGAIN))
|
|
{
|
|
- continue;
|
|
+ struct timespec help;
|
|
+ clock_gettime2(&help);
|
|
+ if (timespeccmp(&help, &ts, >=))
|
|
+ break;
|
|
+ sched_yield();
|
|
}
|
|
|
|
assert (gettimeofday(&tv, NULL) != -1);
|