common: rename trace_backtrace.* -> os_backtrace.*

[apitrace] / common / trace_writer.hpp

diff --git a/common/trace_writer.hpp b/common/trace_writer.hpp
index f8d0afb12bf0261408135897692d60afcc57eabd..4c9547788c8e28b5833943744b86f18f533280dd 100644 (file)
--- a/common/trace_writer.hpp
+++ b/common/trace_writer.hpp
@@ -36,7 +36,6 @@
 #include <vector>
 
 #include "trace_model.hpp"
-#include "trace_backtrace.hpp"
 
 namespace trace {
     class File;
@@ -50,6 +49,7 @@ namespace trace {
         std::vector<bool> structs;
         std::vector<bool> enums;
         std::vector<bool> bitmasks;
+        std::vector<bool> frames;
 
     public:
         Writer();
@@ -58,22 +58,6 @@ namespace trace {
         bool open(const char *filename);
         void close(void);
 
-        void writeBacktrace(std::vector<RawStackFrame> backtrace);
-        void beginBacktrace(void);
-        void endBacktrace(void);
-        void beginStackFrame(void);
-        inline void endStackFrame(void) {}
-        void beginStackFrameModule(void);
-        inline void endStackFrameModule(void) {}
-        void beginStackFrameFunction(void);
-        inline void endStackFrameFunction(void) {}
-        void beginStackFrameFilename(void);
-        inline void endStackFrameFilename(void) {}
-        void beginStackFrameLinenumber(void);
-        inline void endStackFrameLinenumber(void) {}
-        void beginStackFrameOffset(void);
-        inline void endStackFrameOffset(void) {}
-
         unsigned beginEnter(const FunctionSig *sig, unsigned thread_id);
         void endEnter(void);
 
@@ -86,6 +70,10 @@ namespace trace {
         void beginReturn(void);
         inline void endReturn(void) {}
 
+        void beginBacktrace(unsigned num_frames);
+        void writeStackFrame(const RawStackFrame *frame);
+        inline void endBacktrace(void) {}
+
         void beginArray(size_t length);
         inline void endArray(void) {}