X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils%2Fchannel.c;h=92d793e468c441b044c24d76bedd2d9dc51510f0;hb=618c44a3534e738138455caba68c925eb39f94e3;hp=22e31a8b4eb0303e063ca6b3bfae2e0e8dcb19ad;hpb=b2ea91bbb3fd18b562fd3e740599af17a113e6d2;p=sysdb.git

diff --git a/src/utils/channel.c b/src/utils/channel.c
index 22e31a8..92d793e 100644
--- a/src/utils/channel.c
+++ b/src/utils/channel.c
@@ -32,6 +32,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <time.h>
+
 #include <pthread.h>
 
 /*
@@ -165,6 +167,7 @@ int
 sdb_channel_select(sdb_channel_t *chan, int *wantread, void *read_data,
 		int *wantwrite, void *write_data, const struct timespec *timeout)
 {
+	struct timespec abstime;
 	int status = 0;
 
 	if (! chan)
@@ -173,6 +176,14 @@ sdb_channel_select(sdb_channel_t *chan, int *wantread, void *read_data,
 	if ((! wantread) && (! read_data) && (! wantwrite) && (! write_data))
 		return -1;
 
+	if (timeout) {
+		if (clock_gettime(CLOCK_REALTIME, &abstime))
+			return -1;
+
+		abstime.tv_sec += timeout->tv_sec;
+		abstime.tv_nsec += timeout->tv_nsec;
+	}
+
 	pthread_mutex_lock(&chan->lock);
 	while (! status) {
 		int read_status, write_status;
@@ -193,7 +204,7 @@ sdb_channel_select(sdb_channel_t *chan, int *wantread, void *read_data,
 
 		if (timeout)
 			status = pthread_cond_timedwait(&chan->cond, &chan->lock,
-					timeout);
+					&abstime);
 		else
 			status = pthread_cond_wait(&chan->cond, &chan->lock);
 	}