enum {
STATE_EMIT_STREAM_BEGINNING,
- STATE_EMIT_STREAM_ACTIVITY_BEGINNING,
- STATE_EMIT_PACKET_BEGINNING,
STATE_EMIT_EVENT,
- STATE_EMIT_PACKET_END,
- STATE_EMIT_STREAM_ACTIVITY_END,
STATE_EMIT_STREAM_END,
STATE_DONE,
} state;
bt_event_class *event_class;
bt_trace *trace;
bt_stream *stream;
- bt_packet *packet;
bt_clock_class *clock_class;
};
BT_COMP_LOGE_STR("Cannot set stream class's default clock class.");
goto error;
}
-
- bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
- dmesg_comp->stream_class, BT_TRUE);
- bt_stream_class_set_packets_have_end_default_clock_snapshot(
- dmesg_comp->stream_class, BT_TRUE);
}
dmesg_comp->event_class = bt_event_class_create(
}
static
-int create_packet_and_stream_and_trace(struct dmesg_component *dmesg_comp)
+int create_stream_and_trace(struct dmesg_component *dmesg_comp)
{
int ret = 0;
const char *trace_name = NULL;
goto error;
}
- dmesg_comp->packet = bt_packet_create(dmesg_comp->stream);
- if (!dmesg_comp->packet) {
- BT_COMP_LOGE_STR("Cannot create packet object.");
- goto error;
- }
-
goto end;
error:
}
static
-int try_create_meta_stream_packet(struct dmesg_component *dmesg_comp,
- bool has_ts)
+int try_create_meta_stream(struct dmesg_component *dmesg_comp, bool has_ts)
{
int ret = 0;
goto error;
}
- ret = create_packet_and_stream_and_trace(dmesg_comp);
+ ret = create_stream_and_trace(dmesg_comp);
if (ret) {
- BT_COMP_LOGE("Cannot create packet and stream objects: "
+ BT_COMP_LOGE("Cannot create stream object: "
"dmesg-comp-addr=%p", dmesg_comp);
goto error;
}
g_string_free(dmesg_comp->params.path, TRUE);
}
- bt_packet_put_ref(dmesg_comp->packet);
bt_trace_put_ref(dmesg_comp->trace);
bt_stream_class_put_ref(dmesg_comp->stream_class);
bt_event_class_put_ref(dmesg_comp->event_class);
}
static
-bt_self_component_status create_port(
+bt_component_class_init_method_status create_port(
bt_self_component_source *self_comp)
{
- return bt_self_component_source_add_output_port(self_comp,
+ bt_component_class_init_method_status status;
+ bt_self_component_add_port_status add_port_status;
+
+ add_port_status = bt_self_component_source_add_output_port(self_comp,
"out", NULL, NULL);
+ switch (add_port_status) {
+ case BT_SELF_COMPONENT_ADD_PORT_STATUS_OK:
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+ break;
+ case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR:
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+ break;
+ case BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR:
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+ break;
+ default:
+ abort();
+ }
+
+ return status;
}
BT_HIDDEN
-bt_self_component_status dmesg_init(
+bt_component_class_init_method_status dmesg_init(
bt_self_component_source *self_comp_src,
bt_value *params, void *init_method_data)
{
int ret = 0;
struct dmesg_component *dmesg_comp = g_new0(struct dmesg_component, 1);
- bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_component_class_init_method_status status =
+ BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
bt_self_component *self_comp =
bt_self_component_source_as_self_component(self_comp_src);
const bt_component *comp = bt_self_component_as_component(self_comp);
}
status = create_port(self_comp_src);
- if (status != BT_SELF_COMPONENT_STATUS_OK) {
+ if (status != BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) {
goto error;
}
bt_self_component_set_data(self_comp, NULL);
if (status >= 0) {
- status = BT_SELF_COMPONENT_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
}
end:
/*
* At this point, we know if the stream class's event header
* field class should have a timestamp or not, so we can lazily
- * create the metadata, stream, and packet objects.
+ * create the metadata and stream objects.
*/
- ret = try_create_meta_stream_packet(dmesg_comp, has_timestamp);
+ ret = try_create_meta_stream(dmesg_comp, has_timestamp);
if (ret) {
- /* try_create_meta_stream_packet() logs errors */
+ /* try_create_meta_stream() logs errors */
goto error;
}
if (dmesg_comp->clock_class) {
msg = bt_message_event_create_with_default_clock_snapshot(
msg_iter->pc_msg_iter,
- dmesg_comp->event_class, dmesg_comp->packet, ts);
+ dmesg_comp->event_class, dmesg_comp->stream, ts);
msg_iter->last_clock_value = ts;
} else {
msg = bt_message_event_create(msg_iter->pc_msg_iter,
- dmesg_comp->event_class, dmesg_comp->packet);
+ dmesg_comp->event_class, dmesg_comp->stream);
}
if (!msg) {
len--;
}
- ret = bt_field_string_clear(str_field);
- if (ret) {
- BT_COMP_LOGE_STR("Cannot clear string field object.");
- goto error;
- }
-
+ bt_field_string_clear(str_field);
ret = bt_field_string_append_with_length(str_field, line, len);
if (ret) {
BT_COMP_LOGE("Cannot append value to string field object: "
BT_HIDDEN
-bt_self_message_iterator_status dmesg_msg_iter_init(
+bt_component_class_message_iterator_init_method_status dmesg_msg_iter_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port)
bt_self_component_source_as_self_component(self_comp));
struct dmesg_msg_iter *dmesg_msg_iter =
g_new0(struct dmesg_msg_iter, 1);
- bt_self_message_iterator_status status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ bt_component_class_message_iterator_init_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
if (!dmesg_msg_iter) {
BT_COMP_LOGE_STR("Failed to allocate on dmesg message iterator structure.");
destroy_dmesg_msg_iter(dmesg_msg_iter);
bt_self_message_iterator_set_data(self_msg_iter, NULL);
if (status >= 0) {
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
}
end:
}
static
-bt_self_message_iterator_status dmesg_msg_iter_next_one(
+bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next_one(
struct dmesg_msg_iter *dmesg_msg_iter,
bt_message **msg)
{
ssize_t len;
struct dmesg_component *dmesg_comp;
- bt_self_message_iterator_status status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ bt_component_class_message_iterator_next_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
BT_ASSERT(dmesg_msg_iter);
dmesg_comp = dmesg_msg_iter->dmesg_comp;
BT_ASSERT(dmesg_comp);
if (dmesg_msg_iter->state == STATE_DONE) {
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
goto end;
}
if (dmesg_msg_iter->tmp_event_msg ||
- dmesg_msg_iter->state == STATE_EMIT_PACKET_END ||
- dmesg_msg_iter->state == STATE_EMIT_STREAM_ACTIVITY_END ||
dmesg_msg_iter->state == STATE_EMIT_STREAM_END) {
goto handle_state;
}
&dmesg_msg_iter->linebuf_len, dmesg_msg_iter->fp);
if (len < 0) {
if (errno == EINVAL) {
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
} else if (errno == ENOMEM) {
- status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_MEMORY_ERROR;
} else {
if (dmesg_msg_iter->state == STATE_EMIT_STREAM_BEGINNING) {
/* Stream did not even begin */
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
goto end;
} else {
- /* End current packet now */
+ /* End stream now */
dmesg_msg_iter->state =
- STATE_EMIT_PACKET_END;
+ STATE_EMIT_STREAM_END;
goto handle_state;
}
}
BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
*msg = bt_message_stream_beginning_create(
dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
- dmesg_msg_iter->state = STATE_EMIT_STREAM_ACTIVITY_BEGINNING;
- break;
- case STATE_EMIT_STREAM_ACTIVITY_BEGINNING:
- BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
- *msg = bt_message_stream_activity_beginning_create(
- dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
- dmesg_msg_iter->state = STATE_EMIT_PACKET_BEGINNING;
- break;
- case STATE_EMIT_PACKET_BEGINNING:
- BT_ASSERT(dmesg_msg_iter->tmp_event_msg);
-
- if (dmesg_comp->clock_class) {
- *msg = bt_message_packet_beginning_create_with_default_clock_snapshot(
- dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet,
- dmesg_msg_iter->last_clock_value);
- } else {
- *msg = bt_message_packet_beginning_create(
- dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet);
- }
-
dmesg_msg_iter->state = STATE_EMIT_EVENT;
break;
case STATE_EMIT_EVENT:
*msg = dmesg_msg_iter->tmp_event_msg;
dmesg_msg_iter->tmp_event_msg = NULL;
break;
- case STATE_EMIT_PACKET_END:
- if (dmesg_comp->clock_class) {
- *msg = bt_message_packet_end_create_with_default_clock_snapshot(
- dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet,
- dmesg_msg_iter->last_clock_value);
- } else {
- *msg = bt_message_packet_end_create(
- dmesg_msg_iter->pc_msg_iter, dmesg_comp->packet);
- }
-
- dmesg_msg_iter->state = STATE_EMIT_STREAM_ACTIVITY_END;
- break;
- case STATE_EMIT_STREAM_ACTIVITY_END:
- *msg = bt_message_stream_activity_end_create(
- dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
- dmesg_msg_iter->state = STATE_EMIT_STREAM_END;
- break;
case STATE_EMIT_STREAM_END:
*msg = bt_message_stream_end_create(
dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
if (!*msg) {
BT_COMP_LOGE("Cannot create message: dmesg-comp-addr=%p",
dmesg_comp);
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
}
end:
}
BT_HIDDEN
-bt_self_message_iterator_status dmesg_msg_iter_next(
+bt_component_class_message_iterator_next_method_status dmesg_msg_iter_next(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
struct dmesg_msg_iter *dmesg_msg_iter =
bt_self_message_iterator_get_data(
self_msg_iter);
- bt_self_message_iterator_status status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ bt_component_class_message_iterator_next_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
uint64_t i = 0;
while (i < capacity &&
- status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+ status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
bt_message *priv_msg = NULL;
status = dmesg_msg_iter_next_one(dmesg_msg_iter,
&priv_msg);
msgs[i] = priv_msg;
- if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+ if (status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
i++;
}
}
* message, in which case we'll return it.
*/
*count = i;
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
}
return status;
}
BT_HIDDEN
-bt_self_message_iterator_status dmesg_msg_iter_seek_beginning(
+bt_component_class_message_iterator_seek_beginning_method_status
+dmesg_msg_iter_seek_beginning(
bt_self_message_iterator *self_msg_iter)
{
struct dmesg_msg_iter *dmesg_msg_iter =
BT_MESSAGE_PUT_REF_AND_RESET(dmesg_msg_iter->tmp_event_msg);
dmesg_msg_iter->last_clock_value = 0;
dmesg_msg_iter->state = STATE_EMIT_STREAM_BEGINNING;
- return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_SEEK_BEGINNING_METHOD_STATUS_OK;
}
projects / babeltrace.git / blobdiff