X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Fcounter%2Fcounter.h;h=c29f0fd5335ff046a410ef35ec08637fff596bde;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=2feeaa50ba4d6c93a865e58c448e61f96eae185c;hpb=05e2128659970c32648a01255ed870449f05d518;p=babeltrace.git

diff --git a/plugins/utils/counter/counter.h b/plugins/utils/counter/counter.h
index 2feeaa50..c29f0fd5 100644
--- a/plugins/utils/counter/counter.h
+++ b/plugins/utils/counter/counter.h
@@ -24,19 +24,23 @@
  */
 
 #include <glib.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/babeltrace.h>
 #include <stdbool.h>
 #include <stdint.h>
 
 struct counter {
-	struct bt_self_component_port_input_notification_iterator *notif_iter;
+	bt_self_component_port_input_message_iterator *msg_iter;
 	struct {
 		uint64_t event;
 		uint64_t stream_begin;
 		uint64_t stream_end;
+		uint64_t stream_activity_begin;
+		uint64_t stream_activity_end;
 		uint64_t packet_begin;
 		uint64_t packet_end;
-		uint64_t inactivity;
+		uint64_t disc_events;
+		uint64_t disc_packets;
+		uint64_t msg_iter_inactivity;
 		uint64_t other;
 	} count;
 	uint64_t last_printed_total;
@@ -46,20 +50,18 @@ struct counter {
 };
 
 BT_HIDDEN
-enum bt_self_component_status counter_init(
-		struct bt_self_component_sink *component,
-		const struct bt_value *params, void *init_method_data);
+bt_self_component_status counter_init(
+		bt_self_component_sink *component,
+		const bt_value *params, void *init_method_data);
 
 BT_HIDDEN
-void counter_finalize(struct bt_self_component_sink *component);
+void counter_finalize(bt_self_component_sink *component);
 
 BT_HIDDEN
-enum bt_self_component_status counter_port_connected(
-		struct bt_self_component_sink *component,
-		struct bt_self_component_port_input *self_port,
-		struct bt_port_output *other_port);
+bt_self_component_status counter_graph_is_configured(
+		bt_self_component_sink *component);
 
 BT_HIDDEN
-enum bt_self_component_status counter_consume(struct bt_self_component_sink *component);
+bt_self_component_status counter_consume(bt_self_component_sink *component);
 
 #endif /* BABELTRACE_PLUGINS_UTILS_COUNTER_H */