X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Flttng-live%2Fviewer-connection.c;h=e11fe7eb63353b4d2fbb06865cc8eecd11f4c725;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=ec9dba29d3e9f8246325bec90fa4c73ab1478165;hpb=fdd3a2da18afef5ca32ba181a8b6ebbff173df02;p=babeltrace.git

diff --git a/plugins/ctf/lttng-live/viewer-connection.c b/plugins/ctf/lttng-live/viewer-connection.c
index ec9dba29..e11fe7eb 100644
--- 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;
@@ -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;