diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac633e8..2b54b35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,7 @@ add_executable(ovniemu
   emu_ovni.c
   emu_tampi.c
   emu_nanos6.c
+  trace.c
   ovni.c
   parson.c
   pcf.c
@@ -76,12 +77,14 @@ add_executable(ovniemu
 add_executable(ovnidump
   dump.c
   ovni.c
+  trace.c
   parson.c
 )
 
 add_executable(ovni2prv
   ovni2prv.c
   ovni.c
+  trace.c
   parson.c
 )
 
diff --git a/common.h b/common.h
new file mode 100644
index 0000000..c887b34
--- /dev/null
+++ b/common.h
@@ -0,0 +1,18 @@
+#ifndef COMMON_H
+#define COMMON_H
+
+/* Debug macros */
+
+#ifdef ENABLE_DEBUG
+# define dbg(...) fprintf(stderr, __VA_ARGS__);
+#else
+# define dbg(...)
+#endif
+
+#define err(...) fprintf(stderr, __VA_ARGS__);
+
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#define UNUSED(x) (void)(x)
+
+#endif /* COMMON_H */
diff --git a/dump.c b/dump.c
index f89291d..9c190da 100644
--- a/dump.c
+++ b/dump.c
@@ -26,7 +26,7 @@
 #include <dirent.h> 
 
 #include "ovni.h"
-#include "ovni_trace.h"
+#include "trace.h"
 #include "emu.h"
 
 //static void
diff --git a/emu.c b/emu.c
index 1caa05b..0462586 100644
--- a/emu.c
+++ b/emu.c
@@ -31,7 +31,7 @@
 #include <time.h>
 
 #include "ovni.h"
-#include "ovni_trace.h"
+#include "trace.h"
 #include "emu.h"
 #include "prv.h"
 #include "pcf.h"
diff --git a/emu.h b/emu.h
index 9d9f463..b6bab9a 100644
--- a/emu.h
+++ b/emu.h
@@ -18,25 +18,13 @@
 #ifndef OVNI_EMU_H
 #define OVNI_EMU_H
 
+#include <stdio.h>
+
 #include "ovni.h"
 #include "uthash.h"
 #include "parson.h"
 #include "heap.h"
-#include <stdio.h>
-
-/* Debug macros */
-
-#ifdef ENABLE_DEBUG
-# define dbg(...) fprintf(stderr, __VA_ARGS__);
-#else
-# define dbg(...)
-#endif
-
-#define err(...) fprintf(stderr, __VA_ARGS__);
-
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-#define UNUSED(x) (void)(x)
+#include "common.h"
 
 /* Emulated thread runtime status */
 enum ethread_state {
diff --git a/emu_nanos6.c b/emu_nanos6.c
index ee4a10b..d9dac4d 100644
--- a/emu_nanos6.c
+++ b/emu_nanos6.c
@@ -19,7 +19,6 @@
 #include "uthash.h"
 
 #include "ovni.h"
-#include "ovni_trace.h"
 #include "emu.h"
 #include "prv.h"
 #include "chan.h"
diff --git a/emu_nosv.c b/emu_nosv.c
index bd63f0e..096ebc9 100644
--- a/emu_nosv.c
+++ b/emu_nosv.c
@@ -19,7 +19,6 @@
 #include "uthash.h"
 
 #include "ovni.h"
-#include "ovni_trace.h"
 #include "emu.h"
 #include "prv.h"
 #include "chan.h"
diff --git a/emu_openmp.c b/emu_openmp.c
index db297d4..16ec43b 100644
--- a/emu_openmp.c
+++ b/emu_openmp.c
@@ -19,7 +19,6 @@
 #include "uthash.h"
 
 #include "ovni.h"
-#include "ovni_trace.h"
 #include "emu.h"
 #include "prv.h"
 #include "chan.h"
diff --git a/emu_tampi.c b/emu_tampi.c
index 3fc543e..f40ccf2 100644
--- a/emu_tampi.c
+++ b/emu_tampi.c
@@ -19,7 +19,6 @@
 #include "uthash.h"
 
 #include "ovni.h"
-#include "ovni_trace.h"
 #include "emu.h"
 #include "prv.h"
 #include "chan.h"
diff --git a/ovni.c b/ovni.c
index 1b21066..4eb7ef2 100644
--- a/ovni.c
+++ b/ovni.c
@@ -42,7 +42,7 @@
 #include <dirent.h>
 
 #include "ovni.h"
-#include "ovni_trace.h"
+#include "common.h"
 #include "parson.h"
 
 #ifndef gettid
@@ -605,428 +605,3 @@ ovni_ev_emit(struct ovni_ev *ev)
 	ovni_ev_set_clock(ev);
 	ovni_ev_add(ev);
 }
-
-static int
-find_dir_prefix_str(struct dirent *dirent, const char *prefix, const char **str)
-{
-	const char *p;
-
-	p = dirent->d_name;
-
-	/* Check the prefix */
-	if(strncmp(p, prefix, strlen(prefix)) != 0)
-		return -1;
-
-	p += strlen(prefix);
-
-	/* Find the dot */
-	if(*p != '.')
-		return -1;
-
-	p++;
-
-	*str = p;
-
-	return 0;
-}
-
-static int
-find_dir_prefix_int(struct dirent *dirent, const char *prefix, int *num)
-{
-	const char *p;
-
-	if(find_dir_prefix_str(dirent, prefix, &p) != 0)
-		return -1;
-
-	/* Convert the suffix string to a number */
-	*num = atoi(p);
-
-	return 0;
-}
-
-static int
-load_thread(struct ovni_ethread *thread, struct ovni_eproc *proc, int index, int tid, char *filepath)
-{
-	static int total_threads = 0;
-
-	thread->tid = tid;
-	thread->index = index;
-	thread->gindex = total_threads++;
-	thread->state = TH_ST_UNKNOWN;
-	thread->proc = proc;
-	thread->stream_fd = open(filepath, O_RDONLY);
-
-	if(thread->stream_fd == -1)
-	{
-		perror("open");
-		return -1;
-	}
-	return 0;
-}
-
-static void
-load_proc_metadata(struct ovni_eproc *proc)
-{
-	JSON_Object *meta;
-
-	meta = json_value_get_object(proc->meta);
-	assert(meta);
-
-	proc->appid = (int) json_object_get_number(meta, "app_id");
-}
-
-
-static int
-load_proc(struct ovni_eproc *proc, struct ovni_loom *loom, int index, int pid, char *procdir)
-{
-	static int total_procs = 0;
-
-	struct dirent *dirent;
-	DIR *dir;
-	char path[PATH_MAX];
-	struct ovni_ethread *thread;
-	int tid;
-
-	proc->pid = pid;
-	proc->index = index;
-	proc->gindex = total_procs++;
-	proc->loom = loom;
-
-	if(snprintf(path, PATH_MAX, "%s/%s", procdir, "metadata.json") >=
-			PATH_MAX)
-	{
-		err("snprintf: path too large: %s\n", procdir);
-		abort();
-	}
-
-	proc->meta = json_parse_file_with_comments(path);
-	if(proc->meta == NULL)
-	{
-		err("error loading metadata from %s\n", path);
-		return -1;
-	}
-
-	/* The appid is populated from the metadata */
-	load_proc_metadata(proc);
-
-	if((dir = opendir(procdir)) == NULL)
-	{
-		fprintf(stderr, "opendir %s failed: %s\n",
-				procdir, strerror(errno));
-		return -1;
-	}
-
-	while((dirent = readdir(dir)) != NULL)
-	{
-		if(find_dir_prefix_int(dirent, "thread", &tid) != 0)
-			continue;
-
-		if(snprintf(path, PATH_MAX, "%s/%s", procdir, dirent->d_name) >=
-				PATH_MAX)
-		{
-			err("snprintf: path too large: %s\n", procdir);
-			abort();
-		}
-
-		if(proc->nthreads >= OVNI_MAX_THR)
-		{
-			err("too many thread streams for process %d\n", pid);
-			abort();
-		}
-
-		thread = &proc->thread[proc->nthreads];
-
-		if(load_thread(thread, proc, proc->nthreads, tid, path) != 0)
-			return -1;
-
-		proc->nthreads++;
-	}
-
-	closedir(dir);
-
-
-
-	return 0;
-}
-
-static int
-load_loom(struct ovni_loom *loom, int loomid, char *loomdir)
-{
-	int pid;
-	char path[PATH_MAX];
-	DIR *dir;
-	struct dirent *dirent;
-	struct ovni_eproc *proc;
-
-	if((dir = opendir(loomdir)) == NULL)
-	{
-		fprintf(stderr, "opendir %s failed: %s\n",
-				loomdir, strerror(errno));
-		return -1;
-	}
-
-	while((dirent = readdir(dir)) != NULL)
-	{
-		if(find_dir_prefix_int(dirent, "proc", &pid) != 0)
-			continue;
-
-		sprintf(path, "%s/%s", loomdir, dirent->d_name);
-
-		if(loom->nprocs >= OVNI_MAX_PROC)
-		{
-			err("too many process streams for loom %d\n",
-					loomid);
-			abort();
-		}
-
-		proc = &loom->proc[loom->nprocs];
-
-		if(load_proc(proc, loom, loom->nprocs, pid, path) != 0)
-			return -1;
-
-		loom->nprocs++;
-	}
-
-	closedir(dir);
-
-	return 0;
-}
-
-static int
-compare_alph(const void* a, const void* b)
-{
-	return strcmp(*(const char**)a, *(const char**)b);
-}
-
-int
-ovni_load_trace(struct ovni_trace *trace, char *tracedir)
-{
-	char *looms[OVNI_MAX_LOOM];
-	char *hosts[OVNI_MAX_LOOM];
-	const char *loom_name;
-	DIR *dir;
-	struct dirent *dirent;
-	size_t l;
-
-	trace->nlooms = 0;
-
-	if((dir = opendir(tracedir)) == NULL)
-	{
-		fprintf(stderr, "opendir %s failed: %s\n",
-				tracedir, strerror(errno));
-		return -1;
-	}
-
-	for(l=0; l<OVNI_MAX_LOOM; l++)
-	{
-		looms[l] = malloc(PATH_MAX);
-		hosts[l] = malloc(PATH_MAX);
-	}
-
-	while((dirent = readdir(dir)) != NULL)
-	{
-		if(find_dir_prefix_str(dirent, "loom", &loom_name) != 0)
-		{
-			/* Ignore other files in tracedir */
-			continue;
-		}
-
-		if(trace->nlooms >= OVNI_MAX_LOOM)
-		{
-			err("too many looms for trace %s\n",
-					tracedir);
-			abort();
-		}
-
-		sprintf(hosts[trace->nlooms], "%s", loom_name);
-
-		sprintf(looms[trace->nlooms], "%s/%s", tracedir, dirent->d_name);
-
-		trace->nlooms++;
-	}
-
-	qsort((const char **) hosts, trace->nlooms, sizeof(const char*), compare_alph);
-	qsort((const char **) looms, trace->nlooms, sizeof(const char*), compare_alph);
-
-	for(l=0; l<trace->nlooms; l++)
-	{
-		if(strlen(hosts[l]) >= PATH_MAX)
-		{
-			err("error hostname too long: %s\n", hosts[l]);
-			exit(EXIT_FAILURE);
-		}
-
-		/* Safe */
-		strcpy(trace->loom[l].hostname, hosts[l]);
-
-		if(load_loom(&trace->loom[l], l, looms[l]) != 0)
-			return -1;
-	}
-
-	closedir(dir);
-
-	for(l=0; l<OVNI_MAX_LOOM; l++)
-	{
-		free(looms[l]);
-		free(hosts[l]);
-	}
-
-	return 0;
-}
-
-static int
-load_stream_buf(struct ovni_stream *stream, struct ovni_ethread *thread)
-{
-	struct stat st;
-
-	if(fstat(thread->stream_fd, &st) < 0)
-	{
-		perror("fstat");
-		return -1;
-	}
-
-	if(st.st_size == 0)
-	{
-		err("warning: stream %d is empty\n", stream->tid);
-		stream->size = 0;
-		stream->buf = NULL;
-		stream->active = 0;
-
-		return 0;
-	}
-
-	stream->size = st.st_size;
-	stream->buf = mmap(NULL, stream->size, PROT_READ, MAP_SHARED,
-			thread->stream_fd, 0);
-
-	if(stream->buf == MAP_FAILED)
-	{
-		perror("mmap");
-		return -1;
-	}
-
-	stream->active = 1;
-
-	return 0;
-}
-
-/* Populates the streams in a single array */
-int
-ovni_load_streams(struct ovni_trace *trace)
-{
-	size_t i, j, k, s;
-	struct ovni_loom *loom;
-	struct ovni_eproc *proc;
-	struct ovni_ethread *thread;
-	struct ovni_stream *stream;
-
-	trace->nstreams = 0;
-
-	for(i=0; i<trace->nlooms; i++)
-	{
-		loom = &trace->loom[i];
-		for(j=0; j<loom->nprocs; j++)
-		{
-			proc = &loom->proc[j];
-			for(k=0; k<proc->nthreads; k++)
-			{
-				trace->nstreams++;
-			}
-		}
-	}
-
-	trace->stream = calloc(trace->nstreams, sizeof(struct ovni_stream));
-
-	if(trace->stream == NULL)
-	{
-		perror("calloc");
-		return -1;
-	}
-
-	err("loaded %ld streams\n", trace->nstreams);
-
-	for(s=0, i=0; i<trace->nlooms; i++)
-	{
-		loom = &trace->loom[i];
-		for(j=0; j<loom->nprocs; j++)
-		{
-			proc = &loom->proc[j];
-			for(k=0; k<proc->nthreads; k++)
-			{
-				thread = &proc->thread[k];
-				stream = &trace->stream[s++];
-
-				stream->tid = thread->tid;
-				stream->thread = k;
-				stream->proc = j;
-				stream->loom = i;
-				stream->lastclock = 0;
-				stream->offset = 0;
-				stream->cur_ev = NULL;
-
-				if(load_stream_buf(stream, thread) != 0)
-				{
-					err("load_stream_buf failed\n");
-					return -1;
-				}
-
-			}
-		}
-	}
-
-	return 0;
-}
-
-void
-ovni_free_streams(struct ovni_trace *trace)
-{
-	free(trace->stream);
-}
-
-int
-ovni_load_next_event(struct ovni_stream *stream)
-{
-	size_t size;
-
-	if(stream->active == 0)
-	{
-		dbg("stream is inactive, cannot load more events\n");
-		return -1;
-	}
-
-	if(stream->cur_ev == NULL)
-	{
-		stream->cur_ev = (struct ovni_ev *) stream->buf;
-		stream->offset = 0;
-		size = 0;
-		goto out;
-	}
-
-	//printf("advancing offset %ld bytes\n", ovni_ev_size(stream->cur_ev));
-	size = ovni_ev_size(stream->cur_ev);
-	stream->offset += size;
-
-	/* We have reached the end */
-	if(stream->offset == stream->size)
-	{
-		stream->active = 0;
-		dbg("stream %d runs out of events\n", stream->tid);
-		return -1;
-	}
-
-	/* It cannot overflow, otherwise we are reading garbage */
-	assert(stream->offset < stream->size);
-
-	stream->cur_ev = (struct ovni_ev *) &stream->buf[stream->offset];
-
-out:
-
-	//dbg("---------\n");
-	//dbg("ev size = %d\n", ovni_ev_size(stream->cur_ev));
-	//dbg("ev flags = %02x\n", stream->cur_ev->header.flags);
-	//dbg("loaded next event:\n");
-	//hexdump((uint8_t *) stream->cur_ev, ovni_ev_size(stream->cur_ev));
-	//dbg("---------\n");
-
-	return (int) size;
-}
diff --git a/ovni2prv.c b/ovni2prv.c
index 6d0bf27..cee5fc2 100644
--- a/ovni2prv.c
+++ b/ovni2prv.c
@@ -26,7 +26,7 @@
 #include <dirent.h> 
 
 #include "ovni.h"
-#include "ovni_trace.h"
+#include "trace.h"
 
 static void
 emit(struct ovni_ev *ev, int row)
diff --git a/trace.c b/trace.c
new file mode 100644
index 0000000..108da4d
--- /dev/null
+++ b/trace.c
@@ -0,0 +1,445 @@
+#include "trace.h"
+
+#define _GNU_SOURCE
+#include <unistd.h>
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
+#include <linux/limits.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <stdatomic.h>
+#include <assert.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+
+static int
+find_dir_prefix_str(struct dirent *dirent, const char *prefix, const char **str)
+{
+	const char *p;
+
+	p = dirent->d_name;
+
+	/* Check the prefix */
+	if(strncmp(p, prefix, strlen(prefix)) != 0)
+		return -1;
+
+	p += strlen(prefix);
+
+	/* Find the dot */
+	if(*p != '.')
+		return -1;
+
+	p++;
+
+	*str = p;
+
+	return 0;
+}
+
+static int
+find_dir_prefix_int(struct dirent *dirent, const char *prefix, int *num)
+{
+	const char *p;
+
+	if(find_dir_prefix_str(dirent, prefix, &p) != 0)
+		return -1;
+
+	/* Convert the suffix string to a number */
+	*num = atoi(p);
+
+	return 0;
+}
+
+static int
+load_thread(struct ovni_ethread *thread, struct ovni_eproc *proc, int index, int tid, char *filepath)
+{
+	static int total_threads = 0;
+
+	thread->tid = tid;
+	thread->index = index;
+	thread->gindex = total_threads++;
+	thread->state = TH_ST_UNKNOWN;
+	thread->proc = proc;
+	thread->stream_fd = open(filepath, O_RDONLY);
+
+	if(thread->stream_fd == -1)
+	{
+		perror("open");
+		return -1;
+	}
+	return 0;
+}
+
+static void
+load_proc_metadata(struct ovni_eproc *proc)
+{
+	JSON_Object *meta;
+
+	meta = json_value_get_object(proc->meta);
+	assert(meta);
+
+	proc->appid = (int) json_object_get_number(meta, "app_id");
+}
+
+
+static int
+load_proc(struct ovni_eproc *proc, struct ovni_loom *loom, int index, int pid, char *procdir)
+{
+	static int total_procs = 0;
+
+	struct dirent *dirent;
+	DIR *dir;
+	char path[PATH_MAX];
+	struct ovni_ethread *thread;
+	int tid;
+
+	proc->pid = pid;
+	proc->index = index;
+	proc->gindex = total_procs++;
+	proc->loom = loom;
+
+	if(snprintf(path, PATH_MAX, "%s/%s", procdir, "metadata.json") >=
+			PATH_MAX)
+	{
+		err("snprintf: path too large: %s\n", procdir);
+		abort();
+	}
+
+	proc->meta = json_parse_file_with_comments(path);
+	if(proc->meta == NULL)
+	{
+		err("error loading metadata from %s\n", path);
+		return -1;
+	}
+
+	/* The appid is populated from the metadata */
+	load_proc_metadata(proc);
+
+	if((dir = opendir(procdir)) == NULL)
+	{
+		fprintf(stderr, "opendir %s failed: %s\n",
+				procdir, strerror(errno));
+		return -1;
+	}
+
+	while((dirent = readdir(dir)) != NULL)
+	{
+		if(find_dir_prefix_int(dirent, "thread", &tid) != 0)
+			continue;
+
+		if(snprintf(path, PATH_MAX, "%s/%s", procdir, dirent->d_name) >=
+				PATH_MAX)
+		{
+			err("snprintf: path too large: %s\n", procdir);
+			abort();
+		}
+
+		if(proc->nthreads >= OVNI_MAX_THR)
+		{
+			err("too many thread streams for process %d\n", pid);
+			abort();
+		}
+
+		thread = &proc->thread[proc->nthreads];
+
+		if(load_thread(thread, proc, proc->nthreads, tid, path) != 0)
+			return -1;
+
+		proc->nthreads++;
+	}
+
+	closedir(dir);
+
+
+
+	return 0;
+}
+
+static int
+load_loom(struct ovni_loom *loom, int loomid, char *loomdir)
+{
+	int pid;
+	char path[PATH_MAX];
+	DIR *dir;
+	struct dirent *dirent;
+	struct ovni_eproc *proc;
+
+	if((dir = opendir(loomdir)) == NULL)
+	{
+		fprintf(stderr, "opendir %s failed: %s\n",
+				loomdir, strerror(errno));
+		return -1;
+	}
+
+	while((dirent = readdir(dir)) != NULL)
+	{
+		if(find_dir_prefix_int(dirent, "proc", &pid) != 0)
+			continue;
+
+		sprintf(path, "%s/%s", loomdir, dirent->d_name);
+
+		if(loom->nprocs >= OVNI_MAX_PROC)
+		{
+			err("too many process streams for loom %d\n",
+					loomid);
+			abort();
+		}
+
+		proc = &loom->proc[loom->nprocs];
+
+		if(load_proc(proc, loom, loom->nprocs, pid, path) != 0)
+			return -1;
+
+		loom->nprocs++;
+	}
+
+	closedir(dir);
+
+	return 0;
+}
+
+static int
+compare_alph(const void* a, const void* b)
+{
+	return strcmp(*(const char**)a, *(const char**)b);
+}
+
+int
+ovni_load_trace(struct ovni_trace *trace, char *tracedir)
+{
+	char *looms[OVNI_MAX_LOOM];
+	char *hosts[OVNI_MAX_LOOM];
+	const char *loom_name;
+	DIR *dir;
+	struct dirent *dirent;
+	size_t l;
+
+	trace->nlooms = 0;
+
+	if((dir = opendir(tracedir)) == NULL)
+	{
+		fprintf(stderr, "opendir %s failed: %s\n",
+				tracedir, strerror(errno));
+		return -1;
+	}
+
+	for(l=0; l<OVNI_MAX_LOOM; l++)
+	{
+		looms[l] = malloc(PATH_MAX);
+		hosts[l] = malloc(PATH_MAX);
+	}
+
+	while((dirent = readdir(dir)) != NULL)
+	{
+		if(find_dir_prefix_str(dirent, "loom", &loom_name) != 0)
+		{
+			/* Ignore other files in tracedir */
+			continue;
+		}
+
+		if(trace->nlooms >= OVNI_MAX_LOOM)
+		{
+			err("too many looms for trace %s\n",
+					tracedir);
+			abort();
+		}
+
+		sprintf(hosts[trace->nlooms], "%s", loom_name);
+
+		sprintf(looms[trace->nlooms], "%s/%s", tracedir, dirent->d_name);
+
+		trace->nlooms++;
+	}
+
+	qsort((const char **) hosts, trace->nlooms, sizeof(const char*), compare_alph);
+	qsort((const char **) looms, trace->nlooms, sizeof(const char*), compare_alph);
+
+	for(l=0; l<trace->nlooms; l++)
+	{
+		if(strlen(hosts[l]) >= PATH_MAX)
+		{
+			err("error hostname too long: %s\n", hosts[l]);
+			exit(EXIT_FAILURE);
+		}
+
+		/* Safe */
+		strcpy(trace->loom[l].hostname, hosts[l]);
+
+		if(load_loom(&trace->loom[l], l, looms[l]) != 0)
+			return -1;
+	}
+
+	closedir(dir);
+
+	for(l=0; l<OVNI_MAX_LOOM; l++)
+	{
+		free(looms[l]);
+		free(hosts[l]);
+	}
+
+	return 0;
+}
+
+static int
+load_stream_buf(struct ovni_stream *stream, struct ovni_ethread *thread)
+{
+	struct stat st;
+
+	if(fstat(thread->stream_fd, &st) < 0)
+	{
+		perror("fstat");
+		return -1;
+	}
+
+	if(st.st_size == 0)
+	{
+		err("warning: stream %d is empty\n", stream->tid);
+		stream->size = 0;
+		stream->buf = NULL;
+		stream->active = 0;
+
+		return 0;
+	}
+
+	stream->size = st.st_size;
+	stream->buf = mmap(NULL, stream->size, PROT_READ, MAP_SHARED,
+			thread->stream_fd, 0);
+
+	if(stream->buf == MAP_FAILED)
+	{
+		perror("mmap");
+		return -1;
+	}
+
+	stream->active = 1;
+
+	return 0;
+}
+
+/* Populates the streams in a single array */
+int
+ovni_load_streams(struct ovni_trace *trace)
+{
+	size_t i, j, k, s;
+	struct ovni_loom *loom;
+	struct ovni_eproc *proc;
+	struct ovni_ethread *thread;
+	struct ovni_stream *stream;
+
+	trace->nstreams = 0;
+
+	for(i=0; i<trace->nlooms; i++)
+	{
+		loom = &trace->loom[i];
+		for(j=0; j<loom->nprocs; j++)
+		{
+			proc = &loom->proc[j];
+			for(k=0; k<proc->nthreads; k++)
+			{
+				trace->nstreams++;
+			}
+		}
+	}
+
+	trace->stream = calloc(trace->nstreams, sizeof(struct ovni_stream));
+
+	if(trace->stream == NULL)
+	{
+		perror("calloc");
+		return -1;
+	}
+
+	err("loaded %ld streams\n", trace->nstreams);
+
+	for(s=0, i=0; i<trace->nlooms; i++)
+	{
+		loom = &trace->loom[i];
+		for(j=0; j<loom->nprocs; j++)
+		{
+			proc = &loom->proc[j];
+			for(k=0; k<proc->nthreads; k++)
+			{
+				thread = &proc->thread[k];
+				stream = &trace->stream[s++];
+
+				stream->tid = thread->tid;
+				stream->thread = k;
+				stream->proc = j;
+				stream->loom = i;
+				stream->lastclock = 0;
+				stream->offset = 0;
+				stream->cur_ev = NULL;
+
+				if(load_stream_buf(stream, thread) != 0)
+				{
+					err("load_stream_buf failed\n");
+					return -1;
+				}
+
+			}
+		}
+	}
+
+	return 0;
+}
+
+void
+ovni_free_streams(struct ovni_trace *trace)
+{
+	free(trace->stream);
+}
+
+int
+ovni_load_next_event(struct ovni_stream *stream)
+{
+	size_t size;
+
+	if(stream->active == 0)
+	{
+		dbg("stream is inactive, cannot load more events\n");
+		return -1;
+	}
+
+	if(stream->cur_ev == NULL)
+	{
+		stream->cur_ev = (struct ovni_ev *) stream->buf;
+		stream->offset = 0;
+		size = 0;
+		goto out;
+	}
+
+	//printf("advancing offset %ld bytes\n", ovni_ev_size(stream->cur_ev));
+	size = ovni_ev_size(stream->cur_ev);
+	stream->offset += size;
+
+	/* We have reached the end */
+	if(stream->offset == stream->size)
+	{
+		stream->active = 0;
+		dbg("stream %d runs out of events\n", stream->tid);
+		return -1;
+	}
+
+	/* It cannot overflow, otherwise we are reading garbage */
+	assert(stream->offset < stream->size);
+
+	stream->cur_ev = (struct ovni_ev *) &stream->buf[stream->offset];
+
+out:
+
+	//dbg("---------\n");
+	//dbg("ev size = %d\n", ovni_ev_size(stream->cur_ev));
+	//dbg("ev flags = %02x\n", stream->cur_ev->header.flags);
+	//dbg("loaded next event:\n");
+	//hexdump((uint8_t *) stream->cur_ev, ovni_ev_size(stream->cur_ev));
+	//dbg("---------\n");
+
+	return (int) size;
+}
diff --git a/ovni_trace.h b/trace.h
similarity index 100%
rename from ovni_trace.h
rename to trace.h