#include <ctype.h>
#include <stdio.h>
#include <babeltrace/assert-internal.h>
+#include <babeltrace/common-internal.h>
#include <babeltrace/babeltrace.h>
#include <babeltrace/values-internal.h>
#include <babeltrace/compat/utc-internal.h>
char *linebuf;
size_t linebuf_len;
FILE *fp;
- struct bt_notification *tmp_event_notif;
+ struct bt_private_notification *tmp_event_notif;
enum {
STATE_EMIT_STREAM_BEGINNING,
bt_bool no_timestamp;
} params;
- struct bt_trace *trace;
- struct bt_stream_class *stream_class;
- struct bt_event_class *event_class;
- struct bt_stream *stream;
- struct bt_packet *packet;
- struct bt_clock_class *clock_class;
- struct bt_clock_class_priority_map *cc_prio_map;
+ struct bt_private_trace *trace;
+ struct bt_private_stream_class *stream_class;
+ struct bt_private_event_class *event_class;
+ struct bt_private_stream *stream;
+ struct bt_private_packet *packet;
+ struct bt_private_clock_class *clock_class;
};
static
-struct bt_field_type *create_event_payload_ft(void)
+struct bt_private_field_class *create_event_payload_fc(void)
{
- struct bt_field_type *root_ft = NULL;
- struct bt_field_type *ft = NULL;
+ struct bt_private_field_class *root_fc = NULL;
+ struct bt_private_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_private_field_class_structure_create();
+ if (!root_fc) {
+ BT_LOGE_STR("Cannot create an empty structure field class object.");
goto error;
}
- ft = bt_field_type_string_create();
- if (!ft) {
- BT_LOGE_STR("Cannot create a string field type object.");
+ fc = bt_private_field_class_string_create();
+ if (!fc) {
+ BT_LOGE_STR("Cannot create a string field class object.");
goto error;
}
- ret = bt_field_type_structure_append_member(root_ft, "str", ft);
+ ret = bt_private_field_class_structure_append_member(root_fc,
+ "str", fc);
if (ret) {
- BT_LOGE("Cannot add `str` member 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_OBJECT_PUT_REF_AND_RESET(root_fc);
end:
- bt_put(ft);
- return root_ft;
+ bt_object_put_ref(fc);
+ return root_fc;
}
static
int create_meta(struct dmesg_component *dmesg_comp, bool has_ts)
{
- struct bt_field_type *ft = NULL;
+ struct bt_private_field_class *fc = NULL;
const char *trace_name = NULL;
gchar *basename = NULL;
int ret = 0;
- dmesg_comp->trace = bt_trace_create();
+ dmesg_comp->trace = bt_private_trace_create();
if (!dmesg_comp->trace) {
BT_LOGE_STR("Cannot create an empty trace object.");
goto error;
}
if (trace_name) {
- ret = bt_trace_set_name(dmesg_comp->trace, trace_name);
+ ret = bt_private_trace_set_name(dmesg_comp->trace, trace_name);
if (ret) {
BT_LOGE("Cannot set trace's name: name=\"%s\"", trace_name);
goto error;
}
}
- dmesg_comp->stream_class = bt_stream_class_create(dmesg_comp->trace);
+ dmesg_comp->stream_class = bt_private_stream_class_create(
+ dmesg_comp->trace);
if (!dmesg_comp->stream_class) {
BT_LOGE_STR("Cannot create a stream class object.");
goto error;
}
if (has_ts) {
- dmesg_comp->clock_class = bt_clock_class_create();
+ dmesg_comp->clock_class = bt_private_clock_class_create();
if (!dmesg_comp->clock_class) {
BT_LOGE_STR("Cannot create clock class.");
goto error;
}
- ret = bt_stream_class_set_default_clock_class(
- dmesg_comp->stream_class, dmesg_comp->clock_class);
+ ret = bt_private_stream_class_set_default_clock_class(
+ dmesg_comp->stream_class,
+ bt_clock_class_borrow_from_private(
+ dmesg_comp->clock_class));
if (ret) {
BT_LOGE_STR("Cannot set stream class's default clock class.");
goto error;
}
}
- dmesg_comp->event_class = bt_event_class_create(
+ dmesg_comp->event_class = bt_private_event_class_create(
dmesg_comp->stream_class);
if (!dmesg_comp->event_class) {
BT_LOGE_STR("Cannot create an event class object.");
goto error;
}
- ret = bt_event_class_set_name(dmesg_comp->event_class, "string");
+ ret = bt_private_event_class_set_name(dmesg_comp->event_class, "string");
if (ret) {
BT_LOGE_STR("Cannot set event class's name.");
goto error;
}
- ft = create_event_payload_ft();
- if (!ft) {
- BT_LOGE_STR("Cannot create event payload field type.");
+ fc = create_event_payload_fc();
+ if (!fc) {
+ BT_LOGE_STR("Cannot create event payload field class.");
goto error;
}
- ret = bt_event_class_set_payload_field_type(dmesg_comp->event_class, ft);
+ ret = bt_private_event_class_set_payload_field_class(dmesg_comp->event_class, fc);
if (ret) {
- BT_LOGE_STR("Cannot set event class's event payload field type.");
+ BT_LOGE_STR("Cannot set event class's event payload field class.");
goto error;
}
ret = -1;
end:
- bt_put(ft);
+ bt_object_put_ref(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: "
"type=%s",
- bt_value_type_string(
+ bt_common_value_type_string(
bt_value_get_type(no_timestamp)));
goto error;
}
- ret = bt_value_bool_get(no_timestamp,
- &dmesg_comp->params.no_timestamp);
- BT_ASSERT(ret == 0);
+ dmesg_comp->params.no_timestamp =
+ bt_value_bool_get(no_timestamp);
}
- 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.");
if (!bt_value_is_string(path)) {
BT_LOGE("Expecting a string value for the `path` parameter: "
"type=%s",
- bt_value_type_string(
+ bt_common_value_type_string(
bt_value_get_type(path)));
goto error;
}
- ret = bt_value_string_get(path, &path_str);
- BT_ASSERT(ret == 0);
+ path_str = bt_value_string_get(path);
g_string_assign(dmesg_comp->params.path, path_str);
} else {
dmesg_comp->params.read_from_stdin = true;
ret = -1;
end:
- bt_put(read_from_stdin);
- bt_put(path);
- bt_put(no_timestamp);
return ret;
}
{
int ret = 0;
- dmesg_comp->stream = bt_stream_create(dmesg_comp->stream_class);
+ dmesg_comp->stream = bt_private_stream_create(dmesg_comp->stream_class);
if (!dmesg_comp->stream) {
BT_LOGE_STR("Cannot create stream object.");
goto error;
}
- dmesg_comp->packet = bt_packet_create(dmesg_comp->stream);
+ dmesg_comp->packet = bt_private_packet_create(dmesg_comp->stream);
if (!dmesg_comp->packet) {
BT_LOGE_STR("Cannot create packet object.");
goto error;
}
- ret = bt_trace_make_static(dmesg_comp->trace);
+ ret = bt_private_trace_make_static(dmesg_comp->trace);
if (ret) {
BT_LOGE_STR("Cannot make trace static.");
goto error;
g_string_free(dmesg_comp->params.path, TRUE);
}
- bt_put(dmesg_comp->packet);
- bt_put(dmesg_comp->trace);
- bt_put(dmesg_comp->stream_class);
- bt_put(dmesg_comp->event_class);
- bt_put(dmesg_comp->stream);
- bt_put(dmesg_comp->clock_class);
- bt_put(dmesg_comp->cc_prio_map);
+ bt_object_put_ref(dmesg_comp->packet);
+ bt_object_put_ref(dmesg_comp->trace);
+ bt_object_put_ref(dmesg_comp->stream_class);
+ bt_object_put_ref(dmesg_comp->event_class);
+ bt_object_put_ref(dmesg_comp->stream);
+ bt_object_put_ref(dmesg_comp->clock_class);
g_free(dmesg_comp);
}
static
enum bt_component_status create_port(struct bt_private_component *priv_comp)
{
- return bt_private_component_source_add_output_private_port(priv_comp,
+ return bt_private_component_source_add_output_port(priv_comp,
"out", NULL, NULL);
}
}
static
-struct bt_notification *create_init_event_notif_from_line(
+struct bt_private_notification *create_init_event_notif_from_line(
struct dmesg_notif_iter *notif_iter,
const char *line, const char **new_start)
{
- struct bt_event *event;
- struct bt_notification *notif = NULL;
+ struct bt_private_event *event;
+ struct bt_private_notification *notif = NULL;
bool has_timestamp = false;
unsigned long sec, usec, msec;
unsigned int year, mon, mday, hour, min;
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);
goto error;
}
- notif = bt_notification_event_create(notif_iter->pc_notif_iter,
+ notif = bt_private_notification_event_create(notif_iter->pc_notif_iter,
dmesg_comp->event_class, dmesg_comp->packet);
if (!notif) {
BT_LOGE_STR("Cannot create event notification.");
goto error;
}
- event = bt_notification_event_borrow_event(notif);
+ event = bt_private_notification_event_borrow_event(notif);
BT_ASSERT(event);
if (dmesg_comp->clock_class) {
- ret = bt_event_set_default_clock_value(event, ts);
+ ret = bt_private_event_set_default_clock_value(event, ts);
BT_ASSERT(ret == 0);
}
goto end;
error:
- BT_PUT(notif);
+ BT_OBJECT_PUT_REF_AND_RESET(notif);
end:
return notif;
}
static
-int fill_event_payload_from_line(const char *line, struct bt_event *event)
+int fill_event_payload_from_line(const char *line,
+ struct bt_private_event *event)
{
- struct bt_field *ep_field = NULL;
- struct bt_field *str_field = NULL;
+ struct bt_private_field *ep_field = NULL;
+ struct bt_private_field *str_field = NULL;
size_t len;
int ret;
- ep_field = bt_event_borrow_payload_field(event);
+ ep_field = bt_private_event_borrow_payload_field(event);
BT_ASSERT(ep_field);
- str_field = bt_field_structure_borrow_member_field_by_index(ep_field,
- 0);
+ str_field = bt_private_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;
len--;
}
- ret = bt_field_string_clear(str_field);
+ ret = bt_private_field_string_clear(str_field);
if (ret) {
BT_LOGE_STR("Cannot clear string field object.");
goto error;
}
- ret = bt_field_string_append_with_length(str_field, line, len);
+ ret = bt_private_field_string_append_with_length(str_field, line, len);
if (ret) {
BT_LOGE("Cannot append value to string field object: "
"len=%zu", len);
}
static
-struct bt_notification *create_notif_from_line(
+struct bt_private_notification *create_notif_from_line(
struct dmesg_notif_iter *dmesg_notif_iter, const char *line)
{
- struct bt_event *event = NULL;
- struct bt_notification *notif = NULL;
+ struct bt_private_event *event = NULL;
+ struct bt_private_notification *notif = NULL;
const char *new_start;
int ret;
goto error;
}
- event = bt_notification_event_borrow_event(notif);
+ event = bt_private_notification_event_borrow_event(notif);
BT_ASSERT(event);
ret = fill_event_payload_from_line(new_start, event);
if (ret) {
goto end;
error:
- BT_PUT(notif);
+ BT_OBJECT_PUT_REF_AND_RESET(notif);
end:
return notif;
}
}
- bt_put(dmesg_notif_iter->tmp_event_notif);
+ bt_object_put_ref(dmesg_notif_iter->tmp_event_notif);
free(dmesg_notif_iter->linebuf);
g_free(dmesg_notif_iter);
}
}
end:
- bt_put(priv_comp);
+ bt_object_put_ref(priv_comp);
return status;
}
static
enum bt_notification_iterator_status dmesg_notif_iter_next_one(
struct dmesg_notif_iter *dmesg_notif_iter,
- struct bt_notification **notif)
+ struct bt_private_notification **notif)
{
ssize_t len;
struct dmesg_component *dmesg_comp;
switch (dmesg_notif_iter->state) {
case STATE_EMIT_STREAM_BEGINNING:
BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
- *notif = bt_notification_stream_begin_create(
+ *notif = bt_private_notification_stream_begin_create(
dmesg_notif_iter->pc_notif_iter, dmesg_comp->stream);
dmesg_notif_iter->state = STATE_EMIT_PACKET_BEGINNING;
break;
case STATE_EMIT_PACKET_BEGINNING:
BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
- *notif = bt_notification_packet_begin_create(
+ *notif = bt_private_notification_packet_begin_create(
dmesg_notif_iter->pc_notif_iter, dmesg_comp->packet);
dmesg_notif_iter->state = STATE_EMIT_EVENT;
break;
dmesg_notif_iter->tmp_event_notif = NULL;
break;
case STATE_EMIT_PACKET_END:
- *notif = bt_notification_packet_end_create(
+ *notif = bt_private_notification_packet_end_create(
dmesg_notif_iter->pc_notif_iter, dmesg_comp->packet);
dmesg_notif_iter->state = STATE_EMIT_STREAM_END;
break;
case STATE_EMIT_STREAM_END:
- *notif = bt_notification_stream_end_create(
+ *notif = bt_private_notification_stream_end_create(
dmesg_notif_iter->pc_notif_iter, dmesg_comp->stream);
dmesg_notif_iter->state = STATE_DONE;
break;
uint64_t i = 0;
while (i < capacity && status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
- status = dmesg_notif_iter_next_one(dmesg_notif_iter, ¬ifs[i]);
+ struct bt_private_notification *priv_notif;
+
+ status = dmesg_notif_iter_next_one(dmesg_notif_iter,
+ &priv_notif);
+ notifs[i] = bt_notification_borrow_from_private(priv_notif);
if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
i++;
}
projects / babeltrace.git / blobdiff