*
* Field is borrowed.
*/
- struct bt_private_field *base;
+ struct bt_field *base;
/* Index of next field to set */
size_t index;
* This is set by read_dscope_begin_state() and contains the
* value of one of the pointers in `dscopes` below.
*/
- struct bt_private_field *cur_dscope_field;
+ struct 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_private_packet_header_field *packet_header_field;
+ struct bt_packet_header_field *packet_header_field;
/* Current packet header field wrapper (NULL if not created yet) */
- struct bt_private_packet_context_field *packet_context_field;
+ struct bt_packet_context_field *packet_context_field;
/* Current event header field (NULL if not created yet) */
- struct bt_private_event_header_field *event_header_field;
+ struct bt_event_header_field *event_header_field;
/* Current packet (NULL if not created yet) */
- struct bt_private_packet *packet;
+ struct bt_packet *packet;
/* Current stream (NULL if not set yet) */
- struct bt_private_stream *stream;
+ struct bt_stream *stream;
/* Current event (NULL if not created yet) */
- struct bt_private_event *event;
+ struct bt_event *event;
/* Current event notification (NULL if not created yet) */
struct bt_private_notification *event_notif;
/* Database of current dynamic scopes */
struct {
- struct bt_private_field *trace_packet_header;
- struct bt_private_field *stream_packet_context;
- struct bt_private_field *event_header;
- struct bt_private_field *event_common_context;
- struct bt_private_field *event_spec_context;
- struct bt_private_field *event_payload;
+ 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;
} dscopes;
/* Current state */
}
static
-void stack_push(struct stack *stack, struct bt_private_field *base)
+void stack_push(struct stack *stack, struct 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_private_field *dscope_field)
+ struct bt_field *dscope_field)
{
enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
enum bt_bfcr_status bfcr_status;
notit->dscopes.event_header = NULL;
if (notit->event_header_field) {
- bt_private_event_header_field_release(notit->event_header_field);
+ bt_event_header_field_release(notit->event_header_field);
notit->event_header_field = NULL;
}
notit->dscopes.trace_packet_header = NULL;
if (notit->packet_header_field) {
- bt_private_packet_header_field_release(notit->packet_header_field);
+ bt_packet_header_field_release(notit->packet_header_field);
notit->packet_header_field = NULL;
}
notit->dscopes.stream_packet_context = NULL;
if (notit->packet_context_field) {
- bt_private_packet_context_field_release(notit->packet_context_field);
+ bt_packet_context_field_release(notit->packet_context_field);
notit->packet_context_field = NULL;
}
* the ID of the stream class to select.
*/
notit->packet_header_field =
- bt_private_packet_header_field_create(
+ 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.");
}
notit->dscopes.trace_packet_header =
- bt_private_packet_header_field_borrow_field(
+ bt_packet_header_field_borrow_field(
notit->packet_header_field);
BT_ASSERT(notit->dscopes.trace_packet_header);
}
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_private_stream *stream = NULL;
+ struct bt_stream *stream = NULL;
BT_LOGV("Calling user function (get stream): notit-addr=%p, "
"stream-class-addr=%p, stream-class-id=%" PRId64,
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_private_packet *packet = NULL;
+ struct bt_packet *packet = NULL;
BT_LOGV("Creating packet for packet notification: "
"notit-addr=%p", notit);
/* Create packet */
BT_ASSERT(notit->stream);
- packet = bt_private_packet_create(notit->stream);
+ packet = bt_packet_create(notit->stream);
if (!packet) {
BT_LOGE("Cannot create packet from stream: "
"notit-addr=%p, stream-addr=%p, "
* (bt_notif_iter_borrow_packet_header_context_fields()).
*/
notit->packet_context_field =
- bt_private_packet_context_field_create(
+ bt_packet_context_field_create(
notit->meta.sc->ir_sc);
if (!notit->packet_context_field) {
BT_LOGE_STR("Cannot create packet context field wrapper from stream class.");
}
notit->dscopes.stream_packet_context =
- bt_private_packet_context_field_borrow_field(
+ bt_packet_context_field_borrow_field(
notit->packet_context_field);
BT_ASSERT(notit->dscopes.stream_packet_context);
}
if (event_header_fc->in_ir) {
BT_ASSERT(!notit->event_header_field);
notit->event_header_field =
- bt_private_event_header_field_create(
+ 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.");
}
notit->dscopes.event_header =
- bt_private_event_header_field_borrow_field(
+ bt_event_header_field_borrow_field(
notit->event_header_field);
BT_ASSERT(notit->dscopes.event_header);
}
int ret;
BT_ASSERT(notit->event);
- ret = bt_private_event_move_header_field(notit->event,
+ ret = bt_event_move_header_field(notit->event,
notit->event_header_field);
if (ret) {
status = BT_NOTIF_ITER_STATUS_ERROR;
* the same value as the event header field within
* notit->event.
*/
- BT_ASSERT(bt_private_event_borrow_header_field(
+ BT_ASSERT(bt_event_borrow_header_field(
notit->event) == notit->dscopes.event_header);
}
if (event_common_context_fc->in_ir) {
BT_ASSERT(!notit->dscopes.event_common_context);
notit->dscopes.event_common_context =
- bt_private_event_borrow_common_context_field(
+ bt_event_borrow_common_context_field(
notit->event);
BT_ASSERT(notit->dscopes.event_common_context);
}
if (event_spec_context_fc->in_ir) {
BT_ASSERT(!notit->dscopes.event_spec_context);
notit->dscopes.event_spec_context =
- bt_private_event_borrow_specific_context_field(
+ bt_event_borrow_specific_context_field(
notit->event);
BT_ASSERT(notit->dscopes.event_spec_context);
}
if (event_payload_fc->in_ir) {
BT_ASSERT(!notit->dscopes.event_payload);
notit->dscopes.event_payload =
- bt_private_event_borrow_payload_field(
+ bt_event_borrow_payload_field(
notit->event);
BT_ASSERT(notit->dscopes.event_payload);
}
notit->cur_dscope_field = NULL;
if (notit->packet_header_field) {
- bt_private_packet_header_field_release(notit->packet_header_field);
+ bt_packet_header_field_release(notit->packet_header_field);
notit->packet_header_field = NULL;
}
if (notit->packet_context_field) {
- bt_private_packet_context_field_release(notit->packet_context_field);
+ bt_packet_context_field_release(notit->packet_context_field);
notit->packet_context_field = NULL;
}
if (notit->event_header_field) {
- bt_private_event_header_field_release(notit->event_header_field);
+ bt_event_header_field_release(notit->event_header_field);
notit->event_header_field = NULL;
}
}
static
-struct bt_private_field *borrow_next_field(struct bt_notif_iter *notit)
+struct bt_field *borrow_next_field(struct bt_notif_iter *notit)
{
- struct bt_private_field *next_field = NULL;
- struct bt_private_field *base_field;
- struct bt_private_field_class *base_fc;
+ struct bt_field *next_field = NULL;
+ struct bt_field *base_field;
+ const struct bt_field_class *base_fc;
size_t index;
BT_ASSERT(!stack_empty(notit->stack));
index = stack_top(notit->stack)->index;
base_field = stack_top(notit->stack)->base;
BT_ASSERT(base_field);
- base_fc = bt_private_field_borrow_class(base_field);
+ base_fc = bt_field_borrow_class_const(base_field);
BT_ASSERT(base_fc);
- switch (bt_field_class_get_type(
- bt_private_field_class_as_field_class(base_fc))) {
+ switch (bt_field_class_get_type(base_fc)) {
case BT_FIELD_CLASS_TYPE_STRUCTURE:
{
BT_ASSERT(index <
bt_field_class_structure_get_member_count(
- bt_private_field_class_as_field_class(
- bt_private_field_borrow_class(
- base_field))));
+ bt_field_borrow_class_const(
+ base_field)));
next_field =
- bt_private_field_structure_borrow_member_field_by_index(
+ bt_field_structure_borrow_member_field_by_index(
base_field, index);
break;
}
case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
- BT_ASSERT(index < bt_field_array_get_length(
- bt_private_field_as_field(base_field)));
- next_field = bt_private_field_array_borrow_element_field_by_index(
+ BT_ASSERT(index < bt_field_array_get_length(base_field));
+ next_field = bt_field_array_borrow_element_field_by_index(
base_field, index);
break;
case BT_FIELD_CLASS_TYPE_VARIANT:
BT_ASSERT(index == 0);
- next_field = bt_private_field_variant_borrow_selected_option_field(
+ next_field = bt_field_variant_borrow_selected_option_field(
base_field);
break;
default:
{
struct bt_notif_iter *notit = data;
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_private_field *field = NULL;
+ struct bt_field *field = NULL;
struct ctf_field_class_int *int_fc = (void *) fc;
BT_LOGV("Unsigned integer function called from BFCR: "
field = borrow_next_field(notit);
BT_ASSERT(field);
- BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
- BT_ASSERT(bt_field_get_class_type(
- bt_private_field_as_field(field)) ==
- BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER ||
- bt_field_get_class_type(bt_private_field_as_field(field)) ==
- BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION);
- bt_private_field_unsigned_integer_set_value(field, value);
+ BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc);
+ BT_ASSERT(bt_field_get_class_type(field) ==
+ BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER ||
+ bt_field_get_class_type(field) ==
+ BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION);
+ bt_field_unsigned_integer_set_value(field, value);
stack_top(notit->stack)->index++;
end:
int ret;
struct bt_notif_iter *notit = data;
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_private_field *string_field = NULL;
+ struct bt_field *string_field = NULL;
struct ctf_field_class_int *int_fc = (void *) fc;
char str[2] = {'\0', '\0'};
}
string_field = stack_top(notit->stack)->base;
- BT_ASSERT(bt_field_get_class_type(
- bt_private_field_as_field(string_field)) ==
- BT_FIELD_CLASS_TYPE_STRING);
+ BT_ASSERT(bt_field_get_class_type(string_field) ==
+ BT_FIELD_CLASS_TYPE_STRING);
/* Append character */
str[0] = (char) value;
- ret = bt_private_field_string_append_with_length(string_field, str, 1);
+ ret = bt_field_string_append_with_length(string_field, str, 1);
if (ret) {
BT_LOGE("Cannot append character to string field's value: "
"notit-addr=%p, field-addr=%p, ret=%d",
struct ctf_field_class *fc, void *data)
{
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_private_field *field = NULL;
+ struct bt_field *field = NULL;
struct bt_notif_iter *notit = data;
struct ctf_field_class_int *int_fc = (void *) fc;
field = borrow_next_field(notit);
BT_ASSERT(field);
- BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
- BT_ASSERT(bt_field_get_class_type(
- bt_private_field_as_field(field)) ==
- BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
- bt_field_get_class_type(bt_private_field_as_field(field)) ==
- BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION);
- bt_private_field_signed_integer_set_value(field, value);
+ BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc);
+ BT_ASSERT(bt_field_get_class_type(field) ==
+ BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
+ bt_field_get_class_type(field) ==
+ BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION);
+ bt_field_signed_integer_set_value(field, value);
stack_top(notit->stack)->index++;
end:
struct ctf_field_class *fc, void *data)
{
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_private_field *field = NULL;
+ struct bt_field *field = NULL;
struct bt_notif_iter *notit = data;
BT_LOGV("Floating point number function called from BFCR: "
BT_ASSERT(fc->in_ir);
field = borrow_next_field(notit);
BT_ASSERT(field);
- BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
- BT_ASSERT(bt_field_get_class_type(
- bt_private_field_as_field(field)) ==
- BT_FIELD_CLASS_TYPE_REAL);
- bt_private_field_real_set_value(field, value);
+ BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc);
+ BT_ASSERT(bt_field_get_class_type(field) ==
+ BT_FIELD_CLASS_TYPE_REAL);
+ bt_field_real_set_value(field, value);
stack_top(notit->stack)->index++;
return status;
}
enum bt_bfcr_status bfcr_string_begin_cb(
struct ctf_field_class *fc, void *data)
{
- struct bt_private_field *field = NULL;
+ struct bt_field *field = NULL;
struct bt_notif_iter *notit = data;
int ret;
BT_ASSERT(fc->in_ir);
field = borrow_next_field(notit);
BT_ASSERT(field);
- BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
- BT_ASSERT(bt_field_get_class_type(
- bt_private_field_as_field(field)) ==
- BT_FIELD_CLASS_TYPE_STRING);
- ret = bt_private_field_string_clear(field);
+ BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc);
+ BT_ASSERT(bt_field_get_class_type(field) ==
+ BT_FIELD_CLASS_TYPE_STRING);
+ ret = bt_field_string_clear(field);
BT_ASSERT(ret == 0);
/*
size_t len, struct ctf_field_class *fc, void *data)
{
enum bt_bfcr_status status = BT_BFCR_STATUS_OK;
- struct bt_private_field *field = NULL;
+ struct bt_field *field = NULL;
struct bt_notif_iter *notit = data;
int ret;
BT_ASSERT(field);
/* Append current substring */
- ret = bt_private_field_string_append_with_length(field, value, len);
+ ret = bt_field_string_append_with_length(field, value, len);
if (ret) {
BT_LOGE("Cannot append substring to string field's value: "
"notit-addr=%p, field-addr=%p, string-length=%zu, "
struct ctf_field_class *fc, void *data)
{
struct bt_notif_iter *notit = data;
- struct bt_private_field *field;
+ struct bt_field *field;
BT_LOGV("Compound (beginning) function called from BFCR: "
"notit-addr=%p, bfcr-addr=%p, fc-addr=%p, "
/* Push field */
BT_ASSERT(field);
- BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc);
+ BT_ASSERT(bt_field_borrow_class_const(field) == fc->ir_fc);
stack_push(notit->stack, field);
/*
if (array_fc->is_text) {
int ret;
- BT_ASSERT(bt_field_get_class_type(
- bt_private_field_as_field(field)) ==
- BT_FIELD_CLASS_TYPE_STRING);
+ BT_ASSERT(bt_field_get_class_type(field) ==
+ BT_FIELD_CLASS_TYPE_STRING);
notit->done_filling_string = false;
- ret = bt_private_field_string_clear(field);
+ ret = bt_field_string_clear(field);
BT_ASSERT(ret == 0);
bt_bfcr_set_unsigned_int_cb(notit->bfcr,
bfcr_unsigned_int_char_cb);
}
BT_ASSERT(!stack_empty(notit->stack));
- BT_ASSERT(bt_private_field_borrow_class(stack_top(notit->stack)->base) ==
+ BT_ASSERT(bt_field_borrow_class_const(stack_top(notit->stack)->base) ==
fc->ir_fc);
/*
if (array_fc->is_text) {
BT_ASSERT(bt_field_get_class_type(
- bt_private_field_as_field(
- stack_top(notit->stack)->base)) ==
+ stack_top(notit->stack)->base) ==
BT_FIELD_CLASS_TYPE_STRING);
bt_bfcr_set_unsigned_int_cb(notit->bfcr,
bfcr_unsigned_int_cb);
static
int64_t bfcr_get_sequence_length_cb(struct ctf_field_class *fc, void *data)
{
- struct bt_private_field *seq_field;
+ struct bt_field *seq_field;
struct bt_notif_iter *notit = data;
struct ctf_field_class_sequence *seq_fc = (void *) fc;
int64_t length = -1;
seq_fc->stored_length_index);
seq_field = stack_top(notit->stack)->base;
BT_ASSERT(seq_field);
- ret = bt_private_field_dynamic_array_set_length(seq_field, (uint64_t) length);
+ ret = bt_field_dynamic_array_set_length(seq_field, (uint64_t) length);
if (ret) {
BT_LOGE("Cannot set dynamic array field's length field: "
"notit-addr=%p, field-addr=%p, "
var_fc, (uint64_t) option_index);
if (selected_option->fc->in_ir) {
- struct bt_private_field *var_field = stack_top(notit->stack)->base;
+ struct bt_field *var_field = stack_top(notit->stack)->base;
- ret = bt_private_field_variant_select_option_field(
+ ret = bt_field_variant_select_option_field(
var_field, option_index);
if (ret) {
BT_LOGW("Cannot select variant field's option field: "
static
void set_event_default_clock_value(struct bt_notif_iter *notit)
{
- struct bt_private_event *event =
+ struct bt_event *event =
bt_private_notification_event_borrow_event(
notit->event_notif);
- struct bt_stream_class *sc = bt_private_stream_class_as_stream_class(
- notit->meta.sc->ir_sc);
+ struct bt_stream_class *sc = notit->meta.sc->ir_sc;
BT_ASSERT(event);
if (bt_stream_class_borrow_default_clock_class(sc)) {
- bt_private_event_set_default_clock_value(event,
+ bt_event_set_default_clock_value(event,
notit->default_clock_val);
}
}
int ret;
enum bt_notif_iter_status status;
struct bt_private_notification *notif = NULL;
- struct bt_stream_class *sc;
+ const struct bt_stream_class *sc;
status = set_current_packet(notit);
if (status != BT_NOTIF_ITER_STATUS_OK) {
}
BT_ASSERT(notit->packet);
- sc = bt_private_stream_class_as_stream_class(notit->meta.sc->ir_sc);
+ sc = notit->meta.sc->ir_sc;
BT_ASSERT(sc);
if (bt_stream_class_packets_have_discarded_event_counter_snapshot(sc)) {
BT_ASSERT(notit->snapshots.discarded_events != UINT64_C(-1));
- bt_private_packet_set_discarded_event_counter_snapshot(
+ bt_packet_set_discarded_event_counter_snapshot(
notit->packet, notit->snapshots.discarded_events);
}
if (bt_stream_class_packets_have_packet_counter_snapshot(sc)) {
BT_ASSERT(notit->snapshots.packets != UINT64_C(-1));
- bt_private_packet_set_packet_counter_snapshot(
+ bt_packet_set_packet_counter_snapshot(
notit->packet, notit->snapshots.packets);
}
if (bt_stream_class_packets_have_default_beginning_clock_value(sc)) {
BT_ASSERT(notit->snapshots.beginning_clock != UINT64_C(-1));
- bt_private_packet_set_default_beginning_clock_value(
+ bt_packet_set_default_beginning_clock_value(
notit->packet, notit->snapshots.beginning_clock);
}
if (bt_stream_class_packets_have_default_end_clock_value(sc)) {
BT_ASSERT(notit->snapshots.end_clock != UINT64_C(-1));
- bt_private_packet_set_default_end_clock_value(
+ bt_packet_set_default_end_clock_value(
notit->packet, notit->snapshots.end_clock);
}
if (notit->packet_header_field) {
- ret = bt_private_packet_move_header_field(
+ ret = bt_packet_move_header_field(
notit->packet, notit->packet_header_field);
if (ret) {
goto end;
* the same value as the packet header field within
* notit->packet.
*/
- BT_ASSERT(bt_private_packet_borrow_header_field(
+ BT_ASSERT(bt_packet_borrow_header_field(
notit->packet) ==
notit->dscopes.trace_packet_header);
}
if (notit->packet_context_field) {
- ret = bt_private_packet_move_context_field(
+ ret = bt_packet_move_context_field(
notit->packet, notit->packet_context_field);
if (ret) {
goto end;
* the same value as the packet header field within
* notit->packet.
*/
- BT_ASSERT(bt_private_packet_borrow_context_field(
+ BT_ASSERT(bt_packet_borrow_context_field(
notit->packet) ==
notit->dscopes.stream_packet_context);
}
BT_HIDDEN
enum bt_notif_iter_status bt_notif_iter_borrow_packet_header_context_fields(
struct bt_notif_iter *notit,
- struct bt_private_field **packet_header_field,
- struct bt_private_field **packet_context_field)
+ struct bt_field **packet_header_field,
+ struct bt_field **packet_context_field)
{
int ret;
enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
projects / babeltrace.git / blobdiff