X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fpretty%2Fpretty.c;h=5ef2c7a70ee6af84b119e27d6dec2877c2c5a390;hb=601b0d3c9a6bf91274d0f01ccdec7fecfe3ed310;hp=0caf05bde6e5eb0ec7e095afbc79480c58b96902;hpb=bf55043c2e742cafb86d3a3404d0d35c4cf294a3;p=babeltrace.git

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 0caf05bd..5ef2c7a7 100644
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -70,7 +70,7 @@ const char *plugin_options[] = {
 static
 void destroy_pretty_data(struct pretty_component *pretty)
 {
-	bt_put(pretty->input_iterator);
+	bt_object_put_ref(pretty->input_iterator);
 
 	if (pretty->string) {
 		(void) g_string_free(pretty->string, TRUE);
@@ -134,16 +134,15 @@ enum bt_component_status handle_notification(struct pretty_component *pretty,
 	BT_ASSERT(pretty);
 
 	switch (bt_notification_get_type(notification)) {
+	case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+		ret = pretty_print_packet(pretty, notification);
+		break;
 	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_DISCARDED_PACKETS:
-	case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
-		ret = pretty_print_discarded_elements(pretty, notification);
-		break;
 	default:
 		break;
 	}
@@ -173,7 +172,7 @@ enum bt_component_status pretty_port_connected(
 		status = BT_COMPONENT_STATUS_ERROR;
 	}
 
-	bt_put(connection);
+	bt_object_put_ref(connection);
 	return status;
 }
 
@@ -196,7 +195,7 @@ enum bt_component_status pretty_consume(struct bt_private_component *component)
 	switch (it_ret) {
 	case BT_NOTIFICATION_ITERATOR_STATUS_END:
 		ret = BT_COMPONENT_STATUS_END;
-		BT_PUT(pretty->input_iterator);
+		BT_OBJECT_PUT_REF_AND_RESET(pretty->input_iterator);
 		goto end;
 	case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
 		ret = BT_COMPONENT_STATUS_AGAIN;
@@ -216,19 +215,20 @@ enum bt_component_status pretty_consume(struct bt_private_component *component)
 			goto end;
 		}
 
-		bt_put(notifs[i]);
+		bt_object_put_ref(notifs[i]);
 	}
 
 end:
 	for (; i < count; i++) {
-		bt_put(notifs[i]);
+		bt_object_put_ref(notifs[i]);
 	}
 
 	return ret;
 }
 
 static
-enum bt_component_status add_params_to_map(struct bt_value *plugin_opt_map)
+enum bt_component_status add_params_to_map(
+		struct bt_private_value *plugin_opt_map)
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	unsigned int i;
@@ -237,7 +237,8 @@ enum bt_component_status add_params_to_map(struct bt_value *plugin_opt_map)
 		const char *key = plugin_options[i];
 		enum bt_value_status status;
 
-		status = bt_value_map_insert(plugin_opt_map, key, bt_value_null);
+		status = bt_private_value_map_insert_entry(plugin_opt_map, key,
+			bt_value_null);
 		switch (status) {
 		case BT_VALUE_STATUS_OK:
 			break;
@@ -254,9 +255,10 @@ static
 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;
 
-	if (!bt_value_map_has_key(plugin_opt_map, key)) {
+	if (!bt_value_map_has_entry(
+			bt_value_borrow_from_private(pretty->plugin_opt_map),
+			key)) {
 		fprintf(pretty->err,
 			"[warning] Parameter \"%s\" unknown to \"text.pretty\" sink component\n", key);
 	}
@@ -270,25 +272,18 @@ enum bt_component_status apply_one_string(const char *key,
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_value *value = NULL;
-	enum bt_value_status status;
 	const char *str;
 
-	value = bt_value_map_borrow(params, key);
+	value = bt_value_map_borrow_entry_value(params, key);
 	if (!value) {
 		goto end;
 	}
 	if (bt_value_is_null(value)) {
 		goto end;
 	}
-	status = bt_value_string_get(value, &str);
-	switch (status) {
-	case BT_VALUE_STATUS_OK:
-		break;
-	default:
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
+	str = bt_value_string_get(value);
 	*option = g_strdup(str);
+
 end:
 	return ret;
 }
@@ -301,21 +296,13 @@ enum bt_component_status apply_one_bool(const char *key,
 {
 	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_borrow(params, key);
+	value = bt_value_map_borrow_entry_value(params, key);
 	if (!value) {
 		goto end;
 	}
-	status = bt_value_bool_get(value, &bool_val);
-	switch (status) {
-	case BT_VALUE_STATUS_OK:
-		break;
-	default:
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
+	bool_val = bt_value_bool_get(value);
 	*option = (bool) bool_val;
 	if (found) {
 		*found = true;
@@ -363,7 +350,7 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
 	bool value, found;
 	char *str = NULL;
 
-	pretty->plugin_opt_map = bt_value_map_create();
+	pretty->plugin_opt_map = bt_private_value_map_create();
 	if (!pretty->plugin_opt_map) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
@@ -373,7 +360,7 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
 		goto end;
 	}
 	/* Report unknown parameters. */
-	status = bt_value_map_foreach(params, check_param_exists, pretty);
+	status = bt_value_map_foreach_entry(params, check_param_exists, pretty);
 	switch (status) {
 	case BT_VALUE_STATUS_OK:
 		break;
@@ -383,28 +370,25 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
 	}
 	/* Known parameters. */
 	pretty->options.color = PRETTY_COLOR_OPT_AUTO;
-	if (bt_value_map_has_key(params, "color")) {
+	if (bt_value_map_has_entry(params, "color")) {
 		struct bt_value *color_value;
 		const char *color;
 
-		color_value = bt_value_map_borrow(params, "color");
+		color_value = bt_value_map_borrow_entry_value(params, "color");
 		if (!color_value) {
 			goto end;
 		}
 
-		status = bt_value_string_get(color_value, &color);
-		if (status) {
-			warn_wrong_color_param(pretty);
+		color = bt_value_string_get(color_value);
+
+		if (strcmp(color, "never") == 0) {
+			pretty->options.color = PRETTY_COLOR_OPT_NEVER;
+		} else if (strcmp(color, "auto") == 0) {
+			pretty->options.color = PRETTY_COLOR_OPT_AUTO;
+		} else if (strcmp(color, "always") == 0) {
+			pretty->options.color = PRETTY_COLOR_OPT_ALWAYS;
 		} else {
-			if (strcmp(color, "never") == 0) {
-				pretty->options.color = PRETTY_COLOR_OPT_NEVER;
-			} else if (strcmp(color, "auto") == 0) {
-				pretty->options.color = PRETTY_COLOR_OPT_AUTO;
-			} else if (strcmp(color, "always") == 0) {
-				pretty->options.color = PRETTY_COLOR_OPT_ALWAYS;
-			} else {
-				warn_wrong_color_param(pretty);
-			}
+			warn_wrong_color_param(pretty);
 		}
 	}
 
@@ -676,7 +660,7 @@ enum bt_component_status apply_params(struct pretty_component *pretty,
 	}
 
 end:
-	bt_put(pretty->plugin_opt_map);
+	bt_object_put_ref(pretty->plugin_opt_map);
 	pretty->plugin_opt_map = NULL;
 	g_free(str);
 	return ret;