From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 17 May 2011 12:03:06 +0000 (-0400)
Subject: trace_uuid -> uuid
X-Git-Tag: v1.8~36
X-Git-Url: http://git.efficios.com/?p=ctf.git;a=commitdiff_plain;h=3fde5da106cc1adbb564ceaf283701d796355ede;hp=eacb16d1f3e474265853018832ae358d74e5bb40

trace_uuid -> uuid

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/common-trace-format-proposal.txt b/common-trace-format-proposal.txt
index cb8ee16..e8ee258 100644
--- a/common-trace-format-proposal.txt
+++ b/common-trace-format-proposal.txt
@@ -649,7 +649,7 @@ the fields typically expected (although these fields are each optional):
 
 struct event_packet_header {
   uint32_t magic;
-  uint8_t  trace_uuid[16];
+  uint8_t  uuid[16];
   uint32_t stream_id;
 };
 
@@ -661,8 +661,8 @@ trace {
 If the magic number is not present, tools such as "file" will have no
 mean to discover the file type.
 
-If the trace_uuid is not present, no validation that the meta-data
-actually corresponds to the stream is performed.
+If the uuid is not present, no validation that the meta-data actually
+corresponds to the stream is performed.
 
 If the stream_id packet header field is missing, the trace can only
 contain a single stream. Its "id" field can be left out, and its events
@@ -895,7 +895,7 @@ contains, exactly:
 
 struct metadata_packet_header {
   uint32_t magic;			/* 0x75D11D57 */
-  uint8_t  trace_uuid[16];		/* Unique Universal Identifier */
+  uint8_t  uuid[16];			/* Unique Universal Identifier */
   uint32_t checksum;			/* 0 if unused */
   uint32_t content_size;		/* in bits */
   uint32_t packet_size;			/* in bits */
@@ -1010,7 +1010,7 @@ trace {
   byte_order = be OR le;			/* Endianness (required) */
   packet.header := struct {
     uint32_t magic;
-    uint8_t  trace_uuid[16];
+    uint8_t  uuid[16];
     uint32_t stream_id;
   };
 };