X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=2965f496f2fc7a0ae51d55519975cf5257e00f7a;hb=8b8dc96e023c365461d2407a3bf2220779bc7d05;hp=7c3df128c9b147dd86846e8d2aaed8c6170f6ee6;hpb=c34ea0fad3f9900c3b97efa229d221927422dacf;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 7c3df128..2965f496 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -23,12 +23,14 @@
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/trace-handle-internal.h>
+#include <babeltrace/context-internal.h>
+#include <babeltrace/uuid.h>
+#include <babeltrace/endian.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <uuid/uuid.h>
 #include <sys/mman.h>
 #include <errno.h>
-#include <endian.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -41,6 +43,7 @@
 #include "metadata/ctf-parser.h"
 #include "metadata/ctf-ast.h"
 #include "events-private.h"
+#include "memstream.h"
 
 /*
  * We currently simply map a page to read the packet header and packet
@@ -48,7 +51,6 @@
  */
 #define MAX_PACKET_HEADER_LEN	(getpagesize() * CHAR_BIT)
 #define WRITE_PACKET_LEN	(getpagesize() * 8 * CHAR_BIT)
-#define UUID_LEN 16	/* uuid by value len */
 
 #ifndef min
 #define min(a, b)	(((a) < (b)) ? (a) : (b))
@@ -76,6 +78,12 @@ struct trace_descriptor *ctf_open_mmap_trace(
 		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence),
 		FILE *metadata_fp);
+static
+void ctf_set_context(struct trace_descriptor *descriptor,
+		struct bt_context *ctx);
+static
+void ctf_set_handle(struct trace_descriptor *descriptor,
+		struct bt_trace_handle *handle);
 
 static
 void ctf_close_trace(struct trace_descriptor *descriptor);
@@ -109,6 +117,8 @@ struct format ctf_format = {
 	.open_trace = ctf_open_trace,
 	.open_mmap_trace = ctf_open_mmap_trace,
 	.close_trace = ctf_close_trace,
+	.set_context = ctf_set_context,
+	.set_handle = ctf_set_handle,
 };
 
 /*
@@ -689,7 +699,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 		memcpy(td->uuid, header.uuid, sizeof(header.uuid));
 		CTF_TRACE_SET_FIELD(td, uuid);
 	} else {
-		if (uuid_compare(header.uuid, td->uuid))
+		if (babeltrace_uuid_compare(header.uuid, td->uuid))
 			return -EINVAL;
 	}
 
@@ -748,7 +758,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 	 * because its size includes garbage at the end (after final
 	 * \0). This is the allocated size, not the actual string size.
 	 */
-	out = open_memstream(buf, &size);
+	out = babeltrace_open_memstream(buf, &size);
 	if (out == NULL) {
 		perror("Metadata open_memstream");
 		return -errno;
@@ -763,10 +773,16 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
 			break;
 		}
 	}
-	fclose(out);	/* flush the buffer */
+	/* close to flush the buffer */
+	ret = babeltrace_close_memstream(buf, &size, out);
+	if (ret < 0) {
+		perror("babeltrace_flush_memstream");
+		fclose(in);
+		return -errno;
+	}
 	fclose(in);
 	/* open for reading */
-	*fp = fmemopen(*buf, strlen(*buf), "rb");
+	*fp = babeltrace_fmemopen(*buf, strlen(*buf), "rb");
 	if (!*fp) {
 		perror("Metadata fmemopen");
 		return -errno;
@@ -1077,20 +1093,20 @@ int create_stream_packet_index(struct ctf_trace *td,
 				struct definition_array *defarray;
 				struct definition *field;
 				uint64_t i;
-				uint8_t uuidval[UUID_LEN];
+				uint8_t uuidval[BABELTRACE_UUID_LEN];
 
 				field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
 				assert(field->declaration->id == CTF_TYPE_ARRAY);
 				defarray = container_of(field, struct definition_array, p);
-				assert(array_len(defarray) == UUID_LEN);
+				assert(array_len(defarray) == BABELTRACE_UUID_LEN);
 
-				for (i = 0; i < UUID_LEN; i++) {
+				for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
 					struct definition *elem;
 
 					elem = array_index(defarray, i);
 					uuidval[i] = get_unsigned_int(elem);
 				}
-				ret = uuid_compare(td->uuid, uuidval);
+				ret = babeltrace_uuid_compare(td->uuid, uuidval);
 				if (ret) {
 					fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
 					return -EINVAL;
@@ -1604,6 +1620,26 @@ void ctf_close_trace(struct trace_descriptor *tdp)
 	g_free(td);
 }
 
+static
+void ctf_set_context(struct trace_descriptor *descriptor,
+		struct bt_context *ctx)
+{
+	struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
+			parent);
+
+	td->ctx = ctx;
+}
+
+static
+void ctf_set_handle(struct trace_descriptor *descriptor,
+		struct bt_trace_handle *handle)
+{
+	struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
+			parent);
+
+	td->handle = handle;
+}
+
 void __attribute__((constructor)) ctf_init(void)
 {
 	int ret;