Remove FunctionSig::backtrace member.

[apitrace] / common / trace_writer_local.cpp

diff --git a/common/trace_writer_local.cpp b/common/trace_writer_local.cpp
index feb5c912dfd06b2a61f2a003f9f9759bc23255e0..866170139c2a45356b3abcef67e482cf3c426b32 100644 (file)
--- a/common/trace_writer_local.cpp
+++ b/common/trace_writer_local.cpp
@@ -36,6 +36,7 @@
 #include "trace_file.hpp"
 #include "trace_writer_local.hpp"
 #include "trace_format.hpp"
+#include "trace_backtrace.hpp"
 
 
 namespace trace {
@@ -128,10 +129,12 @@ LocalWriter::open(void) {
 #endif
 }
 
-static unsigned next_thread_num = 1;
-static thread_specific unsigned thread_num = 0;
+static uintptr_t next_thread_num = 1;
 
-unsigned LocalWriter::beginEnter(const FunctionSig *sig) {
+static OS_THREAD_SPECIFIC_PTR(void)
+thread_num;
+
+unsigned LocalWriter::beginEnter(const FunctionSig *sig, bool fake) {
     mutex.lock();
     ++acquired;
 
@@ -139,14 +142,24 @@ unsigned LocalWriter::beginEnter(const FunctionSig *sig) {
         open();
     }
 
-    unsigned this_thread_num = thread_num;
+    // Although thread_num is a void *, we actually use it as a uintptr_t
+    uintptr_t this_thread_num =
+        reinterpret_cast<uintptr_t>(static_cast<void *>(thread_num));
     if (!this_thread_num) {
-        this_thread_num = thread_num = next_thread_num++;
+        this_thread_num = next_thread_num++;
+        thread_num = reinterpret_cast<void *>(this_thread_num);
     }
 
-    assert(thread_num > 0);
-    unsigned thread_id = thread_num - 1;
-    return Writer::beginEnter(sig, thread_id);
+    assert(this_thread_num);
+    unsigned thread_id = this_thread_num - 1;
+    unsigned call_no = Writer::beginEnter(sig, thread_id);
+    if (!fake) {
+        std::vector<RawStackFrame> backtrace = get_backtrace();
+        beginBacktrace();
+        writeBacktrace(backtrace);
+        endBacktrace();
+    }
+    return call_no;
 }
 
 void LocalWriter::endEnter(void) {