X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=f3a0e831b15fcdfb9a85f76dc79a0c569222ca8a;hp=da9ca5c5faeabef771f70fcadf5e57599ffc209a;hb=98b6832656447ab0f8024f9086aa67625e391ac7;hpb=81dee1bb528a95f7bf2bc622948807150794a75e

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index da9ca5c5..f3a0e831 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -6,7 +6,9 @@
  *
  * Type Header
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -105,6 +107,7 @@ struct definition {
 	GQuark name;		/* Field name in its container (or 0 if unset) */
 	int ref;		/* number of references to the definition */
 	GQuark path;
+	struct definition_scope *scope;
 };
 
 typedef int (*rw_dispatch)(struct stream_pos *pos,
@@ -175,9 +178,8 @@ struct definition_float {
 	struct definition_integer *sign;
 	struct definition_integer *mantissa;
 	struct definition_integer *exp;
-	struct definition_scope *scope;
 	/* Last values read */
-	long double value;
+	double value;
 };
 
 /*
@@ -228,7 +230,6 @@ struct definition_enum {
 	struct definition p;
 	struct definition_integer *integer;
 	struct declaration_enum *declaration;
-	struct definition_scope *scope;
 	/* Last GQuark values read. Keeping a reference on the GQuark array. */
 	GArray *value;
 };
@@ -260,7 +261,6 @@ struct declaration_struct {
 struct definition_struct {
 	struct definition p;
 	struct declaration_struct *declaration;
-	struct definition_scope *scope;
 	GPtrArray *fields;		/* Array of pointers to struct definition */
 };
 
@@ -281,7 +281,6 @@ struct declaration_variant {
 struct definition_variant {
 	struct definition p;
 	struct declaration_variant *declaration;
-	struct definition_scope *scope;
 	struct definition *enum_tag;
 	GPtrArray *fields;		/* Array of pointers to struct definition */
 	struct definition *current_field;	/* Last field read */
@@ -297,7 +296,6 @@ struct declaration_array {
 struct definition_array {
 	struct definition p;
 	struct declaration_array *declaration;
-	struct definition_scope *scope;
 	GPtrArray *elems;		/* Array of pointers to struct definition */
 	GString *string;		/* String for encoded integer children */
 };
@@ -312,7 +310,6 @@ struct declaration_sequence {
 struct definition_sequence {
 	struct definition p;
 	struct declaration_sequence *declaration;
-	struct definition_scope *scope;
 	struct definition_integer *length;
 	GPtrArray *elems;		/* Array of pointers to struct definition */
 	GString *string;		/* String for encoded integer children */
@@ -357,9 +354,9 @@ void free_declaration_scope(struct declaration_scope *scope);
  * definition scopes.
  */
 struct definition *
-	lookup_definition(GArray *cur_path,	/* array of GQuark */
-			  GArray *lookup_path,	/* array of GQuark */
-			  struct definition_scope *scope);
+	lookup_path_definition(GArray *cur_path,	/* array of GQuark */
+			       GArray *lookup_path,	/* array of GQuark */
+			       struct definition_scope *scope);
 int register_field_definition(GQuark field_name,
 			      struct definition *definition,
 			      struct definition_scope *scope);
@@ -386,6 +383,8 @@ void definition_unref(struct definition *definition);
 struct declaration_integer *integer_declaration_new(size_t len, int byte_order,
 				  int signedness, size_t alignment,
 				  int base, enum ctf_string_encoding encoding);
+uint64_t get_unsigned_int(struct definition *field);
+int64_t get_signed_int(struct definition *field);
 
 /*
  * mantissa_len is the length of the number of bytes represented by the mantissa
@@ -412,7 +411,7 @@ GArray *enum_uint_to_quark_set(const struct declaration_enum *enum_declaration,
  * Caller must release the GArray with g_array_unref().
  */
 GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration,
-			      uint64_t v);
+			      int64_t v);
 
 /*
  * Returns a GArray of struct enum_range or NULL.
@@ -432,6 +431,7 @@ struct declaration_enum *
 
 struct declaration_string *
 	string_declaration_new(enum ctf_string_encoding encoding);
+char *get_string(struct definition *field);
 
 struct declaration_struct *
 	struct_declaration_new(struct declaration_scope *parent_scope,
@@ -496,6 +496,7 @@ struct declaration_array *
 uint64_t array_len(struct definition_array *array);
 struct definition *array_index(struct definition_array *array, uint64_t i);
 int array_rw(struct stream_pos *pos, struct definition *definition);
+GString *get_char_array(struct definition *field);
 
 /*
  * int_declaration and elem_declaration passed as parameter now belong
@@ -514,4 +515,18 @@ int sequence_rw(struct stream_pos *pos, struct definition *definition);
  */
 void append_scope_path(const char *path, GArray *q);
 
+/*
+ * Lookup helpers.
+ */
+struct definition *lookup_definition(struct definition *definition,
+				     const char *field_name);
+struct definition_integer *lookup_integer(struct definition *definition,
+					  const char *field_name,
+					  int signedness);
+struct definition_enum *lookup_enum(struct definition *definition,
+				    const char *field_name,
+				    int signedness);
+struct definition *lookup_variant(struct definition *definition,
+				  const char *field_name);
+
 #endif /* _BABELTRACE_TYPES_H */