plugin: Make sdb_plugin_info_t public.

[sysdb.git] / src / utils / channel.c

diff --git a/src/utils/channel.c b/src/utils/channel.c
index af41b477b4748252763123b8a0303aa5edc06676..7c5c002ae545f43901e5b9dab352329936218b67 100644 (file)
--- a/src/utils/channel.c
+++ b/src/utils/channel.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "utils/channel.h"
 
 #include <assert.h>
@@ -57,6 +61,8 @@ struct sdb_channel {
        size_t head;
        size_t tail;
        _Bool full;
+
+       _Bool shutdown;
 };
 
 /*
@@ -79,7 +85,7 @@ channel_write(sdb_channel_t *chan, const void *data)
 {
        assert(chan);
 
-       if (chan->full)
+       if (chan->full || chan->shutdown)
                return -1;
        else if (! data)
                return 0;
@@ -199,6 +205,12 @@ sdb_channel_select(sdb_channel_t *chan, int *wantread, void *read_data,
                                break;
                }
 
+               if (chan->shutdown) {
+                       if (read_status)
+                               status = EBADF;
+                       break;
+               }
+
                if (timeout) {
                        struct timespec abstime;
 
@@ -210,6 +222,11 @@ sdb_channel_select(sdb_channel_t *chan, int *wantread, void *read_data,
                        abstime.tv_sec += timeout->tv_sec;
                        abstime.tv_nsec += timeout->tv_nsec;
 
+                       if (abstime.tv_nsec > 1000000000) {
+                               abstime.tv_nsec -= 1000000000;
+                               abstime.tv_sec += 1;
+                       }
+
                        status = pthread_cond_timedwait(&chan->cond, &chan->lock,
                                        &abstime);
                }
@@ -253,5 +270,14 @@ sdb_channel_read(sdb_channel_t *chan, void *data)
        return status;
 } /* sdb_channel_read */
 
+int
+sdb_channel_shutdown(sdb_channel_t *chan)
+{
+       if (! chan)
+               return -1;
+       chan->shutdown = 1;
+       return 0;
+} /* sdb_channel_shutdown */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */