X-Git-Url: http://git.efficios.com/?p=ctf.git;a=blobdiff_plain;f=common-trace-format-proposal.txt;h=e8ee258137ce7e0b97fc58529736570dc2964b20;hp=238fbadfead6c69709bcffad007f8478d558dd67;hb=3fde5da106cc1adbb564ceaf283701d796355ede;hpb=2e7d7fcb288895571a682e1ae3344d15578b1f55

diff --git a/common-trace-format-proposal.txt b/common-trace-format-proposal.txt
index 238fbad..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
@@ -886,13 +886,16 @@ beginning of the file. This magic number is also used to detect the
 endianness of the architecture by trying to read the CTF magic number
 and its counterpart in reversed endianness. The events within the
 meta-data stream have no event header nor event context. Each event only
-contains a "string" payload. Each meta-data packet start with a special
-packet header, specific to the meta-data stream, which contains,
-exactly:
+contains a "sequence" payload, which is a sequence of bits using the
+"trace.packet.header.content_size" field as a placeholder for its
+length. The formatting of this sequence of bits is a plain-text
+representation of the TSDL description. Each meta-data packet start with
+a special packet header, specific to the meta-data stream, which
+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 */
@@ -1007,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;
   };
 };
@@ -1451,7 +1454,7 @@ struct-or-variant-declaration-list:
 
 struct-or-variant-declaration:
 	specifier-qualifier-list struct-or-variant-declarator-list ;
-	declaration-specifiers storage-class-specifier declaration-specifiers declarator-list ;
+	declaration-specifiers-opt storage-class-specifier declaration-specifiers-opt declarator-list ;
 	typealias declaration-specifiers abstract-declarator-list := declaration-specifiers abstract-declarator-list ;
 	typealias declaration-specifiers abstract-declarator-list := declarator-list ;
 
@@ -1542,6 +1545,6 @@ ctf-assignment-expression-list:
 ctf-assignment-expression:
 	unary-expression assignment-operator unary-expression
 	unary-expression type-assignment-operator type-specifier
-	declaration-specifiers storage-class-specifier declaration-specifiers declarator-list
+	declaration-specifiers-opt storage-class-specifier declaration-specifiers-opt declarator-list
 	typealias declaration-specifiers abstract-declarator-list := declaration-specifiers abstract-declarator-list
 	typealias declaration-specifiers abstract-declarator-list := declarator-list