X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace_format.hpp;h=3a3787b5b292eed2fe389ef4217e562077be01a3;hb=83387fb4565289a00fa4b1cf0768bbc1c7918f34;hp=fe37a801938f066a16e24ddc06a5b2703ed6aa7a;hpb=7e329020a9dc8e0201f3ebe256b5ddbacd57dcc3;p=apitrace

diff --git a/trace_format.hpp b/trace_format.hpp
index fe37a80..3a3787b 100644
--- a/trace_format.hpp
+++ b/trace_format.hpp
@@ -23,38 +23,50 @@
  *
  **************************************************************************/
 
+/*
+ * Binary trace format decription.
+ */
+
 #ifndef _TRACE_FORMAT_HPP_
 #define _TRACE_FORMAT_HPP_
 
 namespace Trace {
 
-#define TRACE_VERSION 0
+#define TRACE_VERSION 1
+
+enum Event {
+    EVENT_ENTER = 0,
+    EVENT_LEAVE,
+    EVENT_MESSAGE
+};
 
 enum CallDetail {
-   CALL_END = 0,
-   CALL_ARG,
-   CALL_RET,
-   CALL_THREAD,
+    CALL_END = 0,
+    CALL_ARG,
+    CALL_RET,
+    CALL_THREAD,
 };
 
 enum Type {
-   TYPE_VOID = 0,
-   TYPE_BOOL,
-   TYPE_SINT,
-   TYPE_UINT,
-   TYPE_FLOAT,
-   TYPE_DOUBLE,
-   TYPE_STRING, // Null terminated, human readible string
-   TYPE_BLOB, // Block of bytes
-   TYPE_CONST,
-   TYPE_BITMASK,
-   TYPE_ARRAY,
-   TYPE_STRUCT,
-   TYPE_POINTER,
-   TYPE_OPAQUE,
+    TYPE_NULL = 0,
+    TYPE_FALSE,
+    TYPE_TRUE,
+    TYPE_SINT,
+    TYPE_UINT,
+    TYPE_FLOAT,
+    TYPE_DOUBLE,
+    TYPE_STRING, // Null terminated, human readible string
+    TYPE_BLOB, // Block of bytes
+    TYPE_ENUM,
+    TYPE_BITMASK,
+    TYPE_ARRAY,
+    TYPE_STRUCT,
+    TYPE_OPAQUE,
 };
 
 /*
+ * XXX: Update grammar.
+ *
  * trace = call* EOF
  *
  * call = name (detail)* END