X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=c6faca71d9ada4774e82483e5f527904037a6761;hp=b9c3e9fb0b029845ae280260d454a558cb070e1b;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=47e0f2e23aef98a584bf964754ab1e29c2897cfb

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index b9c3e9fb..c6faca71 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,7 +6,9 @@
  *
  * Trace Format Header
  *
- * Copyright 2010 - 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
@@ -17,69 +19,76 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
-#include <babeltrace/types.h>
+#include <babeltrace/list.h>
+#include <babeltrace/clock-types.h>
 #include <stdint.h>
-#include <glib.h>
+#include <stdio.h>
 
-struct format {
-	GQuark name;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef int bt_intern_str;
+
+/* forward declaration */
+struct stream_pos;
+struct bt_context;
+struct bt_trace_handle;
 
-	uint64_t (*uint_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
-	int64_t (*int_read)(struct stream_pos *pos,
-			const struct type_class_integer *int_class);
-	void (*uint_write)(struct stream_pos *pos,
-			   const struct type_class_integer *int_class,
-			   uint64_t v);
-	void (*int_write)(struct stream_pos *pos,
-			  const struct type_class_integer *int_class,
-			  int64_t v);
+/* Parent trace descriptor */
+struct trace_descriptor {
+};
 
-	void (*float_copy)(struct stream_pos *destp,
-			   struct stream_pos *srcp,
-			   const struct type_class_float *float_class);
-	double (*double_read)(struct stream_pos *pos,
-			      const struct type_class_float *float_class);
-	void (*double_write)(struct stream_pos *pos,
-			     const struct type_class_float *float_class,
-			     double v);
+struct mmap_stream {
+	int fd;
+	struct bt_list_head list;
+};
 
-	void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
-			    const struct type_class_string *string_class);
-	void (*string_read)(char **dest, struct stream_pos *src,
-			    const struct type_class_string *string_class);
-	void (*string_write)(struct stream_pos *dest, const char *src,
-			     const struct type_class_string *string_class);
-	void (*string_free_temp)(char *string);
+struct mmap_stream_list {
+	struct bt_list_head head;
+};
+
+struct format {
+	bt_intern_str name;
 
-	/*
-	 * enum_read returns a GArray of GQuark. Must be released with
-	 * g_array_unref().
-	 */
-	GArray *(*enum_read)(struct stream_pos *pos,
-			    const struct type_class_enum *src);
-	void (*enum_write)(struct stream_pos *pos,
-			   const struct type_class_enum *dest,
-			   GQuark q);
-	void (*struct_begin)(struct stream_pos *pos,
-			     const struct type_class_struct *struct_class);
-	void (*struct_end)(struct stream_pos *pos,
-			   const struct type_class_struct *struct_class);
-	void (*array_begin)(struct stream_pos *pos,
-			     const struct type_class_array *array_class);
-	void (*array_end)(struct stream_pos *pos,
-			   const struct type_class_array *array_class);
-	void (*sequence_begin)(struct stream_pos *pos,
-			     const struct type_class_sequence *sequence_class);
-	void (*sequence_end)(struct stream_pos *pos,
-			   const struct type_class_sequence *sequence_class);
+	struct trace_descriptor *(*open_trace)(const char *path, int flags,
+			void (*packet_seek)(struct stream_pos *pos,
+				size_t index, int whence),
+			FILE *metadata_fp);
+	struct trace_descriptor *(*open_mmap_trace)(
+			struct mmap_stream_list *mmap_list,
+			void (*packet_seek)(struct stream_pos *pos,
+				size_t index, int whence),
+			FILE *metadata_fp);
+	int (*close_trace)(struct trace_descriptor *descriptor);
+	void (*set_context)(struct trace_descriptor *descriptor,
+			struct bt_context *ctx);
+	void (*set_handle)(struct trace_descriptor *descriptor,
+			struct bt_trace_handle *handle);
+	uint64_t (*timestamp_begin)(struct trace_descriptor *descriptor,
+			struct bt_trace_handle *handle, enum bt_clock_type type);
+	uint64_t (*timestamp_end)(struct trace_descriptor *descriptor,
+			struct bt_trace_handle *handle, enum bt_clock_type type);
+	int (*convert_index_timestamp)(struct trace_descriptor *descriptor);
 };
 
-struct format *bt_lookup_format(GQuark qname);
-int bt_register_format(struct format *format);
+extern struct format *bt_lookup_format(bt_intern_str qname);
+extern void bt_fprintf_format_list(FILE *fp);
+extern int bt_register_format(struct format *format);
+extern void bt_unregister_format(struct format *format);
 
-/* TBD: format unregistration */
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _BABELTRACE_FORMAT_H */