tap-driver.sh: flush stdout after each test result

[babeltrace.git] / plugins / ctf / lttng-live / viewer-connection.c

diff --git a/plugins/ctf/lttng-live/viewer-connection.c b/plugins/ctf/lttng-live/viewer-connection.c
index b37db12ec46e2f9a0f464658b71e7e63a0440692..e11fe7eb63353b4d2fbb06865cc8eecd11f4c725 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.c
+++ b/plugins/ctf/lttng-live/viewer-connection.c
@@ -34,11 +34,11 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include <babeltrace/compat/socket-internal.h>
-#include <babeltrace/endian-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/compat/socket-internal.h>
+#include <babeltrace2/endian-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/babeltrace.h>
 
 #include "lttng-live.h"
 #include "viewer-connection.h"
@@ -65,7 +65,7 @@ ssize_t lttng_live_recv(struct live_viewer_connection *viewer_connection,
                }
                if (ret == BT_SOCKET_ERROR && bt_socket_interrupted()) {
                        if (!viewer_connection->in_query &&
-                                       lttng_live_is_canceled(lttng_live_msg_iter->lttng_live_comp)) {
+                                       lttng_live_graph_is_canceled(lttng_live_msg_iter->lttng_live_comp)) {
                                break;
                        } else {
                                continue;
@@ -91,7 +91,7 @@ ssize_t lttng_live_send(struct live_viewer_connection *viewer_connection,
                ret = bt_socket_send_nosigpipe(sock, buf, len);
                if (ret == BT_SOCKET_ERROR && bt_socket_interrupted()) {
                        if (!viewer_connection->in_query &&
-                                       lttng_live_is_canceled(lttng_live_msg_iter->lttng_live_comp)) {
+                                       lttng_live_graph_is_canceled(lttng_live_msg_iter->lttng_live_comp)) {
                                break;
                        } else {
                                continue;
@@ -360,10 +360,10 @@ int list_update_session(bt_value *results,
                                ret = -1;
                                goto end;
                        }
-                       val = bt_value_integer_get(btval);
+                       val = bt_value_signed_integer_get(btval);
                        /* sum */
                        val += streams;
-                       bt_value_integer_set(btval, val);
+                       bt_value_signed_integer_set(btval, val);
 
                        btval = bt_value_map_borrow_entry_value(map, "client-count");
                        if (!btval) {
@@ -371,10 +371,10 @@ int list_update_session(bt_value *results,
                                ret = -1;
                                goto end;
                        }
-                       val = bt_value_integer_get(btval);
+                       val = bt_value_signed_integer_get(btval);
                        /* max */
                        val = max_t(int64_t, clients, val);
-                       bt_value_integer_set(btval, val);
+                       bt_value_signed_integer_set(btval, val);
                }
 
                if (found) {
@@ -466,8 +466,8 @@ int list_append_session(bt_value *results,
        {
                uint32_t live_timer = be32toh(session->live_timer);
 
-               ret_status = bt_value_map_insert_integer_entry(map, "timer-us",
-                       live_timer);
+               ret_status = bt_value_map_insert_signed_integer_entry(
+                       map, "timer-us", live_timer);
                if (ret_status != BT_VALUE_STATUS_OK) {
                        BT_LOGE_STR("Error inserting \"timer-us\" entry.");
                        ret = -1;
@@ -482,8 +482,8 @@ int list_append_session(bt_value *results,
        {
                uint32_t streams = be32toh(session->streams);
 
-               ret_status = bt_value_map_insert_integer_entry(map, "stream-count",
-                       streams);
+               ret_status = bt_value_map_insert_signed_integer_entry(map,
+                       "stream-count", streams);
                if (ret_status != BT_VALUE_STATUS_OK) {
                        BT_LOGE_STR("Error inserting \"stream-count\" entry.");
                        ret = -1;
@@ -498,8 +498,8 @@ int list_append_session(bt_value *results,
        {
                uint32_t clients = be32toh(session->clients);
 
-               ret_status = bt_value_map_insert_integer_entry(map, "client-count",
-                       clients);
+               ret_status = bt_value_map_insert_signed_integer_entry(map,
+                       "client-count", clients);
                if (ret_status != BT_VALUE_STATUS_OK) {
                        BT_LOGE_STR("Error inserting \"client-count\" entry.");
                        ret = -1;
@@ -1235,7 +1235,7 @@ end:
        return retstatus;
 
 error:
-       if (lttng_live_is_canceled(lttng_live)) {
+       if (lttng_live_graph_is_canceled(lttng_live)) {
                retstatus = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
        } else {
                retstatus = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
@@ -1360,7 +1360,7 @@ end:
        return retstatus;
 
 error:
-       if (lttng_live_is_canceled(lttng_live)) {
+       if (lttng_live_graph_is_canceled(lttng_live)) {
                retstatus = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
        } else {
                retstatus = BT_MSG_ITER_MEDIUM_STATUS_ERROR;
@@ -1457,7 +1457,7 @@ end:
        return status;
 
 error:
-       if (lttng_live_is_canceled(lttng_live)) {
+       if (lttng_live_graph_is_canceled(lttng_live)) {
                status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
        } else {
                status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;