More efficient enum representation.

[apitrace] / trace_write.cpp

diff --git a/trace_write.cpp b/trace_write.cpp
index 3860e319e6de795aeebe63f7ca7ce1db3df9ed20..cdc3892a9ad4baa0cecd552d7c547198e5451c79 100644 (file)
--- a/trace_write.cpp
+++ b/trace_write.cpp
@@ -171,6 +171,7 @@ void Close(void) {
 static unsigned call_no = 0;
 
 static std::map<Id, bool> functions;
+static std::map<Id, bool> enums;
 static std::map<Id, bool> bitmasks;
 
 
@@ -231,14 +232,6 @@ void BeginMember(const char *name) {
    WriteName(name);
 }
 
-void BeginBitmask(void) {
-   WriteByte(Trace::TYPE_BITMASK);
-}
-
-void EndBitmask(void) {
-   WriteByte(Trace::TYPE_NULL);
-}
-
 void LiteralBool(bool value) {
    WriteByte(value ? Trace::TYPE_TRUE : Trace::TYPE_FALSE);
 }
@@ -308,10 +301,14 @@ void LiteralBlob(const void *data, size_t size) {
    }
 }
 
-void LiteralNamedConstant(const char *name, long long value) {
-   WriteByte(Trace::TYPE_CONST);
-   WriteName(name);
-   LiteralSInt(value);
+void LiteralEnum(const EnumSig *sig) {
+   WriteByte(Trace::TYPE_ENUM);
+   WriteUInt(sig->id);
+   if (!enums[sig->id]) {
+      WriteString(sig->name);
+      LiteralSInt(sig->value);
+      enums[sig->id] = true;
+   }
 }
 
 void LiteralBitmask(const BitmaskSig &bitmask, unsigned long long value) {