* 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 <plugins-common.h>
#include <glib.h>
#include <assert.h>
#include <unistd.h>
BT_HIDDEN
bool ctf_fs_debug;
-static
enum bt_notification_iterator_status ctf_fs_iterator_next(
struct bt_notification_iterator *iterator);
-static
struct bt_notification *ctf_fs_iterator_get(
struct bt_notification_iterator *iterator)
{
bt_put(event);
break;
}
- case BT_NOTIFICATION_TYPE_PACKET_START:
+ case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
{
struct bt_ctf_packet *packet;
- packet = bt_notification_packet_start_get_packet(notification);
+ packet = bt_notification_packet_begin_get_packet(notification);
stream = bt_ctf_packet_get_stream(packet);
bt_put(packet);
break;
return ret;
}
-static
enum bt_notification_iterator_status ctf_fs_iterator_next(
struct bt_notification_iterator *iterator)
{
g_free(ctf_it);
}
-static
void ctf_fs_iterator_destroy(struct bt_notification_iterator *it)
{
void *data = bt_notification_iterator_get_private_data(it);
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;
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);
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;
}
[BT_NOTIFICATION_TYPE_NEW_TRACE] = 0,
[BT_NOTIFICATION_TYPE_NEW_STREAM_CLASS] = 1,
[BT_NOTIFICATION_TYPE_NEW_EVENT_CLASS] = 2,
- [BT_NOTIFICATION_TYPE_PACKET_START] = 3,
+ [BT_NOTIFICATION_TYPE_PACKET_BEGIN] = 3,
[BT_NOTIFICATION_TYPE_PACKET_END] = 4,
[BT_NOTIFICATION_TYPE_EVENT] = 5,
[BT_NOTIFICATION_TYPE_END_OF_TRACE] = 6,
/* Notification types are equal, but not of type "event". */
switch (a_type) {
- case BT_NOTIFICATION_TYPE_PACKET_START:
+ case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
case BT_NOTIFICATION_TYPE_PACKET_END:
case BT_NOTIFICATION_TYPE_STREAM_END:
{
goto error;
}
+ if (file->size == 0) {
+ /* Skip empty stream. */
+ ctf_fs_file_destroy(file);
+ continue;
+ }
+
/* Create a private stream; file ownership is passed to it. */
stream = ctf_fs_stream_create(ctf_fs, file);
if (!stream) {
return ret;
}
-static
-enum bt_component_status ctf_fs_iterator_init(struct bt_component *source,
+enum bt_notification_iterator_status ctf_fs_iterator_init(struct bt_component *source,
struct bt_notification_iterator *it)
{
struct ctf_fs_iterator *ctf_it;
struct ctf_fs_component *ctf_fs;
- enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ enum bt_notification_iterator_status ret = BT_NOTIFICATION_ITERATOR_STATUS_OK;
assert(source && it);
ctf_fs = bt_component_get_private_data(source);
if (!ctf_fs) {
- ret = BT_COMPONENT_STATUS_INVALID;
+ ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
goto end;
}
ctf_it = g_new0(struct ctf_fs_iterator, 1);
if (!ctf_it) {
- ret = BT_COMPONENT_STATUS_NOMEM;
+ ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
goto end;
}
goto error;
}
- ret = bt_notification_iterator_set_get_cb(it, ctf_fs_iterator_get);
- if (ret) {
- goto error;
- }
-
- ret = bt_notification_iterator_set_next_cb(it, ctf_fs_iterator_next);
- if (ret) {
- goto error;
- }
-
- ret = bt_notification_iterator_set_destroy_cb(it,
- ctf_fs_iterator_destroy);
- if (ret) {
- goto error;
- }
-
ret = bt_notification_iterator_set_private_data(it, ctf_it);
if (ret) {
goto error;
static
void ctf_fs_destroy_data(struct ctf_fs_component *ctf_fs)
{
+ if (!ctf_fs) {
+ return;
+ }
if (ctf_fs->trace_path) {
g_string_free(ctf_fs->trace_path, TRUE);
}
g_free(ctf_fs);
}
-static
void ctf_fs_destroy(struct bt_component *component)
{
void *data = bt_component_get_private_data(component);
BT_HIDDEN
enum bt_component_status ctf_fs_init(struct bt_component *source,
- struct bt_value *params)
+ struct bt_value *params, UNUSED_VAR void *init_method_data)
{
struct ctf_fs_component *ctf_fs;
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
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: