src.ctf.lttng-live: Add logging statements across the component class

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

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.h b/src/plugins/ctf/lttng-live/viewer-connection.h
index be6dc5a194ba1c7f1eb81482ed0ae18ceee0b93d..39f6a210f27b8233165843f57107fbe3fe601774 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.h
+++ b/src/plugins/ctf/lttng-live/viewer-connection.h
@@ -23,36 +23,58 @@
  * SOFTWARE.
  */
 
+#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_logging_level log_level;
-       bt_object obj;
+       bt_self_component *self_comp;
+       bt_self_component_class *self_comp_class;
 
        GString *url;
 
        GString *relay_hostname;
        GString *target_hostname;
        GString *session_name;
+       GString *proto;
 
        BT_SOCKET control_sock;
        int port;
@@ -83,14 +105,18 @@ 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);
+               struct lttng_live_msg_iter *lttng_live_msg_iter,
+               struct live_viewer_connection **viewer_connection);
 
 void live_viewer_connection_destroy(
                struct live_viewer_connection *conn);
 
-bt_query_status live_viewer_connection_list_sessions(
+bt_component_class_query_method_status live_viewer_connection_list_sessions(
                struct live_viewer_connection *viewer_connection,
                const bt_value **user_result);