Small refactor.
- Move all ScopedDisableDebugCalls into the debug_XXX calls. This avoids
any issues that might arise where every part of the code needs to properly
guard anything that might allocate. Instead everything is already guarded.
- Add a pointer to debug_data in all of the XXData classes. This avoids
calling individual functions passing in the debug_data pointer.
- Flip the NO_HEADER_OPTIONS to an explicit HEADER_OPTIONS list since fewer
options actually require a header.
- Move the extern of g_debug to the DebugData.h header.
Change-Id: Ia213a391b4a44d9ce122a709d09fe4f1b5426f36
diff --git a/libc/malloc_debug/FreeTrackData.h b/libc/malloc_debug/FreeTrackData.h
index 804b5a6..21f845f 100644
--- a/libc/malloc_debug/FreeTrackData.h
+++ b/libc/malloc_debug/FreeTrackData.h
@@ -38,26 +38,28 @@
#include <private/bionic_macros.h>
-// Forward declarations.
-struct Header;
-class DebugData;
-struct Config;
-struct BacktraceHeader;
+#include "OptionData.h"
-class FreeTrackData {
+// Forward declarations.
+struct BacktraceHeader;
+struct Config;
+class DebugData;
+struct Header;
+
+class FreeTrackData : public OptionData {
public:
- FreeTrackData(const Config& config);
+ FreeTrackData(DebugData* debug_data, const Config& config);
virtual ~FreeTrackData() = default;
- void Add(DebugData& debug, const Header* header);
+ void Add(const Header* header);
- void VerifyAll(DebugData& debug);
+ void VerifyAll();
void LogBacktrace(const Header* header);
private:
- void LogFreeError(DebugData& debug, const Header* header, const uint8_t* pointer);
- void VerifyAndFree(DebugData& debug, const Header* header, const void* pointer);
+ void LogFreeError(const Header* header, const uint8_t* pointer);
+ void VerifyAndFree(const Header* header);
pthread_mutex_t mutex_ = PTHREAD_MUTEX_INITIALIZER;
std::deque<const Header*> list_;