X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=b612d2c6809ff8d2fb423fca5ae9771b36c6fe71;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=8de14bdc66b79684b9467a78a5cd59dfa72e6650;hpb=862ca4ed7b3a8ef14f69529d252bccc48a33108a;p=babeltrace.git diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c index 8de14bdc..b612d2c6 100644 --- a/plugins/ctf/fs-src/fs.c +++ b/plugins/ctf/fs-src/fs.c @@ -90,10 +90,10 @@ void ctf_fs_notif_iter_data_destroy( static enum bt_self_notification_iterator_status ctf_fs_iterator_next_one( struct ctf_fs_notif_iter_data *notif_iter_data, - const struct bt_notification **notif) + const bt_notification **notif) { enum bt_self_notification_iterator_status status; - struct bt_notification *priv_notif; + bt_notification *priv_notif; int ret; BT_ASSERT(notif_iter_data->ds_file); @@ -102,14 +102,14 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one( if (status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK && bt_notification_get_type(*notif) == - BT_NOTIFICATION_TYPE_STREAM_BEGIN) { + BT_NOTIFICATION_TYPE_STREAM_BEGINNING) { if (notif_iter_data->skip_stream_begin_notifs) { /* * We already emitted a - * BT_NOTIFICATION_TYPE_STREAM_BEGIN + * BT_NOTIFICATION_TYPE_STREAM_BEGINNING * notification: skip this one, get a new one. */ - BT_OBJECT_PUT_REF_AND_RESET(*notif); + BT_NOTIFICATION_PUT_REF_AND_RESET(*notif); status = ctf_fs_ds_file_next(notif_iter_data->ds_file, &priv_notif); *notif = priv_notif; @@ -117,7 +117,7 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one( goto end; } else { /* - * First BT_NOTIFICATION_TYPE_STREAM_BEGIN + * First BT_NOTIFICATION_TYPE_STREAM_BEGINNING * notification: skip all following. */ notif_iter_data->skip_stream_begin_notifs = true; @@ -144,7 +144,7 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one( goto end; } - BT_OBJECT_PUT_REF_AND_RESET(*notif); + BT_NOTIFICATION_PUT_REF_AND_RESET(*notif); bt_notif_iter_reset(notif_iter_data->notif_iter); /* @@ -162,15 +162,15 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one( /* * If we get a notification, we expect to get a - * BT_NOTIFICATION_TYPE_STREAM_BEGIN notification + * BT_NOTIFICATION_TYPE_STREAM_BEGINNING notification * because the iterator's state machine emits one before * even requesting the first block of data from the * medium. Skip this notification because we're not * really starting a new stream here, and try getting a * new notification (which, if it works, is a - * BT_NOTIFICATION_TYPE_PACKET_BEGIN one). We're sure to + * BT_NOTIFICATION_TYPE_PACKET_BEGINNING one). We're sure to * get at least one pair of - * BT_NOTIFICATION_TYPE_PACKET_BEGIN and + * BT_NOTIFICATION_TYPE_PACKET_BEGINNING and * BT_NOTIFICATION_TYPE_PACKET_END notifications in the * case of a single, empty packet. We know there's at * least one packet because the stream file group does @@ -180,8 +180,8 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one( if (status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK) { BT_ASSERT(bt_notification_get_type(*notif) == - BT_NOTIFICATION_TYPE_STREAM_BEGIN); - BT_OBJECT_PUT_REF_AND_RESET(*notif); + BT_NOTIFICATION_TYPE_STREAM_BEGINNING); + BT_NOTIFICATION_PUT_REF_AND_RESET(*notif); status = ctf_fs_ds_file_next(notif_iter_data->ds_file, &priv_notif); *notif = priv_notif; @@ -195,7 +195,7 @@ end: BT_HIDDEN enum bt_self_notification_iterator_status ctf_fs_iterator_next( - struct bt_self_notification_iterator *iterator, + bt_self_notification_iterator *iterator, bt_notification_array_const notifs, uint64_t capacity, uint64_t *count) { @@ -231,16 +231,16 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next( return status; } -void ctf_fs_iterator_finalize(struct bt_self_notification_iterator *it) +void ctf_fs_iterator_finalize(bt_self_notification_iterator *it) { ctf_fs_notif_iter_data_destroy( bt_self_notification_iterator_get_data(it)); } enum bt_self_notification_iterator_status ctf_fs_iterator_init( - struct bt_self_notification_iterator *self_notif_iter, - struct bt_self_component_source *self_comp, - struct bt_self_component_port_output *self_port) + bt_self_notification_iterator *self_notif_iter, + bt_self_component_source *self_comp, + bt_self_component_port_output *self_port) { struct ctf_fs_port_data *port_data; struct ctf_fs_notif_iter_data *notif_iter_data = NULL; @@ -322,7 +322,7 @@ void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace) g_ptr_array_free(ctf_fs_trace->ds_file_groups, TRUE); } - BT_OBJECT_PUT_REF_AND_RESET(ctf_fs_trace->trace); + BT_TRACE_PUT_REF_AND_RESET(ctf_fs_trace->trace); if (ctf_fs_trace->path) { g_string_free(ctf_fs_trace->path, TRUE); @@ -347,7 +347,7 @@ void ctf_fs_trace_destroy_notifier(void *data) ctf_fs_trace_destroy(trace); } -void ctf_fs_finalize(struct bt_self_component_source *component) +void ctf_fs_finalize(bt_self_component_source *component) { ctf_fs_destroy(bt_self_component_get_data( bt_self_component_source_as_self_component(component))); @@ -512,15 +512,15 @@ void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group) g_ptr_array_free(ds_file_group->ds_file_infos, TRUE); } - bt_object_put_ref(ds_file_group->stream); - bt_object_put_ref(ds_file_group->stream_class); + bt_stream_put_ref(ds_file_group->stream); + bt_stream_class_put_ref(ds_file_group->stream_class); g_free(ds_file_group); } static struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create( struct ctf_fs_trace *ctf_fs_trace, - struct bt_stream_class *stream_class, + bt_stream_class *stream_class, uint64_t stream_instance_id) { struct ctf_fs_ds_file_group *ds_file_group; @@ -539,7 +539,7 @@ struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create( ds_file_group->stream_id = stream_instance_id; BT_ASSERT(stream_class); ds_file_group->stream_class = stream_class; - bt_object_get_ref(ds_file_group->stream_class); + bt_stream_class_get_ref(ds_file_group->stream_class); ds_file_group->ctf_fs_trace = ctf_fs_trace; goto end; @@ -614,7 +614,7 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const char *path) { - struct bt_stream_class *stream_class = NULL; + bt_stream_class *stream_class = NULL; int64_t stream_instance_id = -1; int64_t begin_ns = -1; struct ctf_fs_ds_file_group *ds_file_group = NULL; @@ -914,11 +914,11 @@ end: } static -int set_trace_name(struct bt_trace *trace, const char *name_suffix) +int set_trace_name(bt_trace *trace, const char *name_suffix) { int ret = 0; - const struct bt_trace_class *tc = bt_trace_borrow_class_const(trace); - const struct bt_value *val; + const bt_trace_class *tc = bt_trace_borrow_class_const(trace); + const bt_value *val; GString *name; name = g_string_new(NULL); @@ -1307,11 +1307,11 @@ end: static struct ctf_fs_component *ctf_fs_create( - struct bt_self_component_source *self_comp, - const struct bt_value *params) + bt_self_component_source *self_comp, + const bt_value *params) { struct ctf_fs_component *ctf_fs; - const struct bt_value *value = NULL; + const bt_value *value = NULL; const char *path_param; ctf_fs = g_new0(struct ctf_fs_component, 1); @@ -1385,8 +1385,8 @@ end: BT_HIDDEN enum bt_self_component_status ctf_fs_init( - struct bt_self_component_source *self_comp, - const struct bt_value *params, UNUSED_VAR void *init_method_data) + bt_self_component_source *self_comp, + const bt_value *params, UNUSED_VAR void *init_method_data) { struct ctf_fs_component *ctf_fs; enum bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK; @@ -1401,10 +1401,10 @@ enum bt_self_component_status ctf_fs_init( BT_HIDDEN enum bt_query_status ctf_fs_query( - struct bt_self_component_class_source *comp_class, - const struct bt_query_executor *query_exec, - const char *object, const struct bt_value *params, - const struct bt_value **result) + bt_self_component_class_source *comp_class, + const bt_query_executor *query_exec, + const char *object, const bt_value *params, + const bt_value **result) { enum bt_query_status status = BT_QUERY_STATUS_OK;