X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fviewer-connection.h;h=0a7aa91ad350750d376f2088e2bc26c16e5ecb4a;hb=f79c2d7a3575db7cd07f502b39e1db76619b70a6;hp=daa138a2e83b9f5b7c553393c8f7e1961ebfd7c4;hpb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.h b/src/plugins/ctf/lttng-live/viewer-connection.h
index daa138a2..0a7aa91a 100644
--- a/src/plugins/ctf/lttng-live/viewer-connection.h
+++ b/src/plugins/ctf/lttng-live/viewer-connection.h
@@ -24,31 +24,50 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
+
 #include <glib.h>
 
+#include <babeltrace2/babeltrace.h>
+
 #include "common/macros.h"
 #include "compat/socket.h"
 
-/*
- * FIXME: This is an internal Babeltrace library header; it is not meant
- * to be generic as it is now. Make sure this included code does not
- * log because it won't find our local log level.
- */
-#define BT_OBJECT_DONT_LOG
-#include "lib/object.h"
-
 #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT	5344
 
 #define LTTNG_LIVE_MAJOR			2
 #define LTTNG_LIVE_MINOR			4
 
+enum lttng_live_viewer_status {
+	LTTNG_LIVE_VIEWER_STATUS_OK		= 0,
+	LTTNG_LIVE_VIEWER_STATUS_ERROR		= -1,
+	LTTNG_LIVE_VIEWER_STATUS_INTERRUPTED	= -2,
+};
+
+enum lttng_live_get_one_metadata_status {
+	/* The end of the metadata stream was reached. */
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_END		= 1,
+	/* One metadata packet was received and written to file. */
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_OK		= LTTNG_LIVE_VIEWER_STATUS_OK,
+	/*
+	 * A critical error occurred when contacting the relay or while
+	 * handling its response.
+	 */
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR	= LTTNG_LIVE_VIEWER_STATUS_ERROR,
+
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_INTERRUPTED  = LTTNG_LIVE_VIEWER_STATUS_INTERRUPTED,
+
+	/* The metadata stream was not found on the relay. */
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED	= -3,
+};
+
 struct lttng_live_component;
 
 struct live_viewer_connection {
-	bt_object obj;
 	bt_logging_level log_level;
 	bt_self_component *self_comp;
+	bt_self_component_class *self_comp_class;
 
 	GString *url;
 
@@ -85,10 +104,13 @@ struct packet_index {
 	uint64_t packet_seq_num;	/* packet sequence number */
 };
 
-struct live_viewer_connection * live_viewer_connection_create(
+enum lttng_live_viewer_status live_viewer_connection_create(
+		bt_self_component *self_comp,
+		bt_self_component_class *self_comp_class,
+		bt_logging_level log_level,
 		const char *url, bool in_query,
 		struct lttng_live_msg_iter *lttng_live_msg_iter,
-		bt_logging_level log_level);
+		struct live_viewer_connection **viewer_connection);
 
 void live_viewer_connection_destroy(
 		struct live_viewer_connection *conn);