projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: make the "port connected" method return a status
[babeltrace.git]
/
plugins
/
utils
/
counter
/
counter.c
diff --git
a/plugins/utils/counter/counter.c
b/plugins/utils/counter/counter.c
index bbcb82769590b4dd7f4bdecf676970c417f8d8e7..bb53a41f12ccb40461818607309b285e237a647b 100644
(file)
--- a/
plugins/utils/counter/counter.c
+++ b/
plugins/utils/counter/counter.c
@@
-183,11
+183,12
@@
end:
return ret;
}
return ret;
}
-
void
counter_port_connected(
+
enum bt_component_status
counter_port_connected(
struct bt_private_component *component,
struct bt_private_port *self_port,
struct bt_port *other_port)
{
struct bt_private_component *component,
struct bt_private_port *self_port,
struct bt_port *other_port)
{
+ enum bt_component_status status = BT_COMPONENT_STATUS_OK;
struct counter *counter;
struct bt_notification_iterator *iterator;
struct bt_private_connection *connection;
struct counter *counter;
struct bt_notification_iterator *iterator;
struct bt_private_connection *connection;
@@
-200,7
+201,7
@@
void counter_port_connected(
conn_status = bt_private_connection_create_notification_iterator(
connection, &iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
conn_status = bt_private_connection_create_notification_iterator(
connection, &iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
-
counter->error = true
;
+
status = BT_COMPONENT_STATUS_ERROR
;
goto end;
}
goto end;
}
@@
-208,6
+209,7
@@
void counter_port_connected(
end:
bt_put(connection);
end:
bt_put(connection);
+ return status;
}
enum bt_component_status counter_consume(struct bt_private_component *component)
}
enum bt_component_status counter_consume(struct bt_private_component *component)
@@
-222,11
+224,6
@@
enum bt_component_status counter_consume(struct bt_private_component *component)
counter = bt_private_component_get_user_data(component);
BT_ASSERT(counter);
counter = bt_private_component_get_user_data(component);
BT_ASSERT(counter);
- if (unlikely(counter->error)) {
- ret = BT_COMPONENT_STATUS_ERROR;
- goto end;
- }
-
if (unlikely(!counter->notif_iter)) {
try_print_last(counter);
ret = BT_COMPONENT_STATUS_END;
if (unlikely(!counter->notif_iter)) {
try_print_last(counter);
ret = BT_COMPONENT_STATUS_END;
This page took
0.023451 seconds
and
4
git commands to generate.