*
* Field is borrowed.
*/
- struct bt_field *base;
+ bt_field *base;
/* Index of next field to set */
size_t index;
struct stack *stack;
/* Current notification iterator to create notifications (weak) */
- struct bt_self_notification_iterator *notif_iter;
+ bt_self_notification_iterator *notif_iter;
/*
* Current dynamic scope field pointer.
* This is set by read_dscope_begin_state() and contains the
* value of one of the pointers in `dscopes` below.
*/
- struct bt_field *cur_dscope_field;
+ bt_field *cur_dscope_field;
/*
* True if we're done filling a string field from a text
} meta;
/* Current packet header field wrapper (NULL if not created yet) */
- struct bt_packet_header_field *packet_header_field;
+ bt_packet_header_field *packet_header_field;
/* Current packet header field wrapper (NULL if not created yet) */
- struct bt_packet_context_field *packet_context_field;
+ bt_packet_context_field *packet_context_field;
/* Current event header field (NULL if not created yet) */
- struct bt_event_header_field *event_header_field;
+ bt_event_header_field *event_header_field;
/* Current packet (NULL if not created yet) */
- struct bt_packet *packet;
+ bt_packet *packet;
/* Current stream (NULL if not set yet) */
- struct bt_stream *stream;
+ bt_stream *stream;
/* Current event (NULL if not created yet) */
- struct bt_event *event;
+ bt_event *event;
/* Current event notification (NULL if not created yet) */
- struct bt_private_notification *event_notif;
+ bt_notification *event_notif;
/* Database of current dynamic scopes */
struct {
- struct bt_field *trace_packet_header;
- struct bt_field *stream_packet_context;
- struct bt_field *event_header;
- struct bt_field *event_common_context;
- struct bt_field *event_spec_context;
- struct bt_field *event_payload;
+ bt_field *trace_packet_header;
+ bt_field *stream_packet_context;
+ bt_field *event_header;
+ bt_field *event_common_context;
+ bt_field *event_spec_context;
+ bt_field *event_payload;
} dscopes;
/* Current state */
}
static
-void stack_push(struct stack *stack, struct bt_field *base)
+void stack_push(struct stack *stack, bt_field *base)
{
struct stack_entry *entry;
struct bt_notif_iter *notit,
struct ctf_field_class *dscope_fc,
enum state done_state, enum state continue_state,
- struct bt_field *dscope_field)
+ bt_field *dscope_field)
{
enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
enum bt_bfcr_status bfcr_status;
goto end;
}
- /* Packet header class is common to the whole trace. */
+ /* Packet header class is common to the whole trace class. */
packet_header_fc = notit->meta.tc->packet_header_fc;
if (!packet_header_fc) {
notit->state = STATE_AFTER_TRACE_PACKET_HEADER;
if (packet_header_fc->in_ir) {
/*
- * Create free packet header field from trace. This
- * field is going to be moved to the packet once we
+ * Create free packet header field from trace class.
+ * This field is going to be moved to the packet once we
* create it. We cannot create the packet now because:
*
* 1. A packet is created from a stream.
bt_packet_header_field_create(
notit->meta.tc->ir_tc);
if (!notit->packet_header_field) {
- BT_LOGE_STR("Cannot create packet header field wrapper from trace.");
+ BT_LOGE_STR("Cannot create packet header field wrapper from trace class.");
ret = BT_NOTIF_ITER_STATUS_ERROR;
goto end;
}
notit->cur_event_class_id = -1;
notit->cur_data_stream_id = -1;
BT_LOGV("Decoding packet header field:"
- "notit-addr=%p, trace-addr=%p, trace-name=\"%s\", fc-addr=%p",
- notit, notit->meta.tc,
- notit->meta.tc->name->str, packet_header_fc);
+ "notit-addr=%p, trace-class-addr=%p, fc-addr=%p",
+ notit, notit->meta.tc, packet_header_fc);
ret = read_dscope_begin_state(notit, packet_header_fc,
STATE_AFTER_TRACE_PACKET_HEADER,
STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE,
notit->dscopes.trace_packet_header);
if (ret < 0) {
BT_LOGW("Cannot decode packet header field: "
- "notit-addr=%p, trace-addr=%p, "
- "trace-name=\"%s\", fc-addr=%p",
- notit, notit->meta.tc,
- notit->meta.tc->name->str,
- packet_header_fc);
+ "notit-addr=%p, trace-class-addr=%p, "
+ "fc-addr=%p",
+ notit, notit->meta.tc, packet_header_fc);
}
end:
if (notit->meta.tc->stream_classes->len != 1) {
BT_LOGW("Need exactly one stream class since there's "
"no stream class ID field: "
- "notit-addr=%p, trace-name=\"%s\"",
- notit, notit->meta.tc->name->str);
+ "notit-addr=%p", notit);
status = BT_NOTIF_ITER_STATUS_ERROR;
goto end;
}
new_stream_class = ctf_trace_class_borrow_stream_class_by_id(
notit->meta.tc, notit->cur_stream_class_id);
if (!new_stream_class) {
- BT_LOGW("No stream class with ID of stream class ID to use in trace: "
+ BT_LOGW("No stream class with ID of stream class ID to use in trace class: "
"notit-addr=%p, stream-class-id=%" PRIu64 ", "
- "trace-addr=%p, trace-name=\"%s\"",
- notit, notit->cur_stream_class_id, notit->meta.tc,
- notit->meta.tc->name->str);
+ "trace-class-addr=%p",
+ notit, notit->cur_stream_class_id, notit->meta.tc);
status = BT_NOTIF_ITER_STATUS_ERROR;
goto end;
}
"prev-stream-class-id=%" PRId64 ", "
"next-stream-class-addr=%p, "
"next-stream-class-id=%" PRId64 ", "
- "trace-addr=%p, trace-name=\"%s\"",
+ "trace-addr=%p",
notit, notit->meta.sc,
notit->meta.sc->id,
new_stream_class,
new_stream_class->id,
- notit->meta.tc,
- notit->meta.tc->name->str);
+ notit->meta.tc);
status = BT_NOTIF_ITER_STATUS_ERROR;
goto end;
}
enum bt_notif_iter_status set_current_stream(struct bt_notif_iter *notit)
{
enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
- struct bt_stream *stream = NULL;
+ bt_stream *stream = NULL;
BT_LOGV("Calling user function (get stream): notit-addr=%p, "
"stream-class-addr=%p, stream-class-id=%" PRId64,
stream = notit->medium.medops.borrow_stream(
notit->meta.sc->ir_sc, notit->cur_data_stream_id,
notit->medium.data);
- bt_object_get_ref(stream);
+ bt_stream_get_ref(stream);
BT_LOGV("User function returned: stream-addr=%p", stream);
if (!stream) {
BT_LOGW_STR("User function failed to return a stream object "
goto end;
}
- BT_OBJECT_MOVE_REF(notit->stream, stream);
+ BT_STREAM_MOVE_REF(notit->stream, stream);
end:
- bt_object_put_ref(stream);
+ bt_stream_put_ref(stream);
return status;
}
enum bt_notif_iter_status set_current_packet(struct bt_notif_iter *notit)
{
enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
- struct bt_packet *packet = NULL;
+ bt_packet *packet = NULL;
BT_LOGV("Creating packet for packet notification: "
"notit-addr=%p", notit);
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(packet);
+ BT_PACKET_PUT_REF_AND_RESET(packet);
status = BT_NOTIF_ITER_STATUS_ERROR;
end:
- BT_OBJECT_MOVE_REF(notit->packet, packet);
+ BT_PACKET_MOVE_REF(notit->packet, packet);
return status;
}
bt_event_header_field_create(
notit->meta.sc->ir_sc);
if (!notit->event_header_field) {
- BT_LOGE_STR("Cannot create event header field wrapper from trace.");
+ BT_LOGE_STR("Cannot create event header field wrapper from trace class.");
status = BT_NOTIF_ITER_STATUS_ERROR;
goto end;
}
if (notit->meta.sc->event_classes->len != 1) {
BT_LOGW("Need exactly one event class since there's "
"no event class ID field: "
- "notit-addr=%p, trace-name=\"%s\"",
- notit, notit->meta.tc->name->str);
+ "notit-addr=%p", notit);
status = BT_NOTIF_ITER_STATUS_ERROR;
goto end;
}
BT_LOGW("No event class with ID of event class ID to use in stream class: "
"notit-addr=%p, stream-class-id=%" PRIu64 ", "
"event-class-id=%" PRIu64 ", "
- "trace-addr=%p, trace-name=\"%s\"",
+ "trace-class-addr=%p",
notit, notit->meta.sc->id, notit->cur_event_class_id,
- notit->meta.tc, notit->meta.tc->name->str);
+ notit->meta.tc);
status = BT_NOTIF_ITER_STATUS_ERROR;
goto end;
}
struct bt_notif_iter *notit)
{
enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
- struct bt_private_notification *notif = NULL;
+ bt_notification *notif = NULL;
BT_ASSERT(notit->meta.ec);
BT_ASSERT(notit->packet);
notit->meta.ec->name->str,
notit->packet);
BT_ASSERT(notit->notif_iter);
- notif = bt_private_notification_event_create(notit->notif_iter,
+ notif = bt_notification_event_create(notit->notif_iter,
notit->meta.ec->ir_ec, notit->packet);
if (!notif) {
BT_LOGE("Cannot create event notification: "
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(notif);
+ BT_NOTIFICATION_PUT_REF_AND_RESET(notif);
status = BT_NOTIF_ITER_STATUS_ERROR;
end:
- BT_OBJECT_MOVE_REF(notit->event_notif, notif);
+ BT_NOTIFICATION_MOVE_REF(notit->event_notif, notif);
return status;
}
goto end;
}
- notit->event = bt_private_notification_event_borrow_event(
+ notit->event = bt_notification_event_borrow_event(
notit->event_notif);
BT_ASSERT(notit->event);
stack_clear(notit->stack);
notit->meta.sc = NULL;
notit->meta.ec = NULL;
- BT_OBJECT_PUT_REF_AND_RESET(notit->packet);
- BT_OBJECT_PUT_REF_AND_RESET(notit->stream);
- BT_OBJECT_PUT_REF_AND_RESET(notit->event_notif);
+ BT_PACKET_PUT_REF_AND_RESET(notit->packet);
+ BT_STREAM_PUT_REF_AND_RESET(notit->stream);
+ BT_NOTIFICATION_PUT_REF_AND_RESET(notit->event_notif);
release_all_dscopes(notit);
notit->cur_dscope_field = NULL;
notit->cur_packet_offset);
stack_clear(notit->stack);
notit->meta.ec = NULL;
- BT_OBJECT_PUT_REF_AND_RESET(notit->packet);
- BT_OBJECT_PUT_REF_AND_RESET(notit->event_notif);
+ BT_PACKET_PUT_REF_AND_RESET(notit->packet);
+ BT_NOTIFICATION_PUT_REF_AND_RESET(notit->event_notif);
release_all_dscopes(notit);
notit->cur_dscope_field = NULL;
}
static
-struct bt_field *borrow_next_field(struct bt_notif_iter *notit)
+bt_field *borrow_next_field(struct bt_notif_iter *notit)
{
- struct bt_field *next_field = NULL;
- struct bt_field *base_field;
- const struct bt_field_class *base_fc;
+ bt_field *next_field = NULL;
+ bt_field *base_field;
+ const bt_field_class *base_fc;
size_t index;
BT_ASSERT(!stack_empty(notit->stack));
{
struct bt_notif_iter *notit = data;
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_field *field = NULL;
+ bt_field *field = NULL;
struct ctf_field_class_int *int_fc = (void *) fc;
BT_LOGV("Unsigned integer function called from BFCR: "
int ret;
struct bt_notif_iter *notit = data;
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_field *string_field = NULL;
+ bt_field *string_field = NULL;
struct ctf_field_class_int *int_fc = (void *) fc;
char str[2] = {'\0', '\0'};
struct ctf_field_class *fc, void *data)
{
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_field *field = NULL;
+ bt_field *field = NULL;
struct bt_notif_iter *notit = data;
struct ctf_field_class_int *int_fc = (void *) fc;
struct ctf_field_class *fc, void *data)
{
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_field *field = NULL;
+ bt_field *field = NULL;
struct bt_notif_iter *notit = data;
BT_LOGV("Floating point number function called from BFCR: "
enum bt_bfcr_status bfcr_string_begin_cb(
struct ctf_field_class *fc, void *data)
{
- struct bt_field *field = NULL;
+ bt_field *field = NULL;
struct bt_notif_iter *notit = data;
int ret;
size_t len, struct ctf_field_class *fc, void *data)
{
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_field *field = NULL;
+ bt_field *field = NULL;
struct bt_notif_iter *notit = data;
int ret;
struct ctf_field_class *fc, void *data)
{
struct bt_notif_iter *notit = data;
- struct bt_field *field;
+ bt_field *field;
BT_LOGV("Compound (beginning) function called from BFCR: "
"notit-addr=%p, bfcr-addr=%p, fc-addr=%p, "
static
int64_t bfcr_get_sequence_length_cb(struct ctf_field_class *fc, void *data)
{
- struct bt_field *seq_field;
+ bt_field *seq_field;
struct bt_notif_iter *notit = data;
struct ctf_field_class_sequence *seq_fc = (void *) fc;
int64_t length = -1;
var_fc, (uint64_t) option_index);
if (selected_option->fc->in_ir) {
- struct bt_field *var_field = stack_top(notit->stack)->base;
+ bt_field *var_field = stack_top(notit->stack)->base;
ret = bt_field_variant_select_option_field(
var_field, option_index);
static
void set_event_default_clock_value(struct bt_notif_iter *notit)
{
- struct bt_event *event =
- bt_private_notification_event_borrow_event(
+ bt_event *event =
+ bt_notification_event_borrow_event(
notit->event_notif);
- struct bt_stream_class *sc = notit->meta.sc->ir_sc;
+ bt_stream_class *sc = notit->meta.sc->ir_sc;
BT_ASSERT(event);
static
void notify_new_stream(struct bt_notif_iter *notit,
- struct bt_private_notification **notification)
+ bt_notification **notification)
{
enum bt_notif_iter_status status;
- struct bt_private_notification *ret = NULL;
+ bt_notification *ret = NULL;
status = set_current_stream(notit);
if (status != BT_NOTIF_ITER_STATUS_OK) {
- BT_OBJECT_PUT_REF_AND_RESET(ret);
+ BT_NOTIFICATION_PUT_REF_AND_RESET(ret);
goto end;
}
BT_ASSERT(notit->stream);
BT_ASSERT(notit->notif_iter);
- ret = bt_private_notification_stream_begin_create(notit->notif_iter,
+ ret = bt_notification_stream_beginning_create(notit->notif_iter,
notit->stream);
if (!ret) {
BT_LOGE("Cannot create stream beginning notification: "
static
void notify_end_of_stream(struct bt_notif_iter *notit,
- struct bt_private_notification **notification)
+ bt_notification **notification)
{
- struct bt_private_notification *ret;
+ bt_notification *ret;
if (!notit->stream) {
BT_LOGE("Cannot create stream for stream notification: "
}
BT_ASSERT(notit->notif_iter);
- ret = bt_private_notification_stream_end_create(notit->notif_iter,
+ ret = bt_notification_stream_end_create(notit->notif_iter,
notit->stream);
if (!ret) {
BT_LOGE("Cannot create stream beginning notification: "
static
void notify_new_packet(struct bt_notif_iter *notit,
- struct bt_private_notification **notification)
+ bt_notification **notification)
{
int ret;
enum bt_notif_iter_status status;
- struct bt_private_notification *notif = NULL;
- const struct bt_stream_class *sc;
+ bt_notification *notif = NULL;
+ const bt_stream_class *sc;
status = set_current_packet(notit);
if (status != BT_NOTIF_ITER_STATUS_OK) {
}
BT_ASSERT(notit->notif_iter);
- notif = bt_private_notification_packet_begin_create(notit->notif_iter,
+ notif = bt_notification_packet_beginning_create(notit->notif_iter,
notit->packet);
if (!notif) {
BT_LOGE("Cannot create packet beginning notification: "
static
void notify_end_of_packet(struct bt_notif_iter *notit,
- struct bt_private_notification **notification)
+ bt_notification **notification)
{
- struct bt_private_notification *notif;
+ bt_notification *notif;
if (!notit->packet) {
return;
}
BT_ASSERT(notit->notif_iter);
- notif = bt_private_notification_packet_end_create(notit->notif_iter,
+ notif = bt_notification_packet_end_create(notit->notif_iter,
notit->packet);
if (!notif) {
BT_LOGE("Cannot create packet end notification: "
}
- BT_OBJECT_PUT_REF_AND_RESET(notit->packet);
+ BT_PACKET_PUT_REF_AND_RESET(notit->packet);
*notification = notif;
}
BT_ASSERT(medops.request_bytes);
BT_ASSERT(medops.borrow_stream);
BT_LOGD("Creating CTF plugin notification iterator: "
- "trace-addr=%p, trace-name=\"%s\", max-request-size=%zu, "
- "data=%p", tc, tc->name->str, max_request_sz, data);
+ "trace-addr=%p, max-request-size=%zu, "
+ "data=%p", tc, max_request_sz, data);
notit = g_new0(struct bt_notif_iter, 1);
if (!notit) {
BT_LOGE_STR("Failed to allocate one CTF plugin notification iterator.");
bt_notif_iter_reset(notit);
BT_LOGD("Created CTF plugin notification iterator: "
- "trace-addr=%p, trace-name=\"%s\", max-request-size=%zu, "
+ "trace-addr=%p, max-request-size=%zu, "
"data=%p, notit-addr=%p",
- tc, tc->name->str, max_request_sz, data,
- notit);
+ tc, max_request_sz, data, notit);
notit->cur_packet_offset = 0;
end:
void bt_notif_iter_destroy(struct bt_notif_iter *notit)
{
- BT_OBJECT_PUT_REF_AND_RESET(notit->packet);
- BT_OBJECT_PUT_REF_AND_RESET(notit->stream);
+ BT_PACKET_PUT_REF_AND_RESET(notit->packet);
+ BT_STREAM_PUT_REF_AND_RESET(notit->stream);
release_all_dscopes(notit);
BT_LOGD("Destroying CTF plugin notification iterator: addr=%p", notit);
enum bt_notif_iter_status bt_notif_iter_get_next_notification(
struct bt_notif_iter *notit,
- struct bt_self_notification_iterator *notif_iter,
- struct bt_private_notification **notification)
+ bt_self_notification_iterator *notif_iter,
+ bt_notification **notification)
{
enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
BT_HIDDEN
enum bt_notif_iter_status bt_notif_iter_borrow_packet_header_context_fields(
struct bt_notif_iter *notit,
- struct bt_field **packet_header_field,
- struct bt_field **packet_context_field)
+ bt_field **packet_header_field,
+ bt_field **packet_context_field)
{
int ret;
enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
projects / babeltrace.git / blobdiff