Move trace dumping to a separate module. Add option to not dump arg names.

[apitrace] / retrace.cpp

diff --git a/retrace.cpp b/retrace.cpp
index ecdef5b48f8d93eb6ec7945442f92578efaa0c6b..849c597f10cafaf64ef12b6d19a9266eab7b393b 100644 (file)
--- a/retrace.cpp
+++ b/retrace.cpp
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <iostream>
 
+#include "trace_dump.hpp"
 #include "retrace.hpp"
 
 
@@ -36,14 +37,34 @@ namespace retrace {
 int verbosity = 0;
 
 
-void ignore(Trace::Call &call) {
+static bool call_dumped = false;
+
+
+static void dumpCall(trace::Call &call) {
+    if (verbosity >= 0 && !call_dumped) {
+        std::cout << call;
+        std::cout.flush();
+        call_dumped = true;
+    }
+}
+
+
+std::ostream &warning(trace::Call &call) {
+    dumpCall(call);
+
+    std::cerr << call.no << ": ";
+    std::cerr << "warning: ";
+
+    return std::cerr;
+}
+
+
+void ignore(trace::Call &call) {
     (void)call;
 }
 
-void retrace_unknown(Trace::Call &call) {
-    if (verbosity >= 0) {
-        std::cerr << call.no << ": warning: unknown call " << call.name() << "\n";
-    }
+void unsupported(trace::Call &call) {
+    warning(call) << "unsupported " << call.name() << " call\n";
 }
 
 inline void Retracer::addCallback(const Entry *entry) {
@@ -60,10 +81,19 @@ void Retracer::addCallbacks(const Entry *entries) {
 }
 
 
-void Retracer::retrace(Trace::Call &call) {
+void Retracer::retrace(trace::Call &call) {
+    call_dumped = false;
+
+    if (verbosity >= 1) {
+        if (verbosity >= 2 ||
+            !(call.flags & trace::CALL_FLAG_VERBOSE)) {
+            dumpCall(call);
+        }
+    }
+
     Callback callback = 0;
 
-    Trace::Id id = call.sig->id;
+    trace::Id id = call.sig->id;
     if (id >= callbacks.size()) {
         callbacks.resize(id + 1);
         callback = 0;
@@ -74,7 +104,7 @@ void Retracer::retrace(Trace::Call &call) {
     if (!callback) {
         Map::const_iterator it = map.find(call.name());
         if (it == map.end()) {
-            callback = &retrace_unknown;
+            callback = &unsupported;
         } else {
             callback = it->second;
         }