#include <babeltrace2/trace-ir/packet-const.h>
#include "lib/trace-ir/packet.h"
#include "lib/trace-ir/stream.h"
+#include <babeltrace2/trace-ir/clock-class-const.h>
+#include <babeltrace2/trace-ir/stream-class-const.h>
+#include <babeltrace2/trace-ir/stream-const.h>
#include <babeltrace2/graph/connection-const.h>
#include <babeltrace2/graph/component-const.h>
#include <babeltrace2/graph/component-sink-const.h>
#include <babeltrace2/graph/message-const.h>
-#include <babeltrace2/graph/message-iterator-const.h>
+#include <babeltrace2/graph/message-iterator.h>
#include <babeltrace2/graph/self-component-port-input-message-iterator.h>
#include <babeltrace2/graph/port-output-message-iterator.h>
#include <babeltrace2/graph/message-event-const.h>
#include "message/stream.h"
#include "message/packet.h"
#include "message/stream-activity.h"
+#include "lib/func-status.h"
/*
* TODO: Use graph's state (number of active iterators, etc.) and
"%!+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;
bt_self_component_port_input_message_iterator_create(
struct bt_self_component_port_input *self_port)
{
- typedef enum bt_self_message_iterator_status (*init_method_t)(
+ typedef enum bt_component_class_message_iterator_init_method_status (*init_method_t)(
void *, void *, void *);
init_method_t init_method = NULL;
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) {
}
if (init_method) {
- int iter_status;
+ enum bt_component_class_message_iterator_init_method_status iter_status;
BT_LIB_LOGD("Calling user's initialization method: %!+i", iterator);
iter_status = init_method(iterator, upstream_comp,
upstream_port);
BT_LOGD("User method returned: status=%s",
- bt_message_iterator_status_string(iter_status));
- if (iter_status != BT_MESSAGE_ITERATOR_STATUS_OK) {
- BT_LOGW_STR("Initialization method failed.");
- BT_OBJECT_PUT_REF_AND_RESET(iterator);
- goto end;
+ bt_common_func_status_string(iter_status));
+ if (iter_status != BT_FUNC_STATUS_OK) {
+ 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;
const struct bt_clock_snapshot *clock_snapshot = NULL;
bt_message_type message_type = bt_message_get_type(msg);
int64_t ns_from_origin;
- enum bt_clock_snapshot_status clock_snapshot_status;
+ enum bt_clock_snapshot_get_ns_from_origin_status clock_snapshot_status;
/*
* The default is true: if we can't figure out the clock snapshot
}
clock_snapshot_status = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, &ns_from_origin);
- if (clock_snapshot_status != BT_CLOCK_SNAPSHOT_STATUS_OK) {
+ if (clock_snapshot_status != BT_FUNC_STATUS_OK) {
goto end;
}
*/
static
-bt_message_iterator_status call_iterator_next_method(
+enum bt_component_class_message_iterator_next_method_status
+call_iterator_next_method(
struct bt_self_component_port_input_message_iterator *iterator,
bt_message_array_const msgs, uint64_t capacity, uint64_t *user_count)
{
- bt_message_iterator_status status;
+ enum bt_component_class_message_iterator_next_method_status status;
BT_ASSERT(iterator->methods.next);
BT_LOGD_STR("Calling user's \"next\" method.");
status = iterator->methods.next(iterator, msgs, capacity, user_count);
BT_LOGD("User method returned: status=%s, msg-count=%" PRIu64,
- bt_message_iterator_status_string(status), *user_count);
+ bt_common_func_status_string(status), *user_count);
- if (status == BT_MESSAGE_ITERATOR_STATUS_OK) {
+ if (status == BT_FUNC_STATUS_OK) {
BT_ASSERT_POST(clock_classes_are_compatible(iterator, msgs, *user_count),
"Clocks are not compatible");
BT_ASSERT_POST(clock_snapshots_are_monotonic(iterator, msgs, *user_count),
return status;
}
-enum bt_message_iterator_status
+enum bt_message_iterator_next_status
bt_self_component_port_input_message_iterator_next(
struct bt_self_component_port_input_message_iterator *iterator,
bt_message_array_const *msgs, uint64_t *user_count)
{
- int status = BT_MESSAGE_ITERATOR_STATUS_OK;
+ enum bt_message_iterator_next_status status = BT_FUNC_STATUS_OK;
BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator");
BT_ASSERT_PRE_NON_NULL(msgs, "Message array (output)");
* and status.
*/
*user_count = 0;
- status = call_iterator_next_method(iterator,
+ 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;
}
BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE);
switch (status) {
- case BT_MESSAGE_ITERATOR_STATUS_OK:
+ case BT_FUNC_STATUS_OK:
BT_ASSERT_POST(*user_count <= MSG_BATCH_SIZE,
"Invalid returned message count: greater than "
"batch size: count=%" PRIu64 ", batch-size=%u",
*user_count, MSG_BATCH_SIZE);
*msgs = (void *) iterator->base.msgs->pdata;
break;
- case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
+ case BT_FUNC_STATUS_AGAIN:
goto end;
- case BT_MESSAGE_ITERATOR_STATUS_END:
+ case BT_FUNC_STATUS_END:
set_self_comp_port_input_msg_iterator_state(iterator,
BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED);
goto end;
return status;
}
-enum bt_message_iterator_status bt_port_output_message_iterator_next(
+enum bt_message_iterator_next_status bt_port_output_message_iterator_next(
struct bt_port_output_message_iterator *iterator,
bt_message_array_const *msgs_to_user,
uint64_t *count_to_user)
{
- enum bt_message_iterator_status status;
- enum bt_graph_status graph_status;
+ enum bt_message_iterator_next_status status;
+ int graph_status;
BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator");
BT_ASSERT_PRE_NON_NULL(msgs_to_user, "Message array (output)");
graph_status = bt_graph_consume_sink_no_check(iterator->graph,
iterator->colander);
switch (graph_status) {
- case BT_GRAPH_STATUS_CANCELED:
- case BT_GRAPH_STATUS_AGAIN:
- case BT_GRAPH_STATUS_END:
- case BT_GRAPH_STATUS_NOMEM:
+ case BT_FUNC_STATUS_CANCELED:
+ case BT_FUNC_STATUS_AGAIN:
+ case BT_FUNC_STATUS_END:
+ case BT_FUNC_STATUS_MEMORY_ERROR:
status = (int) graph_status;
break;
- case BT_GRAPH_STATUS_OK:
- status = BT_MESSAGE_ITERATOR_STATUS_OK;
+ case BT_FUNC_STATUS_OK:
+ status = BT_FUNC_STATUS_OK;
/*
* On success, the colander sink moves the messages
break;
default:
/* Other errors */
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_FUNC_STATUS_ERROR;
}
return status;
struct bt_component_class_sink *colander_comp_cls = NULL;
struct bt_component *output_port_comp = NULL;
struct bt_component_sink *colander_comp;
- enum bt_graph_status graph_status;
+ int graph_status;
struct bt_port_input *colander_in_port = NULL;
struct bt_component_class_sink_colander_data colander_data;
int ret;
"%![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;
}
* class module does not use this level anyway since it belongs
* to the library.
*/
- graph_status =
- bt_graph_add_sink_component_with_init_method_data(
+ graph_status = bt_graph_add_sink_component_with_init_method_data(
(void *) graph, colander_comp_cls,
"colander-36ac3409-b1a8-4d60-ab1f-4fdf341a8fb1",
NULL, &colander_data, BT_LOGGING_LEVEL_NONE,
(void *) &iterator->colander);
- if (graph_status != BT_GRAPH_STATUS_OK) {
- BT_LIB_LOGW("Cannot add colander sink component to graph: "
- "%1[graph-]+g, status=%s", graph,
- bt_graph_status_string(graph_status));
+ if (graph_status != BT_FUNC_STATUS_OK) {
+ 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;
}
BT_ASSERT(colander_in_port);
graph_status = bt_graph_connect_ports(graph,
output_port, colander_in_port, NULL);
- if (graph_status != BT_GRAPH_STATUS_OK) {
- BT_LIB_LOGW("Cannot add colander sink component to graph: "
+ if (graph_status != BT_FUNC_STATUS_OK) {
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Cannot connect colander sink's port: "
"%![graph-]+g, %![comp-]+c, status=%s", graph,
iterator->colander,
- bt_graph_status_string(graph_status));
+ bt_common_func_status_string(graph_status));
goto error;
}
/* Also set the graph as being configured. */
graph_status = bt_graph_configure(graph);
- if (graph_status != BT_GRAPH_STATUS_OK) {
- BT_LIB_LOGW("Cannot configure graph after having added colander: "
- "%![graph-]+g, status=%s", graph,
- bt_graph_status_string(graph_status));
+ if (graph_status != BT_FUNC_STATUS_OK) {
+ 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;
}
goto end;
static inline
void set_iterator_state_after_seeking(
struct bt_self_component_port_input_message_iterator *iterator,
- enum bt_message_iterator_status status)
+ int status)
{
enum bt_self_component_port_input_message_iterator_state new_state = 0;
/* Set iterator's state depending on seeking status */
switch (status) {
- case BT_MESSAGE_ITERATOR_STATUS_OK:
+ case BT_FUNC_STATUS_OK:
new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE;
break;
- case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
+ case BT_FUNC_STATUS_AGAIN:
new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN;
break;
- case BT_MESSAGE_ITERATOR_STATUS_ERROR:
- case BT_MESSAGE_ITERATOR_STATUS_NOMEM:
+ case BT_FUNC_STATUS_ERROR:
+ case BT_FUNC_STATUS_MEMORY_ERROR:
new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR;
break;
- case BT_MESSAGE_ITERATOR_STATUS_END:
+ case BT_FUNC_STATUS_END:
new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED;
break;
default:
iterator->clock_expectation.type = CLOCK_EXPECTATION_UNSET;
}
-enum bt_message_iterator_status
+enum bt_message_iterator_seek_beginning_status
bt_self_component_port_input_message_iterator_seek_beginning(
struct bt_self_component_port_input_message_iterator *iterator)
{
BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_SEEKING);
status = iterator->methods.seek_beginning(iterator);
BT_LOGD("User method returned: status=%s",
- bt_message_iterator_status_string(status));
- BT_ASSERT_POST(status == BT_MESSAGE_ITERATOR_STATUS_OK ||
- status == BT_MESSAGE_ITERATOR_STATUS_ERROR ||
- status == BT_MESSAGE_ITERATOR_STATUS_NOMEM ||
- status == BT_MESSAGE_ITERATOR_STATUS_AGAIN,
+ bt_common_func_status_string(status));
+ BT_ASSERT_POST(status == BT_FUNC_STATUS_OK ||
+ status == BT_FUNC_STATUS_ERROR ||
+ status == BT_FUNC_STATUS_MEMORY_ERROR ||
+ status == BT_FUNC_STATUS_AGAIN,
"Unexpected status: %![iter-]+i, status=%s",
- iterator, bt_common_self_message_iterator_status_string(status));
+ 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;
}
-
/*
* Structure used to record the state of a given stream during the fast-forward
* phase of an auto-seek.
*/
static inline
-enum bt_message_iterator_status auto_seek_handle_message(
+int auto_seek_handle_message(
struct bt_self_component_port_input_message_iterator *iterator,
int64_t ns_from_origin, const struct bt_message *msg,
bool *got_first, GHashTable *stream_states)
{
- enum bt_message_iterator_status status = BT_MESSAGE_ITERATOR_STATUS_OK;
+ int status = BT_FUNC_STATUS_OK;
int64_t msg_ns_from_origin;
const struct bt_clock_snapshot *clk_snapshot = NULL;
int ret;
msg_disc_items->default_begin_cs,
&msg_ns_from_origin);
if (ret) {
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_FUNC_STATUS_ERROR;
goto end;
}
msg_disc_items->default_end_cs,
&msg_ns_from_origin);
if (ret) {
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_FUNC_STATUS_ERROR;
goto end;
}
msg_disc_items->default_end_cs->clock_class,
ns_from_origin, &new_begin_raw_value);
if (ret) {
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_FUNC_STATUS_ERROR;
goto end;
}
ret = bt_clock_snapshot_get_ns_from_origin(clk_snapshot,
&msg_ns_from_origin);
if (ret) {
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_FUNC_STATUS_ERROR;
goto end;
}
/* Update stream's state: stream began. */
stream_state = create_auto_seek_stream_state();
if (!stream_state) {
- status = BT_MESSAGE_ITERATOR_STATUS_NOMEM;
+ status = BT_FUNC_STATUS_MEMORY_ERROR;
goto end;
}
msg = NULL;
end:
- BT_ASSERT(!msg || status != BT_MESSAGE_ITERATOR_STATUS_OK);
+ BT_ASSERT(!msg || status != BT_FUNC_STATUS_OK);
return status;
}
static
-enum bt_message_iterator_status find_message_ge_ns_from_origin(
+int find_message_ge_ns_from_origin(
struct bt_self_component_port_input_message_iterator *iterator,
int64_t ns_from_origin, GHashTable *stream_states)
{
*/
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
BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE);
switch (status) {
- case BT_MESSAGE_ITERATOR_STATUS_OK:
+ case BT_FUNC_STATUS_OK:
BT_ASSERT_POST(user_count <= MSG_BATCH_SIZE,
"Invalid returned message count: greater than "
"batch size: count=%" PRIu64 ", batch-size=%u",
user_count, MSG_BATCH_SIZE);
break;
- case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
- case BT_MESSAGE_ITERATOR_STATUS_ERROR:
- case BT_MESSAGE_ITERATOR_STATUS_NOMEM:
- case BT_MESSAGE_ITERATOR_STATUS_END:
+ case BT_FUNC_STATUS_AGAIN:
+ case BT_FUNC_STATUS_ERROR:
+ case BT_FUNC_STATUS_MEMORY_ERROR:
+ case BT_FUNC_STATUS_END:
goto end;
default:
abort();
status = auto_seek_handle_message(iterator,
ns_from_origin, messages[i], &got_first,
stream_states);
- if (status == BT_MESSAGE_ITERATOR_STATUS_OK) {
+ if (status == BT_FUNC_STATUS_OK) {
/* Message was either pushed or moved */
messages[i] = NULL;
} else {
*/
static
-enum bt_self_message_iterator_status post_auto_seek_next(
+enum bt_component_class_message_iterator_next_method_status post_auto_seek_next(
struct bt_self_component_port_input_message_iterator *iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
iterator->auto_seek.original_next_callback = NULL;
}
- return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ return BT_FUNC_STATUS_OK;
}
static inline
}
-enum bt_message_iterator_status
+enum bt_message_iterator_seek_ns_from_origin_status
bt_self_component_port_input_message_iterator_seek_ns_from_origin(
struct bt_self_component_port_input_message_iterator *iterator,
int64_t ns_from_origin)
status = iterator->methods.seek_ns_from_origin(iterator,
ns_from_origin);
BT_LOGD("User method returned: status=%s",
- bt_message_iterator_status_string(status));
- BT_ASSERT_POST(status == BT_MESSAGE_ITERATOR_STATUS_OK ||
- status == BT_MESSAGE_ITERATOR_STATUS_ERROR ||
- status == BT_MESSAGE_ITERATOR_STATUS_NOMEM ||
- status == BT_MESSAGE_ITERATOR_STATUS_AGAIN,
+ bt_common_func_status_string(status));
+ BT_ASSERT_POST(status == BT_FUNC_STATUS_OK ||
+ status == BT_FUNC_STATUS_ERROR ||
+ status == BT_FUNC_STATUS_MEMORY_ERROR ||
+ status == BT_FUNC_STATUS_AGAIN,
"Unexpected status: %![iter-]+i, status=%s",
- iterator,
- bt_common_self_message_iterator_status_string(status));
+ 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
iterator);
status = iterator->methods.seek_beginning(iterator);
BT_LOGD("User method returned: status=%s",
- bt_message_iterator_status_string(status));
- BT_ASSERT_POST(status == BT_MESSAGE_ITERATOR_STATUS_OK ||
- status == BT_MESSAGE_ITERATOR_STATUS_ERROR ||
- status == BT_MESSAGE_ITERATOR_STATUS_NOMEM ||
- status == BT_MESSAGE_ITERATOR_STATUS_AGAIN,
+ bt_common_func_status_string(status));
+ BT_ASSERT_POST(status == BT_FUNC_STATUS_OK ||
+ status == BT_FUNC_STATUS_ERROR ||
+ status == BT_FUNC_STATUS_MEMORY_ERROR ||
+ status == BT_FUNC_STATUS_AGAIN,
"Unexpected status: %![iter-]+i, status=%s",
- iterator,
- bt_common_self_message_iterator_status_string(status));
+ 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_MESSAGE_ITERATOR_STATUS_OK:
+ case BT_FUNC_STATUS_OK:
break;
- case BT_MESSAGE_ITERATOR_STATUS_ERROR:
- case BT_MESSAGE_ITERATOR_STATUS_NOMEM:
- case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
+ case BT_FUNC_STATUS_ERROR:
+ case BT_FUNC_STATUS_MEMORY_ERROR:
+ case BT_FUNC_STATUS_AGAIN:
goto end;
default:
abort();
stream_states = create_auto_seek_stream_states();
if (!stream_states) {
- BT_LOGE_STR("Failed to allocate one GHashTable.");
- status = BT_MESSAGE_ITERATOR_STATUS_NOMEM;
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to allocate one GHashTable.");
+ status = BT_FUNC_STATUS_MEMORY_ERROR;
goto end;
}
status = find_message_ge_ns_from_origin(iterator,
ns_from_origin, stream_states);
switch (status) {
- case BT_MESSAGE_ITERATOR_STATUS_OK:
- case BT_MESSAGE_ITERATOR_STATUS_END:
+ case BT_FUNC_STATUS_OK:
+ case BT_FUNC_STATUS_END:
{
GHashTableIter iter;
gpointer key, value;
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",
+ BT_LIB_LOGW_APPEND_CAUSE(
+ "Could not convert nanoseconds from origin to clock value: "
+ "ns-from-origin=%" PRId64 ", %![cc-]+K",
ns_from_origin, clock_class);
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_FUNC_STATUS_ERROR;
goto end;
}
msg = bt_message_packet_beginning_create_with_default_clock_snapshot(
(bt_self_message_iterator *) iterator, stream_state->packet, raw_value);
if (!msg) {
- status = BT_MESSAGE_ITERATOR_STATUS_NOMEM;
+ status = BT_FUNC_STATUS_MEMORY_ERROR;
goto end;
}
msg = bt_message_stream_activity_beginning_create(
(bt_self_message_iterator *) iterator, stream);
if (!msg) {
- status = BT_MESSAGE_ITERATOR_STATUS_NOMEM;
+ status = BT_FUNC_STATUS_MEMORY_ERROR;
goto end;
}
msg = bt_message_stream_beginning_create(
(bt_self_message_iterator *) iterator, stream);
if (!msg) {
- status = BT_MESSAGE_ITERATOR_STATUS_NOMEM;
+ status = BT_FUNC_STATUS_MEMORY_ERROR;
goto end;
}
}
/*
- * `BT_MESSAGE_ITERATOR_STATUS_END` becomes
- * `BT_MESSAGE_ITERATOR_STATUS_OK`: the next
+ * `BT_FUNC_STATUS_END` becomes
+ * `BT_FUNC_STATUS_OK`: the next
* time this iterator's "next" method is called,
* it will return
- * `BT_MESSAGE_ITERATOR_STATUS_END`.
+ * `BT_FUNC_STATUS_END`.
*/
- status = BT_MESSAGE_ITERATOR_STATUS_OK;
+ status = BT_FUNC_STATUS_OK;
break;
}
- case BT_MESSAGE_ITERATOR_STATUS_ERROR:
- case BT_MESSAGE_ITERATOR_STATUS_NOMEM:
- case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
+ case BT_FUNC_STATUS_ERROR:
+ case BT_FUNC_STATUS_MEMORY_ERROR:
+ case BT_FUNC_STATUS_AGAIN:
goto end;
default:
abort();
destroy_auto_seek_stream_states(stream_states);
stream_states = NULL;
}
+
set_iterator_state_after_seeking(iterator, status);
return status;
}
iterator));
}
-enum bt_message_iterator_status bt_port_output_message_iterator_seek_ns_from_origin(
+enum bt_message_iterator_seek_ns_from_origin_status
+bt_port_output_message_iterator_seek_ns_from_origin(
struct bt_port_output_message_iterator *iterator,
int64_t ns_from_origin)
{
ns_from_origin);
}
-enum bt_message_iterator_status bt_port_output_message_iterator_seek_beginning(
+enum bt_message_iterator_seek_beginning_status
+bt_port_output_message_iterator_seek_beginning(
struct bt_port_output_message_iterator *iterator)
{
BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator");
projects / babeltrace.git / blobdiff