#include <babeltrace2/graph/message-packet-beginning.h>
#include <babeltrace2/graph/message-packet-beginning-const.h>
#include <babeltrace2/graph/message-packet-end-const.h>
-#include <babeltrace2/graph/message-stream-activity-beginning.h>
-#include <babeltrace2/graph/message-stream-activity-beginning-const.h>
-#include <babeltrace2/graph/message-stream-activity-end-const.h>
#include <babeltrace2/graph/message-stream-beginning.h>
#include <babeltrace2/graph/message-stream-beginning-const.h>
#include <babeltrace2/graph/message-stream-end-const.h>
#include "message/message-iterator-inactivity.h"
#include "message/stream.h"
#include "message/packet.h"
-#include "message/stream-activity.h"
#include "lib/func-status.h"
/*
"%!+i", iterator);
goto end;
case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZING:
- /* Already finalized */
+ /* Finalizing */
BT_LIB_LOGF("Message iterator is already being finalized: "
"%!+i", iterator);
abort();
iterator->type = type;
iterator->msgs = g_ptr_array_new();
if (!iterator->msgs) {
- BT_LOGE_STR("Failed to allocate a GPtrArray.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray.");
ret = -1;
goto end;
}
iterator = g_new0(
struct bt_self_component_port_input_message_iterator, 1);
if (!iterator) {
- BT_LOGE_STR("Failed to allocate one self component input port "
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to allocate one self component input port "
"message iterator.");
- goto end;
+ goto error;
}
ret = init_message_iterator((void *) iterator,
bt_self_component_port_input_message_iterator_destroy);
if (ret) {
/* init_message_iterator() logs errors */
- BT_OBJECT_PUT_REF_AND_RESET(iterator);
- goto end;
+ goto error;
}
iterator->last_ns_from_origin = INT64_MIN;
iterator->auto_seek.msgs = g_queue_new();
if (!iterator->auto_seek.msgs) {
- BT_LOGE_STR("Failed to allocate a GQueue.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GQueue.");
ret = -1;
goto end;
}
BT_LIB_LOGI("Created initial message iterator on self component input port: "
"%![up-port-]+p, %![up-comp-]+c, %![iter-]+i",
upstream_port, upstream_comp, iterator);
+ goto end;
+
+error:
+ BT_OBJECT_PUT_REF_AND_RESET(iterator);
end:
return iterator;
iterator = bt_self_component_port_input_message_iterator_create_initial(
upstream_comp, upstream_port);
if (!iterator) {
- BT_LOGW_STR("Cannot create self component input port "
- "message iterator.");
- goto end;
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Cannot create self component input port message iterator.");
+ goto error;
}
switch (upstream_comp_cls->type) {
BT_LOGD("User method returned: status=%s",
bt_common_func_status_string(iter_status));
if (iter_status != BT_FUNC_STATUS_OK) {
- BT_LOGW_STR("Initialization method failed.");
- BT_OBJECT_PUT_REF_AND_RESET(iterator);
- goto end;
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Component input port message iterator initialization method failed: "
+ "%![iter-]+i, status=%s",
+ iterator,
+ bt_common_func_status_string(iter_status));
+ goto error;
}
}
BT_LIB_LOGI("Created message iterator on self component input port: "
"%![up-port-]+p, %![up-comp-]+c, %![iter-]+i",
upstream_port, upstream_comp, iterator);
+ goto end;
+
+error:
+ BT_OBJECT_PUT_REF_AND_RESET(iterator);
end:
return iterator;
clock_snapshot = packet_msg->default_cs;
break;
}
- case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
- case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
+ case BT_MESSAGE_TYPE_STREAM_BEGINNING:
+ case BT_MESSAGE_TYPE_STREAM_END:
{
- struct bt_message_stream_activity *str_act_msg =
- (struct bt_message_stream_activity *) msg;
-
- if (str_act_msg->default_cs_state == BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_KNOWN) {
- clock_snapshot = str_act_msg->default_cs;
+ struct bt_message_stream *stream_msg = (struct bt_message_stream *) msg;
+ if (stream_msg->default_cs_state != BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_KNOWN) {
+ goto end;
}
+
+ clock_snapshot = stream_msg->default_cs;
break;
}
- case BT_MESSAGE_TYPE_STREAM_BEGINNING:
- case BT_MESSAGE_TYPE_STREAM_END:
- /* These messages don't have clock snapshots. */
- goto end;
case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
{
status = (int) call_iterator_next_method(iterator,
(void *) iterator->base.msgs->pdata, MSG_BATCH_SIZE,
user_count);
+ BT_LOGD("User method returned: status=%s, msg-count=%" PRIu64,
+ bt_common_func_status_string(status), *user_count);
if (status < 0) {
- BT_LOGW_STR("User method failed.");
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Component input port message iterator's \"next\" method failed: "
+ "%![iter-]+i, status=%s",
+ iterator, bt_common_func_status_string(status));
goto end;
}
"%![port-]+p, %![comp-]+c", output_port, output_port_comp);
iterator = g_new0(struct bt_port_output_message_iterator, 1);
if (!iterator) {
- BT_LOGE_STR("Failed to allocate one output port message iterator.");
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to allocate one output port message iterator.");
goto error;
}
/* Create colander component */
colander_comp_cls = bt_component_class_sink_colander_get();
if (!colander_comp_cls) {
- BT_LOGW("Cannot get colander sink component class.");
+ /* bt_component_class_sink_colander_get() logs errors */
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Cannot get colander sink component class.");
goto error;
}
NULL, &colander_data, BT_LOGGING_LEVEL_NONE,
(void *) &iterator->colander);
if (graph_status != BT_FUNC_STATUS_OK) {
- BT_LIB_LOGW("Cannot add colander sink component to graph: "
- "%1[graph-]+g, status=%s", graph,
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Cannot add colander sink component to graph: "
+ "%![graph-]+g, status=%s", graph,
bt_common_func_status_string(graph_status));
goto error;
}
graph_status = bt_graph_connect_ports(graph,
output_port, colander_in_port, NULL);
if (graph_status != BT_FUNC_STATUS_OK) {
- BT_LIB_LOGW("Cannot add colander sink component to graph: "
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Cannot connect colander sink's port: "
"%![graph-]+g, %![comp-]+c, status=%s", graph,
iterator->colander,
bt_common_func_status_string(graph_status));
/* Also set the graph as being configured. */
graph_status = bt_graph_configure(graph);
if (graph_status != BT_FUNC_STATUS_OK) {
- BT_LIB_LOGW("Cannot configure graph after having added colander: "
- "%![graph-]+g, status=%s", graph,
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Cannot configure graph after having "
+ "added and connected colander sink: "
+ "%![graph-]+g, %![comp-]+c, status=%s", graph,
+ iterator->colander,
bt_common_func_status_string(graph_status));
goto error;
}
bt_self_component_port_input_message_iterator_seek_beginning(
struct bt_self_component_port_input_message_iterator *iterator)
{
- enum bt_message_iterator_seek_beginning_status status;
+ int status;
BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator");
BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator);
status == BT_FUNC_STATUS_AGAIN,
"Unexpected status: %![iter-]+i, status=%s",
iterator, bt_common_func_status_string(status));
+ if (status < 0) {
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Component input port message iterator's \"seek beginning\" method failed: "
+ "%![iter-]+i, status=%s",
+ iterator, bt_common_func_status_string(status));
+ }
+
set_iterator_state_after_seeking(iterator, status);
return status;
}
* Value representing which step of this timeline we are at.
*
* time --->
- * [SB] 1 [SAB] 2 [PB] 3 [PE] 2 [SAE] 1 [SE]
+ * [SB] 1 [PB] 2 [PE] 1 [SE]
*
* At each point in the timeline, the messages we need to replicate are:
*
* 1: Stream beginning
- * 2: Stream beginning, stream activity beginning
- * 3: Stream beginning, stream activity beginning, packet beginning
+ * 2: Stream beginning, packet beginning
*
* Before "Stream beginning" and after "Stream end", we don't need to
* replicate anything as the stream doesn't exist.
*/
enum {
AUTO_SEEK_STREAM_STATE_STREAM_BEGAN,
- AUTO_SEEK_STREAM_STATE_STREAM_ACTIVITY_BEGAN,
AUTO_SEEK_STREAM_STATE_PACKET_BEGAN,
} state;
* alive by the time we use it.
*/
struct bt_packet *packet;
+
+ /* Have we see a message with a clock snapshot yet? */
+ bool seen_clock_snapshot;
};
static
goto skip_msg;
}
}
- case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
- {
- const struct bt_message_stream_activity *stream_act_msg =
- (const void *) msg;
-
- switch (stream_act_msg->default_cs_state) {
- case BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_UNKNOWN:
- case BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_INFINITE:
- /*
- * -inf is always less than any requested time,
- * and we can't assume any specific time for an
- * unknown clock snapshot, so skip this.
- */
- goto skip_msg;
- case BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_KNOWN:
- clk_snapshot = stream_act_msg->default_cs;
- BT_ASSERT(clk_snapshot);
- break;
- default:
- abort();
- }
-
- break;
- }
- case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
+ case BT_MESSAGE_TYPE_STREAM_BEGINNING:
+ case BT_MESSAGE_TYPE_STREAM_END:
{
- const struct bt_message_stream_activity *stream_act_msg =
- (const void *) msg;
+ struct bt_message_stream *stream_msg =
+ (struct bt_message_stream *) msg;
- switch (stream_act_msg->default_cs_state) {
- case BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_UNKNOWN:
- /*
- * We can't assume any specific time for an
- * unknown clock snapshot, so skip this.
- */
+ if (stream_msg->default_cs_state != BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_KNOWN) {
+ /* Ignore */
goto skip_msg;
- case BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_INFINITE:
- /*
- * +inf is always greater than any requested
- * time.
- */
- *got_first = true;
- goto push_msg;
- case BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_KNOWN:
- clk_snapshot = stream_act_msg->default_cs;
- BT_ASSERT(clk_snapshot);
- break;
- default:
- abort();
}
+ clk_snapshot = stream_msg->default_cs;
break;
}
- case BT_MESSAGE_TYPE_STREAM_BEGINNING:
- case BT_MESSAGE_TYPE_STREAM_END:
- /* Ignore */
- goto skip_msg;
default:
abort();
}
stream_state->state = AUTO_SEEK_STREAM_STATE_STREAM_BEGAN;
+ if (stream_msg->default_cs_state == BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_KNOWN) {
+ stream_state->seen_clock_snapshot = true;
+ }
+
BT_ASSERT(!bt_g_hash_table_contains(stream_states, stream_msg->stream));
g_hash_table_insert(stream_states, stream_msg->stream, stream_state);
break;
}
- case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
+ case BT_MESSAGE_TYPE_PACKET_BEGINNING:
{
- const struct bt_message_stream_activity *stream_act_msg =
+ const struct bt_message_packet *packet_msg =
(const void *) msg;
struct auto_seek_stream_state *stream_state;
- /* Update stream's state: stream activity began. */
- stream_state = g_hash_table_lookup(stream_states, stream_act_msg->stream);
+ /* Update stream's state: packet began. */
+ stream_state = g_hash_table_lookup(stream_states, packet_msg->packet->stream);
BT_ASSERT(stream_state);
BT_ASSERT(stream_state->state == AUTO_SEEK_STREAM_STATE_STREAM_BEGAN);
- stream_state->state = AUTO_SEEK_STREAM_STATE_STREAM_ACTIVITY_BEGAN;
+ stream_state->state = AUTO_SEEK_STREAM_STATE_PACKET_BEGAN;
BT_ASSERT(!stream_state->packet);
+ stream_state->packet = packet_msg->packet;
+
+ if (packet_msg->packet->stream->class->packets_have_beginning_default_clock_snapshot) {
+ stream_state->seen_clock_snapshot = true;
+ }
+
break;
}
- case BT_MESSAGE_TYPE_PACKET_BEGINNING:
+ case BT_MESSAGE_TYPE_EVENT:
{
- const struct bt_message_packet *packet_msg =
- (const void *) msg;
+ const struct bt_message_event *event_msg = (const void *) msg;
struct auto_seek_stream_state *stream_state;
- /* Update stream's state: packet began. */
- stream_state = g_hash_table_lookup(stream_states, packet_msg->packet->stream);
+ stream_state = g_hash_table_lookup(stream_states,
+ event_msg->event->packet->stream);
BT_ASSERT(stream_state);
- BT_ASSERT(stream_state->state == AUTO_SEEK_STREAM_STATE_STREAM_ACTIVITY_BEGAN);
- stream_state->state = AUTO_SEEK_STREAM_STATE_PACKET_BEGAN;
- BT_ASSERT(!stream_state->packet);
- stream_state->packet = packet_msg->packet;
+ // HELPME: are we sure that event messages have clock snapshots at this point?
+ stream_state->seen_clock_snapshot = true;
+
break;
}
case BT_MESSAGE_TYPE_PACKET_END:
BT_ASSERT(stream_state);
BT_ASSERT(stream_state->state == AUTO_SEEK_STREAM_STATE_PACKET_BEGAN);
- stream_state->state = AUTO_SEEK_STREAM_STATE_STREAM_ACTIVITY_BEGAN;
+ stream_state->state = AUTO_SEEK_STREAM_STATE_STREAM_BEGAN;
BT_ASSERT(stream_state->packet);
stream_state->packet = NULL;
- break;
- }
- case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
- {
- const struct bt_message_stream_activity *stream_act_msg =
- (const void *) msg;
- struct auto_seek_stream_state *stream_state;
- /* Update stream's state: stream activity ended. */
- stream_state = g_hash_table_lookup(stream_states, stream_act_msg->stream);
- BT_ASSERT(stream_state);
+ if (packet_msg->packet->stream->class->packets_have_end_default_clock_snapshot) {
+ stream_state->seen_clock_snapshot = true;
+ }
- BT_ASSERT(stream_state->state == AUTO_SEEK_STREAM_STATE_STREAM_ACTIVITY_BEGAN);
- stream_state->state = AUTO_SEEK_STREAM_STATE_STREAM_BEGAN;
- BT_ASSERT(!stream_state->packet);
break;
}
case BT_MESSAGE_TYPE_STREAM_END:
g_hash_table_remove(stream_states, stream_msg->stream);
break;
}
+ case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+ case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
+ {
+ const struct bt_message_discarded_items *discarded_msg =
+ (const void *) msg;
+ struct auto_seek_stream_state *stream_state;
+
+ stream_state = g_hash_table_lookup(stream_states, discarded_msg->stream);
+ BT_ASSERT(stream_state);
+
+ if ((msg->type == BT_MESSAGE_TYPE_DISCARDED_EVENTS && discarded_msg->stream->class->discarded_events_have_default_clock_snapshots) ||
+ (msg->type == BT_MESSAGE_TYPE_DISCARDED_PACKETS && discarded_msg->stream->class->discarded_packets_have_default_clock_snapshots)) {
+ stream_state->seen_clock_snapshot = true;
+ }
+
+ break;
+ }
default:
break;
}
*/
status = call_iterator_next_method(iterator,
&messages[0], MSG_BATCH_SIZE, &user_count);
+ BT_LOGD("User method returned: status=%s",
+ bt_common_func_status_string(status));
+ if (status < 0) {
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Component input port message iterator's \"next\" method failed: "
+ "%![iter-]+i, status=%s",
+ iterator, bt_common_func_status_string(status));
+ }
/*
* The user's "next" method must not do any action which
status == BT_FUNC_STATUS_AGAIN,
"Unexpected status: %![iter-]+i, status=%s",
iterator, bt_common_func_status_string(status));
+ if (status < 0) {
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Component input port message iterator's \"seek nanoseconds from origin\" method failed: "
+ "%![iter-]+i, status=%s",
+ iterator, bt_common_func_status_string(status));
+ }
} else {
/*
* The iterator doesn't know how to seek to a particular time. We will
status == BT_FUNC_STATUS_AGAIN,
"Unexpected status: %![iter-]+i, status=%s",
iterator, bt_common_func_status_string(status));
+ if (status < 0) {
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Component input port message iterator's \"seek beginning\" method failed: "
+ "%![iter-]+i, status=%s",
+ iterator, bt_common_func_status_string(status));
+ }
+
switch (status) {
case BT_FUNC_STATUS_OK:
break;
stream_states = create_auto_seek_stream_states();
if (!stream_states) {
- BT_LOGE_STR("Failed to allocate one GHashTable.");
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to allocate one GHashTable.");
status = BT_FUNC_STATUS_MEMORY_ERROR;
goto end;
}
bt_message *msg;
const bt_clock_class *clock_class = bt_stream_class_borrow_default_clock_class_const(
bt_stream_borrow_class_const(stream));
- uint64_t raw_value;
-
- if (clock_raw_value_from_ns_from_origin(clock_class, ns_from_origin, &raw_value) != 0) {
- BT_LIB_LOGW("Could not convert nanoseconds from origin to clock value: ns-from-origin=%" PRId64 ", %![cc-]+K",
- ns_from_origin, clock_class);
- status = BT_FUNC_STATUS_ERROR;
- goto end;
+ /* Initialize to silence maybe-uninitialized warning. */
+ uint64_t raw_value = 0;
+
+ /*
+ * If we haven't seen a message with a clock snapshot, we don't know if our seek time is within
+ * the clock's range, so it wouldn't be safe to try to convert ns_from_origin to a clock value.
+ *
+ * Also, it would be a bit of a lie to generate a stream begin message with the seek time as its
+ * clock snapshot, because we don't really know if the stream existed at that time. If we have
+ * seen a message with a clock snapshot in our seeking, then we are sure that the
+ * seek time is not below the clock range, and we know the stream was active at that
+ * time (and that we cut it short).
+ */
+ if (stream_state->seen_clock_snapshot) {
+ if (clock_raw_value_from_ns_from_origin(clock_class, ns_from_origin, &raw_value) != 0) {
+ BT_LIB_LOGW("Could not convert nanoseconds from origin to clock value: ns-from-origin=%" PRId64 ", %![cc-]+K",
+ ns_from_origin, clock_class);
+ status = BT_FUNC_STATUS_ERROR;
+ goto end;
+ }
}
switch (stream_state->state) {
case AUTO_SEEK_STREAM_STATE_PACKET_BEGAN:
BT_ASSERT(stream_state->packet);
BT_LIB_LOGD("Creating packet message: %![packet-]+a", stream_state->packet);
- msg = bt_message_packet_beginning_create_with_default_clock_snapshot(
- (bt_self_message_iterator *) iterator, stream_state->packet, raw_value);
- if (!msg) {
- status = BT_FUNC_STATUS_MEMORY_ERROR;
- goto end;
+
+ if (stream->class->packets_have_beginning_default_clock_snapshot) {
+ /*
+ * If we are in the PACKET_BEGAN state, it means we have seen a "packet beginning"
+ * message. If "packet beginning" packets have clock snapshots, then we must have
+ * seen a clock snapshot.
+ */
+ BT_ASSERT(stream_state->seen_clock_snapshot);
+
+ msg = bt_message_packet_beginning_create_with_default_clock_snapshot(
+ (bt_self_message_iterator *) iterator, stream_state->packet, raw_value);
+ } else {
+ msg = bt_message_packet_beginning_create((bt_self_message_iterator *) iterator,
+ stream_state->packet);
}
- g_queue_push_head(iterator->auto_seek.msgs, msg);
- msg = NULL;
- /* fall-thru */
- case AUTO_SEEK_STREAM_STATE_STREAM_ACTIVITY_BEGAN:
- msg = bt_message_stream_activity_beginning_create(
- (bt_self_message_iterator *) iterator, stream);
if (!msg) {
status = BT_FUNC_STATUS_MEMORY_ERROR;
goto end;
}
- bt_message_stream_activity_beginning_set_default_clock_snapshot(msg, raw_value);
-
g_queue_push_head(iterator->auto_seek.msgs, msg);
msg = NULL;
/* fall-thru */
+
case AUTO_SEEK_STREAM_STATE_STREAM_BEGAN:
msg = bt_message_stream_beginning_create(
(bt_self_message_iterator *) iterator, stream);
goto end;
}
+ if (stream_state->seen_clock_snapshot) {
+ bt_message_stream_beginning_set_default_clock_snapshot(msg, raw_value);
+ }
+
g_queue_push_head(iterator->auto_seek.msgs, msg);
msg = NULL;
break;
destroy_auto_seek_stream_states(stream_states);
stream_states = NULL;
}
+
set_iterator_state_after_seeking(iterator, status);
return status;
}
projects / babeltrace.git / blobdiff