X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Futils.c;h=318b12da4a26105dda011759762e1ece8ea53275;hb=44e0a4f5a816e471f1e74278704a6e52f94ab975;hp=b8e8ac23d7eee377cfcbc48f230446ddb9fa5d47;hpb=dfdad2587b12d454e7235e01508a266d83e3e264;p=babeltrace.git

diff --git a/formats/ctf/ir/utils.c b/formats/ctf/ir/utils.c
index b8e8ac23..318b12da 100644
--- a/formats/ctf/ir/utils.c
+++ b/formats/ctf/ir/utils.c
@@ -29,11 +29,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/objects.h>
-
-#define BT_CTF_ATTR_NAME_INDEX		0
-#define BT_CTF_ATTR_VALUE_INDEX	1
 
 static
 const char * const reserved_keywords_str[] = {"align", "callsite",
@@ -109,265 +104,3 @@ end:
 	free(string);
 	return ret;
 }
-
-BT_HIDDEN
-struct bt_object *bt_ctf_attributes_create(void)
-{
-	/*
-	 * Attributes: array object of array objects, each one
-	 * containing two entries: a string object (attributes field
-	 * name), and an object (attributes field value).
-	 *
-	 * Example (JSON representation):
-	 *
-	 *     [
-	 *         ["hostname", "eeppdesk"],
-	 *         ["sysname", "Linux"],
-	 *         ["tracer_major", 2],
-	 *         ["tracer_minor", 5]
-	 *     ]
-	 */
-	return bt_object_array_create();
-}
-
-BT_HIDDEN
-void bt_ctf_attributes_destroy(struct bt_object *attr_obj)
-{
-	bt_object_put(attr_obj);
-}
-
-BT_HIDDEN
-int bt_ctf_attributes_get_count(struct bt_object *attr_obj)
-{
-	return bt_object_array_size(attr_obj);
-}
-
-BT_HIDDEN
-const char *bt_ctf_attributes_get_field_name(struct bt_object *attr_obj,
-		int index)
-{
-	int rc;
-	const char *ret = NULL;
-	struct bt_object *attr_field_obj = NULL;
-	struct bt_object *attr_field_name_obj = NULL;
-
-	if (!attr_obj || index < 0) {
-		goto end;
-	}
-
-	attr_field_obj = bt_object_array_get(attr_obj, index);
-
-	if (!attr_field_obj) {
-		goto end;
-	}
-
-	attr_field_name_obj = bt_object_array_get(attr_field_obj,
-		BT_CTF_ATTR_NAME_INDEX);
-
-	if (!attr_field_name_obj) {
-		goto end;
-	}
-
-	rc = bt_object_string_get(attr_field_name_obj, &ret);
-
-	if (rc) {
-		ret = NULL;
-	}
-
-end:
-	BT_OBJECT_PUT(attr_field_name_obj);
-	BT_OBJECT_PUT(attr_field_obj);
-
-	return ret;
-}
-
-BT_HIDDEN
-struct bt_object *bt_ctf_attributes_get_field_value(struct bt_object *attr_obj,
-		int index)
-{
-	struct bt_object *value_obj = NULL;
-	struct bt_object *attr_field_obj = NULL;
-
-	if (!attr_obj || index < 0) {
-		goto end;
-	}
-
-	attr_field_obj = bt_object_array_get(attr_obj, index);
-
-	if (!attr_field_obj) {
-		goto end;
-	}
-
-	value_obj = bt_object_array_get(attr_field_obj,
-		BT_CTF_ATTR_VALUE_INDEX);
-
-end:
-	BT_OBJECT_PUT(attr_field_obj);
-
-	return value_obj;
-}
-
-static
-struct bt_object *bt_ctf_attributes_get_field_by_name(
-		struct bt_object *attr_obj, const char *name)
-{
-	int i;
-	int attr_size;
-	struct bt_object *value_obj = NULL;
-	struct bt_object *attr_field_name_obj = NULL;
-
-	attr_size = bt_object_array_size(attr_obj);
-
-	if (attr_size < 0) {
-		goto error;
-	}
-
-	for (i = 0; i < attr_size; ++i) {
-		int ret;
-		const char *field_name;
-
-		value_obj = bt_object_array_get(attr_obj, i);
-
-		if (!value_obj) {
-			goto error;
-		}
-
-		attr_field_name_obj = bt_object_array_get(value_obj, 0);
-
-		if (!attr_field_name_obj) {
-			goto error;
-		}
-
-		ret = bt_object_string_get(attr_field_name_obj, &field_name);
-		if (ret) {
-			goto error;
-		}
-
-		if (!strcmp(field_name, name)) {
-			BT_OBJECT_PUT(attr_field_name_obj);
-			break;
-		}
-
-		BT_OBJECT_PUT(attr_field_name_obj);
-		BT_OBJECT_PUT(value_obj);
-	}
-
-	return value_obj;
-
-error:
-	BT_OBJECT_PUT(attr_field_name_obj);
-	BT_OBJECT_PUT(value_obj);
-
-	return value_obj;
-}
-
-BT_HIDDEN
-int bt_ctf_attributes_set_field_value(struct bt_object *attr_obj,
-		const char *name, struct bt_object *value_obj)
-{
-	int ret = 0;
-	struct bt_object *attr_field_obj = NULL;
-
-	if (!attr_obj || !name || !value_obj) {
-		ret = -1;
-		goto end;
-	}
-
-	attr_field_obj = bt_ctf_attributes_get_field_by_name(attr_obj, name);
-
-	if (attr_field_obj) {
-		ret = bt_object_array_set(attr_field_obj,
-			BT_CTF_ATTR_VALUE_INDEX, value_obj);
-		goto end;
-	}
-
-	attr_field_obj = bt_object_array_create();
-
-	if (!attr_field_obj) {
-		ret = -1;
-		goto end;
-	}
-
-	ret = bt_object_array_append_string(attr_field_obj, name);
-	ret |= bt_object_array_append(attr_field_obj, value_obj);
-
-	if (ret) {
-		goto end;
-	}
-
-	ret = bt_object_array_append(attr_obj, attr_field_obj);
-
-end:
-	BT_OBJECT_PUT(attr_field_obj);
-
-	return ret;
-}
-
-BT_HIDDEN
-struct bt_object *bt_ctf_attributes_get_field_value_by_name(
-		struct bt_object *attr_obj, const char *name)
-{
-	struct bt_object *value_obj = NULL;
-	struct bt_object *attr_field_obj = NULL;
-
-	if (!attr_obj || !name) {
-		goto end;
-	}
-
-	attr_field_obj = bt_ctf_attributes_get_field_by_name(attr_obj, name);
-
-	if (!attr_field_obj) {
-		goto end;
-	}
-
-	value_obj = bt_object_array_get(attr_field_obj,
-		BT_CTF_ATTR_VALUE_INDEX);
-
-end:
-	BT_OBJECT_PUT(attr_field_obj);
-
-	return value_obj;
-}
-
-BT_HIDDEN
-int bt_ctf_attributes_freeze(struct bt_object *attr_obj)
-{
-	int i;
-	int count;
-	int ret = 0;
-
-	if (!attr_obj) {
-		ret = -1;
-		goto end;
-	}
-
-	count = bt_object_array_size(attr_obj);
-
-	if (count < 0) {
-		ret = -1;
-		goto end;
-	}
-
-	/*
-	 * We do not freeze the array itself here, since internal
-	 * stuff could need to modify/add attributes. Each attribute
-	 * is frozen one by one.
-	 */
-	for (i = 0; i < count; ++i) {
-		struct bt_object *obj = NULL;
-
-		obj = bt_ctf_attributes_get_field_value(attr_obj, i);
-
-		if (!obj) {
-			ret = -1;
-			goto end;
-		}
-
-		bt_object_freeze(obj);
-		BT_OBJECT_PUT(obj);
-	}
-
-end:
-
-	return ret;
-}