From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 13 Sep 2013 21:35:41 +0000 (-0400)
Subject: Add support for floating point fields in the Python bindings
X-Git-Tag: v1.2.0-rc1~60
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=e5a73b906c4ef25a05f56dd41d61e58fb73254e5

Add support for floating point fields in the Python bindings

get_value() now returns a floating point field's value.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
index f3a00f58..3e228ecc 100644
--- a/bindings/python/babeltrace.i.in
+++ b/bindings/python/babeltrace.i.in
@@ -568,6 +568,7 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
 %rename("_bt_ctf_get_int64") bt_ctf_get_int64(const struct bt_definition *field);
 %rename("_bt_ctf_get_char_array") bt_ctf_get_char_array(const struct bt_definition *field);
 %rename("_bt_ctf_get_string") bt_ctf_get_string(const struct bt_definition *field);
+%rename("_bt_ctf_get_float") bt_ctf_get_float(const struct bt_definition *field);
 %rename("_bt_ctf_field_get_error") bt_ctf_field_get_error(void);
 %rename("_bt_ctf_get_decl_event_name") bt_ctf_get_decl_event_name(const struct
 		bt_ctf_event_decl *event);
@@ -605,6 +606,7 @@ uint64_t bt_ctf_get_uint64(const struct bt_definition *field);
 int64_t bt_ctf_get_int64(const struct bt_definition *field);
 char *bt_ctf_get_char_array(const struct bt_definition *field);
 char *bt_ctf_get_string(const struct bt_definition *field);
+double bt_ctf_get_float(const struct bt_definition *field);
 int bt_ctf_field_get_error(void);
 const char *bt_ctf_get_decl_event_name(const struct bt_ctf_event_decl *event);
 const char *bt_ctf_get_decl_field_name(const struct bt_ctf_field_decl *field);
@@ -1036,6 +1038,15 @@ class ctf:
 			"""
 			return _bt_ctf_get_string(self._d)
 
+		def get_float(self):
+			"""
+			Return the value associated with the field.
+			If the field does not exist or is not of the type requested,
+			the value returned is undefined. To check if an error occured,
+			use the ctf.field_error() function after accessing a field.
+			"""
+			return _bt_ctf_get_float(self._d)
+
 		def get_value(self):
 			"""
 			Return the value associated with the field according to its type.
@@ -1063,6 +1074,9 @@ class ctf:
 				for i in range(seq_len):
 					evDef = self.get_sequence_element_at(i)
 					value.append(evDef.get_value())
+			elif id == ctf.type_id.FLOAT:
+				value = self.get_float()
+
 			if ctf.field_error():
 				raise ctf.FieldError("Error occured while accessing field {} of type {}".format(self.field_name(), ctf.type_id.get_type_id_name(self.field_type())))
 			return value
diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index af376a44..15d5a7dc 100644
--- a/formats/ctf/events.c
+++ b/formats/ctf/events.c
@@ -608,6 +608,19 @@ char *bt_ctf_get_string(const struct bt_definition *field)
 	return ret;
 }
 
+double bt_ctf_get_float(const struct bt_definition *field)
+{
+	double ret = 0.0;
+
+	if (field && bt_ctf_field_type(bt_ctf_get_decl_from_def(field)) == CTF_TYPE_FLOAT) {
+		ret = bt_get_float(field);
+	} else {
+		bt_ctf_field_set_error(-EINVAL);
+	}
+
+	return ret;
+}
+
 int bt_ctf_get_event_decl_list(int handle_id, struct bt_context *ctx,
 		struct bt_ctf_event_decl * const **list,
 		unsigned int *count)
diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c
index 68902836..9c60b737 100644
--- a/formats/ctf/types/float.c
+++ b/formats/ctf/types/float.c
@@ -278,6 +278,14 @@ end:
 	return ret;
 }
 
+double bt_get_float(const struct bt_definition *field)
+{
+	struct definition_float *definition =
+		container_of(field, struct definition_float, p);
+
+	return definition->value;
+}
+
 static
 void __attribute__((constructor)) ctf_float_init(void)
 {
diff --git a/include/babeltrace/ctf/events.h b/include/babeltrace/ctf/events.h
index c92470cf..c57cde74 100644
--- a/include/babeltrace/ctf/events.h
+++ b/include/babeltrace/ctf/events.h
@@ -231,6 +231,7 @@ const struct bt_definition *bt_ctf_get_enum_int(const struct bt_definition *fiel
 const char *bt_ctf_get_enum_str(const struct bt_definition *field);
 char *bt_ctf_get_char_array(const struct bt_definition *field);
 char *bt_ctf_get_string(const struct bt_definition *field);
+double bt_ctf_get_float(const struct bt_definition *field);
 
 /*
  * bt_ctf_field_get_error: returns the last error code encountered while
diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index 8d660bea..7db83164 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -435,6 +435,8 @@ struct declaration_string *
 char *bt_get_string(const struct bt_definition *field);
 enum ctf_string_encoding bt_get_string_encoding(const struct bt_definition *field);
 
+double bt_get_float(const struct bt_definition *field);
+
 struct declaration_struct *
 	bt_struct_declaration_new(struct declaration_scope *parent_scope,
 			       uint64_t min_align);