X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=590ab4cb1cca73ef14c14aff98d3e7d45a261b35;hp=5909ce39f0bf3599ea720829d15cf3f050a449ff;hb=7fb210365ad968646a0088d80f709165bf068950;hpb=7fe001942cc8ece60d945cbfbd1d135ff548dc7d

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 5909ce39..590ab4cb 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,67 +6,85 @@
  *
  * Trace Format Header
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
+#include <babeltrace/types.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <glib.h>
 
 struct format {
 	GQuark name;
 
 	uint64_t (*uint_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
+		const struct declaration_integer *integer_declaration);
 	int64_t (*int_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
+		const struct declaration_integer *integer_declaration);
 	void (*uint_write)(struct stream_pos *pos,
-			   const struct type_class_integer *int_class,
-			   uint64_t v);
+		const struct declaration_integer *integer_declaration,
+		uint64_t v);
 	void (*int_write)(struct stream_pos *pos,
-			  const struct type_class_integer *int_class,
-			  int64_t v);
+		const struct declaration_integer *integer_declaration,
+		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 declaration_float *float_declaration);
 	double (*double_read)(struct stream_pos *pos,
-			      const struct type_class_float *float_class);
+		const struct declaration_float *float_declaration);
 	void (*double_write)(struct stream_pos *pos,
-			     const struct type_class_float *float_class,
-			     double v);
+		const struct declaration_float *float_declaration,
+		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 declaration_string *string_declaration);
+	void (*string_read)(char **dest, struct stream_pos *src,
+		const struct declaration_string *string_declaration);
+	void (*string_write)(struct stream_pos *dest, const char *src,
+		const struct declaration_string *string_declaration);
+	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 declaration_enum *src);
 	void (*enum_write)(struct stream_pos *pos,
-			   const struct type_class_enum *dest,
-			   GQuark q);
-
+		const struct declaration_enum *dest,
+		GQuark q);
+	void (*struct_begin)(struct stream_pos *pos,
+		const struct declaration_struct *struct_declaration);
+	void (*struct_end)(struct stream_pos *pos,
+		const struct declaration_struct *struct_declaration);
+	void (*variant_begin)(struct stream_pos *pos,
+		const struct declaration_variant *variant_declaration);
+	void (*variant_end)(struct stream_pos *pos,
+		const struct declaration_variant *variant_declaration);
+	void (*array_begin)(struct stream_pos *pos,
+		const struct declaration_array *array_declaration);
+	void (*array_end)(struct stream_pos *pos,
+		const struct declaration_array *array_declaration);
+	void (*sequence_begin)(struct stream_pos *pos,
+		const struct declaration_sequence *sequence_declaration);
+	void (*sequence_end)(struct stream_pos *pos,
+		const struct declaration_sequence *sequence_declaration);
 };
 
 struct format *bt_lookup_format(GQuark qname);
-int bt_register_format(const struct format *format);
+void bt_fprintf_format_list(FILE *fp);
+int bt_register_format(struct format *format);
 
 /* TBD: format unregistration */