Avoid pointless data structure copying.

[apitrace] / trace_model.hpp

diff --git a/trace_model.hpp b/trace_model.hpp
index d5b9950b33aed29f723f602155cfa293fba9a279..ddbcabd2993e357687588f7d3c0c549b609e715a 100644 (file)
--- a/trace_model.hpp
+++ b/trace_model.hpp
@@ -31,11 +31,9 @@
 #define _TRACE_MODEL_HPP_
 
 
-#include <cassert>
+#include <assert.h>
 
-#include <string>
 #include <map>
-#include <list>
 #include <vector>
 #include <iostream>
 
@@ -43,61 +41,63 @@
 namespace Trace {
 
 
-class Visitor;
-class Dumper;
-class UInt;
+typedef unsigned Id;
 
 
-class Value
-{
-public:
-    virtual ~Value() {}
-    virtual void visit(Visitor &visitor) = 0;
+struct FunctionSig {
+    Id id;
+    const char *name;
+    unsigned num_args;
+    const char **arg_names;
+};
 
-    virtual operator bool (void) const = 0;
-    virtual operator signed long long (void) const;
-    virtual operator unsigned long long (void) const;
-    virtual operator double (void) const;
 
-    virtual void *toPointer(void) const;
-    virtual unsigned long long toUIntPtr(void) const;
-    virtual const char *toString(void) const;
+struct StructSig {
+    Id id;
+    const char *name;
+    unsigned num_members;
+    const char **member_names;
+};
 
-    inline operator signed char (void) const { 
-        return static_cast<signed long long>(*this);
-    }
 
-    inline operator unsigned char (void) const { 
-        return static_cast<signed long long>(*this);
-    }
+struct EnumSig {
+    Id id;
+    const char *name;
+    signed long long value;
+};
 
-    inline operator signed short (void) const { 
-        return static_cast<signed long long>(*this);
-    }
 
-    inline operator unsigned short (void) const { 
-        return static_cast<unsigned long long>(*this);
-    }
+struct BitmaskFlag {
+    const char *name;
+    unsigned long long value;
+};
 
-    inline operator signed (void) const { 
-        return static_cast<signed long long>(*this);
-    }
 
-    inline operator unsigned (void) const { 
-        return static_cast<unsigned long long>(*this);
-    }
+struct BitmaskSig {
+    Id id;
+    unsigned num_flags;
+    const BitmaskFlag *flags;
+};
 
-    inline operator signed long (void) const { 
-        return static_cast<signed long long>(*this);
-    }
 
-    inline operator unsigned long (void) const { 
-        return static_cast<unsigned long long>(*this);
-    }
+class Visitor;
 
-    inline operator float (void) const { 
-        return static_cast<double>(*this);
-    }
+
+class Value
+{
+public:
+    virtual ~Value() {}
+    virtual void visit(Visitor &visitor) = 0;
+
+    virtual bool toBool(void) const = 0;
+    virtual signed long long toSInt(void) const;
+    virtual unsigned long long toUInt(void) const;
+    virtual float toFloat(void) const;
+    virtual double toDouble(void) const;
+
+    virtual void *toPointer(void) const;
+    virtual unsigned long long toUIntPtr(void) const;
+    virtual const char *toString(void) const;
 
     const Value & operator[](size_t index) const;
 };
@@ -106,10 +106,11 @@ public:
 class Null : public Value
 {
 public:
-    operator bool (void) const;
-    operator signed long long (void) const;
-    operator unsigned long long (void) const;
-    operator double (void) const;
+    bool toBool(void) const;
+    signed long long toSInt(void) const;
+    unsigned long long toUInt(void) const;
+    virtual float toFloat(void) const;
+    virtual double toDouble(void) const;
     void *toPointer(void) const;
     unsigned long long toUIntPtr(void) const;
     const char *toString(void) const;
@@ -122,10 +123,11 @@ class Bool : public Value
 public:
     Bool(bool _value) : value(_value) {}
 
-    operator bool (void) const;
-    operator signed long long (void) const;
-    operator unsigned long long (void) const;
-    operator double (void) const;
+    bool toBool(void) const;
+    signed long long toSInt(void) const;
+    unsigned long long toUInt(void) const;
+    virtual float toFloat(void) const;
+    virtual double toDouble(void) const;
     void visit(Visitor &visitor);
 
     bool value;
@@ -137,10 +139,11 @@ class SInt : public Value
 public:
     SInt(signed long long _value) : value(_value) {}
 
-    operator bool (void) const;
-    operator signed long long (void) const;
-    operator unsigned long long (void) const;
-    operator double (void) const;
+    bool toBool(void) const;
+    signed long long toSInt(void) const;
+    unsigned long long toUInt(void) const;
+    virtual float toFloat(void) const;
+    virtual double toDouble(void) const;
     void visit(Visitor &visitor);
 
     signed long long value;
@@ -152,10 +155,11 @@ class UInt : public Value
 public:
     UInt(unsigned long long _value) : value(_value) {}
 
-    operator bool (void) const;
-    operator signed long long (void) const;
-    operator unsigned long long (void) const;
-    operator double (void) const;
+    bool toBool(void) const;
+    signed long long toSInt(void) const;
+    unsigned long long toUInt(void) const;
+    virtual float toFloat(void) const;
+    virtual double toDouble(void) const;
     void visit(Visitor &visitor);
 
     unsigned long long value;
@@ -167,10 +171,11 @@ class Float : public Value
 public:
     Float(double _value) : value(_value) {}
 
-    operator bool (void) const;
-    operator signed long long (void) const;
-    operator unsigned long long (void) const;
-    operator double (void) const;
+    bool toBool(void) const;
+    signed long long toSInt(void) const;
+    unsigned long long toUInt(void) const;
+    virtual float toFloat(void) const;
+    virtual double toDouble(void) const;
     void visit(Visitor &visitor);
 
     double value;
@@ -180,74 +185,53 @@ public:
 class String : public Value
 {
 public:
-    String(std::string _value) : value(_value) {}
+    String(const char * _value) : value(_value) {}
 
-    operator bool (void) const;
+    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) {}
 
-    operator bool (void) const;
-    operator signed long long (void) const;
-    operator unsigned long long (void) const;
-    operator double (void) const;
+    bool toBool(void) const;
+    signed long long toSInt(void) const;
+    unsigned long long toUInt(void) const;
+    virtual float toFloat(void) const;
+    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();
 
-    operator bool (void) const;
+    bool toBool(void) const;
     void visit(Visitor &visitor);
 
-    const Signature *sig;
+    const StructSig *sig;
     std::vector<Value *> members;
 };
 
@@ -258,7 +242,7 @@ public:
     Array(size_t len) : values(len) {}
     ~Array();
 
-    operator bool (void) const;
+    bool toBool(void) const;
     void visit(Visitor &visitor);
 
     std::vector<Value *> values;
@@ -275,7 +259,7 @@ public:
 
     ~Blob();
 
-    operator bool (void) const;
+    bool toBool(void) const;
     void *toPointer(void) const;
     void visit(Visitor &visitor);
 
@@ -289,7 +273,7 @@ class Pointer : public UInt
 public:
     Pointer(unsigned long long value) : UInt(value) {}
 
-    operator bool (void) const;
+    bool toBool(void) const;
     void *toPointer(void) const;
     unsigned long long toUIntPtr(void) const;
     void visit(Visitor &visitor);
@@ -324,32 +308,23 @@ protected:
 std::ostream & operator <<(std::ostream &os, Value *value);
 
 
-signed long long asSInt(const Value &node);
-unsigned long long asUInt(const Value &node);
-double asFloat(const Value &node);
-
-
 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;
     }
 
     inline Value & arg(unsigned index) {
+        assert(index < args.size());
         return *(args[index]);
     }
 };