Refactor the component class and component API

[babeltrace.git] / plugins / ctf / fs / fs.c

diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c
index 6b80d04a3258755c80fd50dfcd2368d4934a0342..d3fcf0f0f735694ff273f44697970ddef3d8e79d 100644 (file)
--- a/plugins/ctf/fs/fs.c
+++ b/plugins/ctf/fs/fs.c
@@ -26,14 +26,13 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-system.h>
 #include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/clock.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/stream.h>
-#include <babeltrace/plugin/notification/event.h>
-#include <babeltrace/plugin/notification/packet.h>
-#include <babeltrace/plugin/notification/heap.h>
+#include <babeltrace/ctf-ir/clock-class.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/stream.h>
+#include <babeltrace/component/notification/event.h>
+#include <babeltrace/component/notification/packet.h>
+#include <babeltrace/component/notification/heap.h>
 #include <glib.h>
 #include <assert.h>
 #include <unistd.h>
@@ -377,7 +376,7 @@ bool compare_event_notifications(struct bt_notification *a,
                struct bt_notification *b)
 {
        int ret;
-       struct bt_ctf_clock *clock;
+       struct bt_ctf_clock_class *clock_class;
        struct bt_ctf_clock_value *a_clock_value, *b_clock_value;
        struct bt_ctf_stream_class *a_stream_class;
        struct bt_ctf_stream *a_stream;
@@ -398,9 +397,9 @@ bool compare_event_notifications(struct bt_notification *a,
        trace = bt_ctf_stream_class_get_trace(a_stream_class);
        assert(trace);
 
-       clock = bt_ctf_trace_get_clock(trace, 0);
-       a_clock_value = bt_ctf_event_get_clock_value(a_event, clock);
-       b_clock_value = bt_ctf_event_get_clock_value(b_event, clock);
+       clock_class = bt_ctf_trace_get_clock_class(trace, 0);
+       a_clock_value = bt_ctf_event_get_clock_value(a_event, clock_class);
+       b_clock_value = bt_ctf_event_get_clock_value(b_event, clock_class);
        assert(a_clock_value);
        assert(b_clock_value);
 
@@ -415,7 +414,7 @@ bool compare_event_notifications(struct bt_notification *a,
        bt_put(b_clock_value);
        bt_put(a_stream);
        bt_put(a_stream_class);
-       bt_put(clock);
+       bt_put(clock_class);
        bt_put(trace);
        return a_ts < b_ts;
 }
@@ -584,7 +583,6 @@ end:
        return ret;
 }
 
-static
 enum bt_component_status ctf_fs_iterator_init(struct bt_component *source,
                struct bt_notification_iterator *it)
 {
@@ -669,7 +667,6 @@ void ctf_fs_destroy_data(struct ctf_fs_component *ctf_fs)
        g_free(ctf_fs);
 }
 
-static
 void ctf_fs_destroy(struct bt_component *component)
 {
        void *data = bt_component_get_private_data(component);
@@ -739,21 +736,10 @@ enum bt_component_status ctf_fs_init(struct bt_component *source,
                goto end;
        }
 
-       ret = bt_component_set_destroy_cb(source, ctf_fs_destroy);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto error;
-       }
-
        ret = bt_component_set_private_data(source, ctf_fs);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;
        }
-
-       ret = bt_component_source_set_iterator_init_cb(source,
-                       ctf_fs_iterator_init);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto error;
-       }
 end:
        return ret;
 error: