X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=93d1e25146495920c40537b942d556b54541391c;hp=151bd65a1e1effd4082c17282efe26682b677d92;hb=95d36295f18e15c7f68a97fbab3eb1961d21cd70;hpb=dc48ecad637fc7fb8479da563ef2dfd3948cee73

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 151bd65a..93d1e251 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,7 +6,9 @@
  *
  * Trace Format 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
@@ -24,76 +26,39 @@
 #include <stdio.h>
 #include <glib.h>
 
-struct trace_descriptor;
+/* forward declaration */
+struct ctf_stream_pos;
 
-struct format {
-	GQuark name;
+/* Parent trace descriptor */
+struct trace_descriptor {
+};
 
-	uint64_t (*uint_read)(struct stream_pos *pos,
-		const struct declaration_integer *integer_declaration);
-	int64_t (*int_read)(struct stream_pos *pos,
-		const struct declaration_integer *integer_declaration);
-	void (*uint_write)(struct stream_pos *pos,
-		const struct declaration_integer *integer_declaration,
-		uint64_t v);
-	void (*int_write)(struct stream_pos *pos,
-		const struct declaration_integer *integer_declaration,
-		int64_t v);
+struct mmap_stream {
+	int fd;
+	struct cds_list_head list;
+};
 
-	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 declaration_float *float_declaration);
-	void (*double_write)(struct stream_pos *pos,
-		const struct declaration_float *float_declaration,
-		double v);
-	long double (*ldouble_read)(struct stream_pos *pos,
-		const struct declaration_float *float_declaration);
-	void (*ldouble_write)(struct stream_pos *pos,
-		const struct declaration_float *float_declaration,
-		long double v);
+struct mmap_stream_list {
+	struct cds_list_head head;
+};
 
-	void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
-		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);
+struct format {
+	GQuark name;
 
-	/*
-	 * 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 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 trace_descriptor *(*open_trace)(const char *path, int flags);
+	struct trace_descriptor *(*open_trace)(const char *collection_path,
+			const char *path, int flags,
+			void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+				int whence), FILE *metadata_fp);
+	struct trace_descriptor *(*open_mmap_trace)(
+			struct mmap_stream_list *mmap_list,
+			void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+				int whence), FILE *metadata_fp);
 	void (*close_trace)(struct trace_descriptor *descriptor);
 };
 
-struct format *bt_lookup_format(GQuark qname);
-void bt_fprintf_format_list(FILE *fp);
-int bt_register_format(struct format *format);
+extern struct format *bt_lookup_format(GQuark qname);
+extern void bt_fprintf_format_list(FILE *fp);
+extern int bt_register_format(struct format *format);
 
 /* TBD: format unregistration */