lib: graph: add "self" and some "private" APIs

[babeltrace.git] / plugins / text / pretty / pretty.h

diff --git a/plugins/text/pretty/pretty.h b/plugins/text/pretty/pretty.h
index 9caa5778ea8f487673d4bdb1a0bb9d6c905ab6b2..6be4ba3f1f856fef8234825378d6c1da880cb644 100644 (file)
--- a/plugins/text/pretty/pretty.h
+++ b/plugins/text/pretty/pretty.h
@@ -2,8 +2,6 @@
 #define BABELTRACE_PLUGIN_TEXT_PRETTY_PRETTY_H
 
 /*
- * BabelTrace - CTF Text Output Plug-in
- *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -29,10 +27,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/ctf-ir/event.h>
+#include <babeltrace/babeltrace.h>
 
 enum pretty_default {
        PRETTY_DEFAULT_UNSET,
@@ -48,8 +43,6 @@ enum pretty_color_option {
 
 struct pretty_options {
        char *output_path;
-       char *debug_info_dir;
-       char *debug_info_target_prefix;
 
        enum pretty_default name_default;
        enum pretty_default field_default;
@@ -73,28 +66,28 @@ struct pretty_options {
        bool clock_seconds;
        bool clock_date;
        bool clock_gmt;
-       bool debug_info_full_path;
        enum pretty_color_option color;
        bool verbose;
 };
 
 struct pretty_component {
        struct pretty_options options;
-       struct bt_notification_iterator *input_iterator;
+       struct bt_self_component_port_input_notification_iterator *iterator;
        FILE *out, *err;
-       bool processed_first_event; /* Should be per-iterator. */
        int depth;      /* nesting, used for tabulation alignment. */
        bool start_line;
        GString *string;
-       struct bt_value *plugin_opt_map;        /* Temporary parameter map. */
+       GString *tmp_string;
+       struct bt_private_value *plugin_opt_map; /* Temporary parameter map. */
        bool use_colors;
-       bool error;
 
        uint64_t last_cycles_timestamp;
        uint64_t delta_cycles;
 
        uint64_t last_real_timestamp;
        uint64_t delta_real_timestamp;
+
+       bool negative_timestamp_warning_done;
 };
 
 enum stream_packet_context_quarks_enum {
@@ -107,28 +100,34 @@ enum stream_packet_context_quarks_enum {
        STREAM_PACKET_CONTEXT_QUARKS_LEN, /* Always the last one of this enum. */
 };
 
+extern
 GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
 
 BT_HIDDEN
-enum bt_component_status pretty_init(
-               struct bt_private_component *component,
+enum bt_self_component_status pretty_init(
+               struct bt_self_component_sink *component,
                struct bt_value *params,
                void *init_method_data);
 
 BT_HIDDEN
-enum bt_component_status pretty_consume(struct bt_private_component *component);
+enum bt_self_component_status pretty_consume(
+               struct bt_self_component_sink *component);
+
+BT_HIDDEN
+enum bt_self_component_status pretty_port_connected(
+               struct bt_self_component_sink *component,
+               struct bt_self_component_port_input *self_port,
+               struct bt_port_output *other_port);
 
 BT_HIDDEN
-void pretty_port_connected(
-               struct bt_private_component *component,
-               struct bt_private_port *self_port,
-               struct bt_port *other_port);
+void pretty_finalize(struct bt_self_component_sink *component);
 
 BT_HIDDEN
-void pretty_finalize(struct bt_private_component *component);
+int pretty_print_event(struct pretty_component *pretty,
+               struct bt_notification *event_notif);
 
 BT_HIDDEN
-enum bt_component_status pretty_print_event(struct pretty_component *pretty,
-               struct bt_ctf_event *event);
+int pretty_print_packet(struct pretty_component *pretty,
+               struct bt_notification *packet_beginning_notif);
 
 #endif /* BABELTRACE_PLUGIN_TEXT_PRETTY_PRETTY_H */