From 71444c467e00f96d6b0efaa0eeaaefc4bde615de Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 13 May 2011 07:16:01 -0400
Subject: [PATCH] move clock id test TSDL to development subdir

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 .../ctf-test/development/ctf-embedded-1.txt   | 84 +++++++++++++++++++
 .../ctf-test/succeed/ctf-embedded-1.txt       | 49 -----------
 2 files changed, 84 insertions(+), 49 deletions(-)
 create mode 100644 formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt

diff --git a/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt b/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt
new file mode 100644
index 00000000..27af7233
--- /dev/null
+++ b/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt
@@ -0,0 +1,84 @@
+trace {
+	major = 0;
+	minor = 1;
+	uuid = "f816d884-6cea-11e0-ac7a-8f5f4e9f7724";
+	byte_order = be;	/* Assuming big endian streams */
+};
+
+/* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */
+
+typealias integer { size = 32; align = 32; signed = false; } := uint32_t;
+typealias integer { size = 64; align = 64; signed = false; } := uint64_t;
+typealias integer { size = 32; align = 32; signed = false; } := void *;
+
+stream {
+	event.header := struct {
+		uint32_t id;
+		uint64_t timestamp;
+	};
+	event.context := struct {	/*
+		uint32_t thread_id;	 * This context belongs to all
+		void *func_called;	 * events in this stream.
+		void *called_from;	 */
+		uint32_t event_count;	/* for debug */
+	};			
+};
+
+/*
+ * All events have empty context/fields, because their field layout is
+ * replicated for all events of the stream (in this particular trace
+ * layout). See ctf-embedded-2.txt for a more compact layout.
+ */
+
+event { name = invalid; id = 0; };
+event { name = func_enter; id = 1; };
+event { name = func_exit; id = 2; };
+
+event {
+	name = timer_tick;	/* or sync_point... */
+	id = 3;
+	fields := {
+		uint64_t monotonic_value;
+		uint64_t tsc_value;
+		uint32_t seqnum;
+	};
+};
+
+event {
+	name = freq_change;
+	id = 4;
+	fields := {
+		uint64_t new_freq;
+	};
+}
+
+clock {
+	name = monotonic;
+	uuid = ;
+};
+
+clock {
+	name = seqnum;
+	uuid = ;
+};
+
+clock {
+	name = tsc;
+	sync_points = {
+		map {
+			parent.clock = monotonic;
+			parent.value = event.timer_tick.monotonic_value;
+			value = event.timer_tick.tsc_value;
+		};
+		map {
+			parent.clock = seqnum;
+			parent.value = event.timer_tick.seqnum;
+			value = event.timer_tick.tsc_value;
+		};
+	};
+
+	freq = {
+		update = event.freq_change.new_freq;
+	};
+	uuid = ;
+};
diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt
index 27af7233..4a97cdf7 100644
--- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt
+++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt
@@ -33,52 +33,3 @@ stream {
 event { name = invalid; id = 0; };
 event { name = func_enter; id = 1; };
 event { name = func_exit; id = 2; };
-
-event {
-	name = timer_tick;	/* or sync_point... */
-	id = 3;
-	fields := {
-		uint64_t monotonic_value;
-		uint64_t tsc_value;
-		uint32_t seqnum;
-	};
-};
-
-event {
-	name = freq_change;
-	id = 4;
-	fields := {
-		uint64_t new_freq;
-	};
-}
-
-clock {
-	name = monotonic;
-	uuid = ;
-};
-
-clock {
-	name = seqnum;
-	uuid = ;
-};
-
-clock {
-	name = tsc;
-	sync_points = {
-		map {
-			parent.clock = monotonic;
-			parent.value = event.timer_tick.monotonic_value;
-			value = event.timer_tick.tsc_value;
-		};
-		map {
-			parent.clock = seqnum;
-			parent.value = event.timer_tick.seqnum;
-			value = event.timer_tick.tsc_value;
-		};
-	};
-
-	freq = {
-		update = event.freq_change.new_freq;
-	};
-	uuid = ;
-};
-- 
2.34.1