X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=6cae14efc3744ab7de264c7b672321a0857cd3de;hb=de47353a173cf134d0bd50673520e243ebc29054;hp=7162c0ea0822cbb2320317407aa1be87d0020f5e;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271;p=babeltrace.git

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 7162c0ea..6cae14ef 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,7 +6,7 @@
  *
  * Trace Format Header
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - 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
@@ -19,6 +19,7 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <babeltrace/types.h>
 #include <stdint.h>
 #include <glib.h>
 
@@ -26,54 +27,62 @@ struct format {
 	GQuark name;
 
 	uint64_t (*uint_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
+			const struct type_integer *integer_type);
 	int64_t (*int_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
+			const struct type_integer *integer_type);
 	void (*uint_write)(struct stream_pos *pos,
-			   const struct type_class_integer *int_class,
+			   const struct type_integer *integer_type,
 			   uint64_t v);
 	void (*int_write)(struct stream_pos *pos,
-			  const struct type_class_integer *int_class,
+			  const struct type_integer *integer_type,
 			  int64_t v);
 
-	void (*float_copy)(struct stream_pos *dest,
-			   struct stream_pos *src,
-			   const struct type_class_float *src);
+	void (*float_copy)(struct stream_pos *destp,
+			   struct stream_pos *srcp,
+			   const struct type_float *float_type);
 	double (*double_read)(struct stream_pos *pos,
-			      const struct type_class_float *float_class);
+			      const struct type_float *float_type);
 	void (*double_write)(struct stream_pos *pos,
-			     const struct type_class_float *float_class,
+			     const struct type_float *float_type,
 			     double v);
 
 	void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
-			    const struct type_class_string *string_class);
-	void (*string_read)(unsigned char **dest, struct stream_pos *src,
-			    const struct type_class_string *string_class);
-	void (*string_write)(struct stream_pos *dest, const unsigned char *src,
-			     const struct type_class_string *string_class);
-	void (*string_free_temp)(unsigned char *string);
+			    const struct type_string *string_type);
+	void (*string_read)(char **dest, struct stream_pos *src,
+			    const struct type_string *string_type);
+	void (*string_write)(struct stream_pos *dest, const char *src,
+			     const struct type_string *string_type);
+	void (*string_free_temp)(char *string);
 
-	GQuark (*enum_read)(struct stream_pos *pos,
-			    const struct type_class_enum *src);
+	/*
+	 * enum_read returns a GArray of GQuark. Must be released with
+	 * g_array_unref().
+	 */
+	GArray *(*enum_read)(struct stream_pos *pos,
+			    const struct type_enum *src);
 	void (*enum_write)(struct stream_pos *pos,
-			   const struct type_class_enum *dest,
+			   const struct type_enum *dest,
 			   GQuark q);
 	void (*struct_begin)(struct stream_pos *pos,
-			     const struct type_class_struct *struct_class);
+			     const struct type_struct *struct_type);
 	void (*struct_end)(struct stream_pos *pos,
-			   const struct type_class_struct *struct_class);
+			   const struct type_struct *struct_type);
+	void (*variant_begin)(struct stream_pos *pos,
+			      const struct type_variant *variant_type);
+	void (*variant_end)(struct stream_pos *pos,
+			    const struct type_variant *variant_type);
 	void (*array_begin)(struct stream_pos *pos,
-			     const struct type_class_array *array_class);
+			     const struct type_array *array_type);
 	void (*array_end)(struct stream_pos *pos,
-			   const struct type_class_array *array_class);
+			   const struct type_array *array_type);
 	void (*sequence_begin)(struct stream_pos *pos,
-			     const struct type_class_sequence *sequence_class);
+			     const struct type_sequence *sequence_type);
 	void (*sequence_end)(struct stream_pos *pos,
-			   const struct type_class_sequence *sequence_class);
+			   const struct type_sequence *sequence_type);
 };
 
 struct format *bt_lookup_format(GQuark qname);
-int bt_register_format(const struct format *format);
+int bt_register_format(struct format *format);
 
 /* TBD: format unregistration */