X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=b4d2d4a7dc8b423a5bf1f7ebea971f381384ef2f;hp=cd31a9efef253333d7be1bd3de5ad8318a1f1c9d;hb=56e603733d2a16aba6fdaf149ad6a4cd42e44eda;hpb=a35173fe7e72fe456cbd19db34a5ff7a09a0c7ff

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index cd31a9ef..b4d2d4a7 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
@@ -35,6 +37,7 @@ struct ctf_stream;
 struct stream_pos;
 struct format;
 struct definition;
+struct ctf_clock;
 
 /* type scope */
 struct declaration_scope {
@@ -149,6 +152,7 @@ struct declaration_integer {
 	int signedness;
 	int base;		/* Base for pretty-printing: 2, 8, 10, 16 */
 	enum ctf_string_encoding encoding;
+	struct ctf_clock *clock;
 };
 
 struct definition_integer {
@@ -177,7 +181,7 @@ struct definition_float {
 	struct definition_integer *mantissa;
 	struct definition_integer *exp;
 	/* Last values read */
-	long double value;
+	double value;
 };
 
 /*
@@ -380,7 +384,10 @@ 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);
+				  int base, enum ctf_string_encoding encoding,
+				  struct ctf_clock *clock);
+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
@@ -407,7 +414,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.
@@ -427,6 +434,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,
@@ -491,6 +499,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
@@ -512,6 +521,8 @@ 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);