};
static
-struct bt_field_type *create_packet_header_ft(void)
+struct bt_field_class *create_event_payload_fc(void)
{
- struct bt_field_type *root_ft = NULL;
- struct bt_field_type *ft = NULL;
+ struct bt_field_class *root_fc = NULL;
+ struct bt_field_class *fc = NULL;
int ret;
- root_ft = bt_field_type_structure_create();
- if (!root_ft) {
- BT_LOGE_STR("Cannot create an empty structure field type object.");
+ root_fc = bt_field_class_structure_create();
+ if (!root_fc) {
+ BT_LOGE_STR("Cannot create an empty structure field class object.");
goto error;
}
- ft = bt_field_type_integer_create(32);
- if (!ft) {
- BT_LOGE_STR("Cannot create an integer field type object.");
+ fc = bt_field_class_string_create();
+ if (!fc) {
+ BT_LOGE_STR("Cannot create a string field class object.");
goto error;
}
- ret = bt_field_type_structure_add_field(root_ft, ft, "magic");
+ ret = bt_field_class_structure_append_member(root_fc, "str", fc);
if (ret) {
- BT_LOGE("Cannot add `magic` field type to structure field type: "
- "ret=%d", ret);
- goto error;
- }
-
- BT_PUT(ft);
- ft = bt_field_type_integer_create(8);
- if (!ft) {
- BT_LOGE_STR("Cannot create an integer field type object.");
- goto error;
- }
-
- goto end;
-
-error:
- BT_PUT(root_ft);
-
-end:
- bt_put(ft);
- return root_ft;
-}
-
-static
-struct bt_field_type *create_event_header_ft(
- struct bt_clock_class *clock_class)
-{
- struct bt_field_type *root_ft = NULL;
- struct bt_field_type *ft = NULL;
- int ret;
-
- root_ft = bt_field_type_structure_create();
- if (!root_ft) {
- BT_LOGE_STR("Cannot create an empty structure field type object.");
- goto error;
- }
-
- ft = bt_field_type_integer_create(64);
- if (!ft) {
- BT_LOGE_STR("Cannot create an integer field type object.");
- goto error;
- }
-
- ret = bt_field_type_integer_set_mapped_clock_class(ft, clock_class);
- if (ret) {
- BT_LOGE("Cannot map integer field type to clock class: "
- "ret=%d", ret);
- goto error;
- }
-
- ret = bt_field_type_structure_add_field(root_ft,
- ft, "timestamp");
- if (ret) {
- BT_LOGE("Cannot add `timestamp` field type to structure field type: "
- "ret=%d", ret);
- goto error;
- }
-
- goto end;
-
-error:
- BT_PUT(root_ft);
-
-end:
- bt_put(ft);
- return root_ft;
-}
-
-static
-struct bt_field_type *create_event_payload_ft(void)
-{
- struct bt_field_type *root_ft = NULL;
- struct bt_field_type *ft = NULL;
- int ret;
-
- root_ft = bt_field_type_structure_create();
- if (!root_ft) {
- BT_LOGE_STR("Cannot create an empty structure field type object.");
- goto error;
- }
-
- ft = bt_field_type_string_create();
- if (!ft) {
- BT_LOGE_STR("Cannot create a string field type object.");
- goto error;
- }
-
- ret = bt_field_type_structure_add_field(root_ft,
- ft, "str");
- if (ret) {
- BT_LOGE("Cannot add `str` field type to structure field type: "
+ BT_LOGE("Cannot add `str` member to structure field class: "
"ret=%d", ret);
goto error;
}
goto end;
error:
- BT_PUT(root_ft);
+ BT_PUT(root_fc);
end:
- bt_put(ft);
- return root_ft;
-}
-
-static
-struct bt_clock_class *create_clock_class(void)
-{
- return bt_clock_class_create("the_clock", 1000000000);
+ bt_put(fc);
+ return root_fc;
}
static
int create_meta(struct dmesg_component *dmesg_comp, bool has_ts)
{
- struct bt_field_type *ft = NULL;
+ struct bt_field_class *fc = NULL;
const char *trace_name = NULL;
gchar *basename = NULL;
int ret = 0;
goto error;
}
- ft = create_packet_header_ft();
- if (!ft) {
- BT_LOGE_STR("Cannot create packet header field type.");
- goto error;
- }
-
- ret = bt_trace_set_packet_header_field_type(dmesg_comp->trace, ft);
- if (ret) {
- BT_LOGE_STR("Cannot set trace's packet header field type.");
- goto error;
- }
-
if (dmesg_comp->params.read_from_stdin) {
trace_name = "STDIN";
} else {
}
}
- dmesg_comp->stream_class = bt_stream_class_create(NULL);
+ dmesg_comp->stream_class = bt_stream_class_create(dmesg_comp->trace);
if (!dmesg_comp->stream_class) {
- BT_LOGE_STR("Cannot create an empty stream class object.");
+ BT_LOGE_STR("Cannot create a stream class object.");
goto error;
}
if (has_ts) {
- dmesg_comp->clock_class = create_clock_class();
+ dmesg_comp->clock_class = bt_clock_class_create();
if (!dmesg_comp->clock_class) {
BT_LOGE_STR("Cannot create clock class.");
goto error;
}
- ret = bt_trace_add_clock_class(dmesg_comp->trace,
- dmesg_comp->clock_class);
+ ret = bt_stream_class_set_default_clock_class(
+ dmesg_comp->stream_class, dmesg_comp->clock_class);
if (ret) {
- BT_LOGE_STR("Cannot add clock class to trace.");
- goto error;
- }
-
- bt_put(ft);
- ft = create_event_header_ft(dmesg_comp->clock_class);
- if (!ft) {
- BT_LOGE_STR("Cannot create event header field type.");
- goto error;
- }
-
- ret = bt_stream_class_set_event_header_field_type(
- dmesg_comp->stream_class, ft);
- if (ret) {
- BT_LOGE_STR("Cannot set stream class's event header field type.");
+ BT_LOGE_STR("Cannot set stream class's default clock class.");
goto error;
}
}
- dmesg_comp->event_class = bt_event_class_create("string");
+ dmesg_comp->event_class = bt_event_class_create(
+ dmesg_comp->stream_class);
if (!dmesg_comp->event_class) {
- BT_LOGE_STR("Cannot create an empty event class object.");
- goto error;
- }
-
- bt_put(ft);
- ft = create_event_payload_ft();
- if (!ft) {
- BT_LOGE_STR("Cannot create event payload field type.");
+ BT_LOGE_STR("Cannot create an event class object.");
goto error;
}
- ret = bt_event_class_set_payload_field_type(dmesg_comp->event_class, ft);
+ ret = bt_event_class_set_name(dmesg_comp->event_class, "string");
if (ret) {
- BT_LOGE_STR("Cannot set event class's event payload field type.");
+ BT_LOGE_STR("Cannot set event class's name.");
goto error;
}
- ret = bt_stream_class_add_event_class(dmesg_comp->stream_class,
- dmesg_comp->event_class);
- if (ret) {
- BT_LOGE("Cannot add event class to stream class: ret=%d", ret);
+ fc = create_event_payload_fc();
+ if (!fc) {
+ BT_LOGE_STR("Cannot create event payload field class.");
goto error;
}
- ret = bt_trace_add_stream_class(dmesg_comp->trace,
- dmesg_comp->stream_class);
+ ret = bt_event_class_set_payload_field_class(dmesg_comp->event_class, fc);
if (ret) {
- BT_LOGE("Cannot add event class to stream class: ret=%d", ret);
+ BT_LOGE_STR("Cannot set event class's event payload field class.");
goto error;
}
ret = -1;
end:
- bt_put(ft);
+ bt_put(fc);
if (basename) {
g_free(basename);
static
int handle_params(struct dmesg_component *dmesg_comp, struct bt_value *params)
{
- struct bt_value *read_from_stdin = NULL;
struct bt_value *no_timestamp = NULL;
struct bt_value *path = NULL;
const char *path_str;
int ret = 0;
- no_timestamp = bt_value_map_get(params, "no-extract-timestamp");
+ no_timestamp = bt_value_map_borrow_entry_value(params,
+ "no-extract-timestamp");
if (no_timestamp) {
if (!bt_value_is_bool(no_timestamp)) {
BT_LOGE("Expecting a boolean value for the `no-extract-timestamp` parameter: "
BT_ASSERT(ret == 0);
}
- path = bt_value_map_get(params, "path");
+ path = bt_value_map_borrow_entry_value(params, "path");
if (path) {
if (dmesg_comp->params.read_from_stdin) {
BT_LOGE_STR("Cannot specify both `read-from-stdin` and `path` parameters.");
error:
ret = -1;
-end:
- bt_put(read_from_stdin);
- bt_put(path);
- bt_put(no_timestamp);
- return ret;
-}
-
-static
-int fill_packet_header_field(struct bt_packet *packet)
-{
- struct bt_field *ph = NULL;
- struct bt_field *magic = NULL;
- int ret;
-
- ph = bt_packet_borrow_header(packet);
- BT_ASSERT(ph);
- magic = bt_field_structure_borrow_field_by_name(ph, "magic");
- if (!magic) {
- BT_LOGE_STR("Cannot borrow `magic` field from structure field.");
- goto error;
- }
-
- ret = bt_field_integer_unsigned_set_value(magic, 0xc1fc1fc1);
- BT_ASSERT(ret == 0);
- goto end;
-
-error:
- ret = -1;
-
end:
return ret;
}
{
int ret = 0;
- dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class,
- NULL, 0);
+ dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class);
if (!dmesg_comp->stream) {
BT_LOGE_STR("Cannot create stream object.");
goto error;
goto error;
}
- ret = fill_packet_header_field(dmesg_comp->packet);
- if (ret) {
- BT_LOGE_STR("Cannot fill packet header field.");
- goto error;
- }
-
- ret = bt_trace_set_is_static(dmesg_comp->trace);
+ ret = bt_trace_make_static(dmesg_comp->trace);
if (ret) {
BT_LOGE_STR("Cannot make trace static.");
goto error;
unsigned long sec, usec, msec;
unsigned int year, mon, mday, hour, min;
uint64_t ts = 0;
- struct bt_field *eh_field = NULL;
- struct bt_field *ts_field = NULL;
int ret = 0;
struct dmesg_component *dmesg_comp = notif_iter->dmesg_comp;
skip_ts:
/*
* At this point, we know if the stream class's event header
- * field type should have a timestamp or not, so we can lazily
+ * field class should have a timestamp or not, so we can lazily
* create the metadata, stream, and packet objects.
*/
ret = try_create_meta_stream_packet(dmesg_comp, has_timestamp);
BT_ASSERT(event);
if (dmesg_comp->clock_class) {
- ret = bt_event_set_clock_value(event,
- dmesg_comp->clock_class, ts, BT_TRUE);
- BT_ASSERT(ret == 0);
- eh_field = bt_event_borrow_header(event);
- BT_ASSERT(eh_field);
- ts_field = bt_field_structure_borrow_field_by_name(eh_field,
- "timestamp");
- if (!ts_field) {
- BT_LOGE_STR("Cannot borrow `timestamp` field from event header structure field.");
- goto error;
- }
-
- ret = bt_field_integer_unsigned_set_value(ts_field, ts);
+ ret = bt_event_set_default_clock_value(event, ts);
BT_ASSERT(ret == 0);
}
size_t len;
int ret;
- ep_field = bt_event_borrow_payload(event);
+ ep_field = bt_event_borrow_payload_field(event);
BT_ASSERT(ep_field);
- str_field = bt_field_structure_borrow_field_by_name(ep_field, "str");
+ str_field = bt_field_structure_borrow_member_field_by_index(ep_field,
+ 0);
if (!str_field) {
BT_LOGE_STR("Cannot borrow `timestamp` field from event payload structure field.");
goto error;
goto error;
}
- ret = bt_field_string_append_len(str_field, line, len);
+ ret = bt_field_string_append_with_length(str_field, line, len);
if (ret) {
BT_LOGE("Cannot append value to string field object: "
"len=%zu", len);
projects / babeltrace.git / blobdiff