metadata: fix wait handling

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/ust/wait.h b/include/ust/wait.h
index 21ced509915932086570d3329073b6d7d764c0fc..6cc0e3732cec710133000d9d9dfd15b6556d1938 100644 (file)
--- a/include/ust/wait.h
+++ b/include/ust/wait.h
@@ -30,7 +30,7 @@
                int __timeout = _timeout;                       \
                                                                \
                for (;;) {                                      \
-                       if (!(_cond))                           \
+                       if (_cond)                              \
                                break;                          \
                        if (__timeout <= 0) {                   \
                                __ret = -ETIMEDOUT;             \

diff --git a/libust/ltt-events.c b/libust/ltt-events.c
index c99b6689200b3c8775569d8bafe05a1d1d088072..94d57c3372b5c7b7a58a43899c0c658272c0c35f 100644 (file)
--- a/libust/ltt-events.c
+++ b/libust/ltt-events.c
@@ -402,7 +402,7 @@ int lttng_metadata_printf(struct ltt_session *session,
                                ret != -ENOBUFS || !ret;
                        }),
                        LTTNG_METADATA_TIMEOUT_MSEC);
-               if (!waitret || waitret == -EINTR || ret) {
+               if (waitret == -ETIMEDOUT || waitret == -EINTR || ret) {
                        DBG("LTTng: Failure to write metadata to buffers (%s)\n",
                                waitret == -EINTR ? "interrupted" :
                                        (ret == -ENOBUFS ? "timeout" : "I/O error"));