projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add "port connected" component class method
[babeltrace.git]
/
plugins
/
text
/
pretty
/
pretty.c
diff --git
a/plugins/text/pretty/pretty.c
b/plugins/text/pretty/pretty.c
index 48a7147262a927d36c808d3b6e8dcd106b351bdc..14f8560c108f96bded8c82b0ee2fec4369a6962d 100644
(file)
--- a/
plugins/text/pretty/pretty.c
+++ b/
plugins/text/pretty/pretty.c
@@
-168,12
+168,11
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-
enum bt_component_status pretty_accept_port_connection
(
+
void pretty_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 ret = BT_COMPONENT_STATUS_OK;
struct bt_private_connection *connection;
struct pretty_component *pretty;
struct bt_private_connection *connection;
struct pretty_component *pretty;
@@
-186,11
+185,10
@@
enum bt_component_status pretty_accept_port_connection(
bt_private_connection_create_notification_iterator(connection);
if (!pretty->input_iterator) {
bt_private_connection_create_notification_iterator(connection);
if (!pretty->input_iterator) {
-
ret = BT_COMPONENT_STATUS_ERROR
;
+
pretty->error = true
;
}
bt_put(connection);
}
bt_put(connection);
- return ret;
}
BT_HIDDEN
}
BT_HIDDEN
@@
-203,9
+201,14
@@
enum bt_component_status pretty_consume(struct bt_private_component *component)
bt_private_component_get_user_data(component);
enum bt_notification_iterator_status it_ret;
bt_private_component_get_user_data(component);
enum bt_notification_iterator_status it_ret;
- it = pretty->input_iterator;
+ if (unlikely(pretty->error)) {
+ ret = BT_COMPONENT_STATUS_ERROR;
+ goto end;
+ }
+ it = pretty->input_iterator;
it_ret = bt_notification_iterator_next(it);
it_ret = bt_notification_iterator_next(it);
+
switch (it_ret) {
case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
ret = BT_COMPONENT_STATUS_ERROR;
switch (it_ret) {
case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
ret = BT_COMPONENT_STATUS_ERROR;
This page took
0.024588 seconds
and
4
git commands to generate.