Avoid pointless data structure copying.

[apitrace] / trace_model.hpp

diff --git a/trace_model.hpp b/trace_model.hpp
index e7a2249c7c979833fbd8e7519ef3f18a5a9c22c0..ddbcabd2993e357687588f7d3c0c549b609e715a 100644 (file)
--- a/trace_model.hpp
+++ b/trace_model.hpp
@@ -33,9 +33,7 @@
 
 #include <assert.h>
 
-#include <string>
 #include <map>
-#include <list>
 #include <vector>
 #include <iostream>
 
@@ -43,9 +41,46 @@
 namespace Trace {
 
 
+typedef unsigned Id;
+
+
+struct FunctionSig {
+    Id id;
+    const char *name;
+    unsigned num_args;
+    const char **arg_names;
+};
+
+
+struct StructSig {
+    Id id;
+    const char *name;
+    unsigned num_members;
+    const char **member_names;
+};
+
+
+struct EnumSig {
+    Id id;
+    const char *name;
+    signed long long value;
+};
+
+
+struct BitmaskFlag {
+    const char *name;
+    unsigned long long value;
+};
+
+
+struct BitmaskSig {
+    Id id;
+    unsigned num_flags;
+    const BitmaskFlag *flags;
+};
+
+
 class Visitor;
-class Dumper;
-class UInt;
 
 
 class Value
@@ -150,34 +185,20 @@ public:
 class String : public Value
 {
 public:
-    String(std::string _value) : value(_value) {}
+    String(const char * _value) : value(_value) {}
 
     bool toBool(void) const;
     const char *toString(void) const;
     void visit(Visitor &visitor);
 
-    std::string value;
+    const char * value;
 };
 
 
 class Enum : public Value
 {
 public:
-    struct Signature : public std::pair<std::string, Value *>
-    {
-        Signature()
-            : std::pair<std::string, Value *>()
-        {}
-        Signature(const std::string &n, Trace::Value *val)
-            : std::pair<std::string, Value *>(n, val)
-        {}
-        ~Signature()
-        {
-            delete second;
-        }
-    };
-
-    Enum(const Signature *_sig) : sig(_sig) {}
+    Enum(const EnumSig *_sig) : sig(_sig) {}
 
     bool toBool(void) const;
     signed long long toSInt(void) const;
@@ -186,39 +207,31 @@ public:
     virtual double toDouble(void) const;
     void visit(Visitor &visitor);
 
-    const Signature *sig;
+    const EnumSig *sig;
 };
 
 
 class Bitmask : public UInt
 {
 public:
-    typedef std::pair<std::string, unsigned long long> Pair;
-    typedef std::vector<Pair> Signature;
-
-    Bitmask(const Signature *_sig, unsigned long long _value) : UInt(_value), sig(_sig) {}
+    Bitmask(const BitmaskSig *_sig, unsigned long long _value) : UInt(_value), sig(_sig) {}
 
     void visit(Visitor &visitor);
 
-    const Signature *sig;
+    const BitmaskSig *sig;
 };
 
 
 class Struct : public Value
 {
 public:
-    struct Signature {
-        std::string name;
-        std::vector<std::string> member_names;
-    };
-
-    Struct(Signature *_sig) : sig(_sig), members(_sig->member_names.size()) { }
+    Struct(StructSig *_sig) : sig(_sig), members(_sig->num_members) { }
     ~Struct();
 
     bool toBool(void) const;
     void visit(Visitor &visitor);
 
-    const Signature *sig;
+    const StructSig *sig;
     std::vector<Value *> members;
 };
 
@@ -298,20 +311,15 @@ std::ostream & operator <<(std::ostream &os, Value *value);
 class Call
 {
 public:
-    struct Signature {
-        std::string name;
-        std::vector<std::string> arg_names;
-    };
-
     unsigned no;
-    const Signature *sig;
+    const FunctionSig *sig;
     std::vector<Value *> args;
     Value *ret;
 
-    Call(Signature *_sig) : sig(_sig), args(_sig->arg_names.size()), ret(0) { }
+    Call(FunctionSig *_sig) : sig(_sig), args(_sig->num_args), ret(0) { }
     ~Call();
 
-    inline const std::string & name(void) const {
+    inline const char * name(void) const {
         return sig->name;
     }