Merge branch 'master' into d2d

[apitrace] / common / trace_model.hpp

diff --git a/common/trace_model.hpp b/common/trace_model.hpp
index 4f150bc925caec0162dd21b6e07a28c664049ed4..7973026cd9b07884af719feefd3b7ed72ed1a2cc 100644 (file)
--- a/common/trace_model.hpp
+++ b/common/trace_model.hpp
@@ -406,18 +406,25 @@ enum {
 };
 
 
+struct Arg
+{
+    Value *value;
+};
+
 
 class Call
 {
 public:
+    unsigned thread_id;
     unsigned no;
     const FunctionSig *sig;
-    std::vector<Value *> args;
+    std::vector<Arg> args;
     Value *ret;
 
     CallFlags flags;
 
-    Call(FunctionSig *_sig, const CallFlags &_flags) :
+    Call(FunctionSig *_sig, const CallFlags &_flags, unsigned _thread_id) :
+        thread_id(_thread_id), 
         sig(_sig), 
         args(_sig->num_args), 
         ret(0),
@@ -432,7 +439,7 @@ public:
 
     inline Value & arg(unsigned index) {
         assert(index < args.size());
-        return *(args[index]);
+        return *(args[index].value);
     }
 };