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 4e0f360a9716ad95c41163ac35aecb8bfc208f19..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"
 
 
@@ -39,7 +40,7 @@ int verbosity = 0;
 static bool call_dumped = false;
 
 
-static void dumpCall(Trace::Call &call) {
+static void dumpCall(trace::Call &call) {
     if (verbosity >= 0 && !call_dumped) {
         std::cout << call;
         std::cout.flush();
@@ -48,7 +49,7 @@ static void dumpCall(Trace::Call &call) {
 }
 
 
-std::ostream &warning(Trace::Call &call) {
+std::ostream &warning(trace::Call &call) {
     dumpCall(call);
 
     std::cerr << call.no << ": ";
@@ -58,12 +59,12 @@ std::ostream &warning(Trace::Call &call) {
 }
 
 
-void ignore(Trace::Call &call) {
+void ignore(trace::Call &call) {
     (void)call;
 }
 
-void unknown(Trace::Call &call) {
-    warning(call) << "unknown call " << call.name() << "\n";
+void unsupported(trace::Call &call) {
+    warning(call) << "unsupported " << call.name() << " call\n";
 }
 
 inline void Retracer::addCallback(const Entry *entry) {
@@ -80,16 +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) {
-        dumpCall(call);
+        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;
@@ -100,7 +104,7 @@ void Retracer::retrace(Trace::Call &call) {
     if (!callback) {
         Map::const_iterator it = map.find(call.name());
         if (it == map.end()) {
-            callback = &unknown;
+            callback = &unsupported;
         } else {
             callback = it->second;
         }