#include <stdbool.h>
#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
-#include <babeltrace/types.h>
+#include <babeltrace/babeltrace.h>
#include "viewer-connection.h"
//TODO: this should not be used by plugins. Should copy code into plugin
struct lttng_live_stream_iterator {
struct lttng_live_stream_iterator_generic p;
- struct bt_ctf_stream *stream;
+ const bt_stream *stream;
struct lttng_live_trace *trace;
struct bt_private_port *port; /* weak ref. */
/*
* Since only a single iterator per viewer connection, we have
- * only a single notification iterator per stream.
+ * only a single message iterator per stream.
*/
- struct bt_ctf_notif_iter *notif_iter;
+ struct bt_msg_iter *msg_iter;
uint64_t viewer_stream_id;
enum lttng_live_stream_state state;
uint64_t current_packet_end_timestamp;
- struct bt_notification *packet_end_notif_queue;
+ const bt_message *packet_end_msg_queue;
uint8_t *buf;
size_t buflen;
};
struct lttng_live_trace {
- struct bt_object obj;
+ bt_object obj;
/* Node of trace list within the session. */
struct bt_list_head node;
uint64_t id; /* ctf trace ID within the session. */
- struct bt_ctf_trace *trace;
+ const bt_trace *trace;
struct lttng_live_metadata *metadata;
- struct bt_clock_class_priority_map *cc_prio_map;
+ bt_clock_class_priority_map *cc_prio_map;
/* List of struct lttng_live_stream_iterator */
struct bt_list_head streams;
bool attached;
bool new_streams_needed;
- bool lazy_stream_notif_init;
+ bool lazy_stream_msg_init;
bool closed;
};
* A component instance is an iterator on a single session.
*/
struct lttng_live_component {
- struct bt_object obj;
- struct bt_private_component *private_component; /* weak */
+ bt_object obj;
+ bt_self_component *private_component; /* weak */
struct bt_live_viewer_connection *viewer_connection;
/* List of struct lttng_live_session */
struct bt_private_port *no_stream_port; /* weak */
struct lttng_live_no_stream_iterator *no_stream_iter;
- struct bt_component *downstream_component;
+ bt_component *downstream_component;
};
-enum bt_ctf_lttng_live_iterator_status {
+bt_lttng_live_iterator_status {
/** Iterator state has progressed. Continue iteration immediately. */
- BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_CONTINUE = 3,
- /** No notification available for now. Try again later. */
- BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_AGAIN = 2,
+ BT_LTTNG_LIVE_ITERATOR_STATUS_CONTINUE = 3,
+ /** No message available for now. Try again later. */
+ BT_LTTNG_LIVE_ITERATOR_STATUS_AGAIN = 2,
/** No more CTF_LTTNG_LIVEs to be delivered. */
- BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_END = 1,
+ BT_LTTNG_LIVE_ITERATOR_STATUS_END = 1,
/** No error, okay. */
- BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_OK = 0,
+ BT_LTTNG_LIVE_ITERATOR_STATUS_OK = 0,
/** Invalid arguments. */
- BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_INVAL = -1,
+ BT_LTTNG_LIVE_ITERATOR_STATUS_INVAL = -1,
/** General error. */
- BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_ERROR = -2,
+ BT_LTTNG_LIVE_ITERATOR_STATUS_ERROR = -2,
/** Out of memory. */
- BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_NOMEM = -3,
+ BT_LTTNG_LIVE_ITERATOR_STATUS_NOMEM = -3,
/** Unsupported iterator feature. */
- BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
+ BT_LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
};
-enum bt_component_status lttng_live_component_init(struct bt_private_component *source,
- struct bt_value *params, void *init_method_data);
+bt_component_status lttng_live_component_init(bt_self_component *source,
+ bt_value *params, void *init_method_data);
-struct bt_component_class_query_method_return lttng_live_query(
- struct bt_component_class *comp_class,
- struct bt_query_executor *query_exec,
- const char *object, struct bt_value *params);
+bt_component_class_query_method_return lttng_live_query(
+ const bt_component_class *comp_class,
+ const bt_query_executor *query_exec,
+ const char *object, bt_value *params);
-void lttng_live_component_finalize(struct bt_private_component *component);
+void lttng_live_component_finalize(bt_self_component *component);
-struct bt_notification_iterator_next_method_return lttng_live_iterator_next(
- struct bt_private_connection_private_notification_iterator *iterator);
+bt_message_iterator_next_method_return lttng_live_iterator_next(
+ bt_self_message_iterator *iterator);
-enum bt_component_status lttng_live_accept_port_connection(
- struct bt_private_component *private_component,
+bt_component_status lttng_live_accept_port_connection(
+ bt_self_component *private_component,
struct bt_private_port *self_private_port,
- struct bt_port *other_port);
+ const bt_port *other_port);
-enum bt_notification_iterator_status lttng_live_iterator_init(
- struct bt_private_connection_private_notification_iterator *it,
+bt_message_iterator_status lttng_live_iterator_init(
+ bt_self_message_iterator *it,
struct bt_private_port *port);
-void lttng_live_iterator_finalize(struct bt_private_connection_private_notification_iterator *it);
+void lttng_live_iterator_finalize(bt_self_message_iterator *it);
int lttng_live_create_viewer_session(struct lttng_live_component *lttng_live);
int lttng_live_attach_session(struct lttng_live_session *session);
int lttng_live_detach_session(struct lttng_live_session *session);
-enum bt_ctf_lttng_live_iterator_status lttng_live_get_new_streams(
+bt_lttng_live_iterator_status lttng_live_get_new_streams(
struct lttng_live_session *session);
int lttng_live_add_session(struct lttng_live_component *lttng_live,
ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
FILE *fp);
-enum bt_ctf_lttng_live_iterator_status lttng_live_get_next_index(
+bt_lttng_live_iterator_status lttng_live_get_next_index(
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *stream,
struct packet_index *index);
-enum bt_ctf_notif_iter_medium_status lttng_live_get_stream_bytes(
+enum bt_msg_iter_medium_status lttng_live_get_stream_bytes(
struct lttng_live_component *lttng_live,
struct lttng_live_stream_iterator *stream, uint8_t *buf, uint64_t offset,
uint64_t req_len, uint64_t *recv_len);
projects / babeltrace.git / blobdiff