void destroy_pretty_data(struct pretty_component *pretty)
{
bt_put(pretty->input_iterator);
- (void) g_string_free(pretty->string, TRUE);
+
+ if (pretty->string) {
+ (void) g_string_free(pretty->string, TRUE);
+ }
+
+ if (pretty->tmp_string) {
+ (void) g_string_free(pretty->tmp_string, TRUE);
+ }
+
if (pretty->out != stdout) {
int ret;
if (!pretty->string) {
goto error;
}
+ pretty->tmp_string = g_string_new("");
+ if (!pretty->tmp_string) {
+ goto error;
+ }
end:
return pretty;
assert(pretty);
- if (bt_notification_get_type(notification) == BT_NOTIFICATION_TYPE_EVENT) {
+ switch (bt_notification_get_type(notification)) {
+ case BT_NOTIFICATION_TYPE_EVENT:
ret = pretty_print_event(pretty, notification);
+ break;
+ case BT_NOTIFICATION_TYPE_INACTIVITY:
+ fprintf(stderr, "Inactivity notification\n");
+ break;
+ case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+ case BT_NOTIFICATION_TYPE_PACKET_END:
+ case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+ case BT_NOTIFICATION_TYPE_STREAM_END:
+ break;
+ case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
+ case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
+ ret = pretty_print_discarded_elements(pretty, notification);
+ break;
+ default:
+ fprintf(stderr, "Unhandled notification type\n");
}
return ret;
struct bt_private_port *self_port,
struct bt_port *other_port)
{
+ enum bt_connection_status conn_status;
struct bt_private_connection *connection;
struct pretty_component *pretty;
static const enum bt_notification_type notif_types[] = {
BT_NOTIFICATION_TYPE_EVENT,
+ BT_NOTIFICATION_TYPE_DISCARDED_PACKETS,
+ BT_NOTIFICATION_TYPE_DISCARDED_EVENTS,
BT_NOTIFICATION_TYPE_SENTINEL,
};
assert(!pretty->input_iterator);
connection = bt_private_port_get_private_connection(self_port);
assert(connection);
- pretty->input_iterator =
- bt_private_connection_create_notification_iterator(connection,
- notif_types);
-
- if (!pretty->input_iterator) {
+ conn_status = bt_private_connection_create_notification_iterator(
+ connection, notif_types, &pretty->input_iterator);
+ if (conn_status != BT_CONNECTION_STATUS_OK) {
pretty->error = true;
}
it_ret = bt_notification_iterator_next(it);
switch (it_ret) {
- case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
- ret = BT_COMPONENT_STATUS_ERROR;
- goto end;
case BT_NOTIFICATION_ITERATOR_STATUS_END:
ret = BT_COMPONENT_STATUS_END;
BT_PUT(pretty->input_iterator);
}
static
-bool check_param_exists(const char *key, struct bt_value *object, void *data)
+bt_bool check_param_exists(const char *key, struct bt_value *object, void *data)
{
struct pretty_component *pretty = data;
struct bt_value *plugin_opt_map = pretty->plugin_opt_map;
fprintf(pretty->err,
"[warning] Parameter \"%s\" unknown to \"text.pretty\" sink component\n", key);
}
- return true;
+ return BT_TRUE;
}
static
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
struct bt_value *value = NULL;
enum bt_value_status status;
+ bt_bool bool_val;
value = bt_value_map_get(params, key);
if (!value) {
goto end;
}
- status = bt_value_bool_get(value, option);
+ status = bt_value_bool_get(value, &bool_val);
switch (status) {
case BT_VALUE_STATUS_OK:
break;
ret = BT_COMPONENT_STATUS_ERROR;
goto end;
}
+ *option = (bool) bool_val;
if (found) {
*found = true;
}
{
enum bt_component_status ret;
struct pretty_component *pretty = create_pretty();
- void *priv_port;
if (!pretty) {
ret = BT_COMPONENT_STATUS_NOMEM;
goto end;
}
- priv_port = bt_private_component_sink_add_input_private_port(component,
- "in", NULL);
- if (!priv_port) {
- ret = BT_COMPONENT_STATUS_NOMEM;
+ ret = bt_private_component_sink_add_input_private_port(component,
+ "in", NULL, NULL);
+ if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
- bt_put(priv_port);
-
pretty->out = stdout;
pretty->err = stderr;