Merge branch 'master' into d3dretrace

[apitrace] / retrace.cpp

diff --git a/retrace.cpp b/retrace.cpp
index 412c73b8061e6ecd975ecc32581250dcb7fe8440..1630995cdb440551232c6bdfcd214ea1f61f2abe 100644 (file)
--- a/retrace.cpp
+++ b/retrace.cpp
@@ -27,13 +27,19 @@
 #include <string.h>
 #include <iostream>
 
+#include "os_time.hpp"
+#include "trace_dump.hpp"
 #include "retrace.hpp"
 
 
 namespace retrace {
 
 
+trace::Parser parser;
+
+
 int verbosity = 0;
+bool profiling = false;
 
 
 static bool call_dumped = false;
@@ -84,7 +90,10 @@ void Retracer::retrace(trace::Call &call) {
     call_dumped = false;
 
     if (verbosity >= 1) {
-        dumpCall(call);
+        if (verbosity >= 2 ||
+            !(call.flags & trace::CALL_FLAG_VERBOSE)) {
+            dumpCall(call);
+        }
     }
 
     Callback callback = 0;
@@ -110,7 +119,20 @@ void Retracer::retrace(trace::Call &call) {
     assert(callback);
     assert(callbacks[id] == callback);
 
-    callback(call);
+    if (retrace::profiling) {
+        long long startTime = os::getTime();
+        callback(call);
+        long long stopTime = os::getTime();
+        float timeInterval = (stopTime - startTime) * (1.0E6 / os::timeFrequency);
+
+        std::cout
+            << call.no << " "
+            << "[" << timeInterval << " usec] "
+        ;
+        trace::dump(call, std::cout, trace::DUMP_FLAG_NO_CALL_NO | trace::DUMP_FLAG_NO_COLOR);
+    } else {
+        callback(call);
+    }
 }