Refactor the code.
The object hierarchy was confusing and convoluted. This removes
a lot of unnecessary code, and consolidates the BacktraceCurrent
and BacktraceThread code into BacktraceCurrent.
Change-Id: I01c8407d493712a48169df49dd3ff46db4a7c3ae
diff --git a/libbacktrace/UnwindCurrent.h b/libbacktrace/UnwindCurrent.h
index 2375e6e..3023996 100644
--- a/libbacktrace/UnwindCurrent.h
+++ b/libbacktrace/UnwindCurrent.h
@@ -17,27 +17,32 @@
#ifndef _LIBBACKTRACE_UNWIND_CURRENT_H
#define _LIBBACKTRACE_UNWIND_CURRENT_H
+#include <stdint.h>
+#include <sys/types.h>
+#include <ucontext.h>
+
#include <string>
-#include "BacktraceImpl.h"
+#include <backtrace/Backtrace.h>
+#include <backtrace/BacktraceMap.h>
+
+#include "BacktraceCurrent.h"
#define UNW_LOCAL_ONLY
#include <libunwind.h>
-class UnwindCurrent : public BacktraceImpl {
+class UnwindCurrent : public BacktraceCurrent {
public:
- UnwindCurrent();
- virtual ~UnwindCurrent();
+ UnwindCurrent(pid_t pid, pid_t tid, BacktraceMap* map) : BacktraceCurrent(pid, tid, map) {}
+ virtual ~UnwindCurrent() {}
- virtual bool Unwind(size_t num_ignore_frames, ucontext_t* ucontext);
+ std::string GetFunctionNameRaw(uintptr_t pc, uintptr_t* offset) override;
- virtual std::string GetFunctionNameRaw(uintptr_t pc, uintptr_t* offset);
+private:
+ void GetUnwContextFromUcontext(const ucontext_t* ucontext);
- bool UnwindFromContext(size_t num_ignore_frames, bool within_handler);
+ bool UnwindFromContext(size_t num_ignore_frames, ucontext_t* ucontext) override;
- void GetUnwContextFromUcontext(const ucontext_t* context);
-
-protected:
unw_context_t context_;
};