Fix a crash when loading multiple frames at once.

[apitrace] / retrace.cpp

diff --git a/retrace.cpp b/retrace.cpp
index ef236f45ef79a7f3043ea897ad31bc70f07dbf2e..ecdef5b48f8d93eb6ec7945442f92578efaa0c6b 100644 (file)
--- a/retrace.cpp
+++ b/retrace.cpp
@@ -24,6 +24,7 @@
  **************************************************************************/
 
 
+#include <string.h>
 #include <iostream>
 
 #include "retrace.hpp"
@@ -35,11 +36,56 @@ namespace retrace {
 int verbosity = 0;
 
 
+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";
     }
 }
 
+inline void Retracer::addCallback(const Entry *entry) {
+    assert(entry->name);
+    assert(entry->callback);
+    map[entry->name] = entry->callback;
+}
+
+
+void Retracer::addCallbacks(const Entry *entries) {
+    while (entries->name && entries->callback) {
+        addCallback(entries++);
+    }
+}
+
+
+void Retracer::retrace(Trace::Call &call) {
+    Callback callback = 0;
+
+    Trace::Id id = call.sig->id;
+    if (id >= callbacks.size()) {
+        callbacks.resize(id + 1);
+        callback = 0;
+    } else {
+        callback = callbacks[id];
+    }
+
+    if (!callback) {
+        Map::const_iterator it = map.find(call.name());
+        if (it == map.end()) {
+            callback = &retrace_unknown;
+        } else {
+            callback = it->second;
+        }
+        callbacks[id] = callback;
+    }
+
+    assert(callback);
+    assert(callbacks[id] == callback);
+
+    callback(call);
+}
+
 
 } /* namespace retrace */