X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fretrace.hpp;h=7c8dcd5229426743bf52a52c0609b5fb84e0fb0b;hb=7e35dc93a0e7d6e2e1e53ca975e59a9ee956c77b;hp=228c81352e979046ece2e8040d2f885ef7b27051;hpb=42b89fc9a180e56dbe55a9816904c84aacb555ea;p=apitrace

diff --git a/retrace/retrace.hpp b/retrace/retrace.hpp
index 228c813..7c8dcd5 100644
--- a/retrace/retrace.hpp
+++ b/retrace/retrace.hpp
@@ -28,7 +28,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <stdint.h>
 
 #include <list>
 #include <map>
@@ -38,6 +37,8 @@
 #include "trace_parser.hpp"
 #include "trace_profiler.hpp"
 
+#include "scoped_allocator.hpp"
+
 
 namespace image {
     class Image;
@@ -51,37 +52,9 @@ extern trace::Parser parser;
 extern trace::Profiler profiler;
 
 
-/**
- * Similar to alloca(), but implemented with malloc.
- */
-class ScopedAllocator
+class ScopedAllocator : public ::ScopedAllocator
 {
-private:
-    uintptr_t next;
-
 public:
-    inline
-    ScopedAllocator() :
-        next(0) {
-    }
-
-    inline void *
-    alloc(size_t size) {
-        /* Always return valid address, even when size is zero */
-        size = std::max(size, sizeof(uintptr_t));
-
-        uintptr_t * buf = static_cast<uintptr_t *>(malloc(sizeof(uintptr_t) + size));
-        if (!buf) {
-            return NULL;
-        }
-
-        *buf = next;
-        next = reinterpret_cast<uintptr_t>(buf);
-        assert((next & 1) == 0);
-
-        return static_cast<void *>(&buf[1]);
-    }
-
     /**
      * Allocate an array with the same dimensions as the specified value.
      */
@@ -89,7 +62,7 @@ public:
     alloc(const trace::Value *value, size_t size) {
         const trace::Array *array = dynamic_cast<const trace::Array *>(value);
         if (array) {
-            return alloc(array->size() * size);
+            return ::ScopedAllocator::alloc(array->size() * size);
         }
         const trace::Null *null = dynamic_cast<const trace::Null *>(value);
         if (null) {
@@ -99,32 +72,6 @@ public:
         return NULL;
     }
 
-    /**
-     * Prevent this pointer from being automatically freed.
-     */
-    template< class T >
-    inline void
-    bind(T *ptr) {
-        if (ptr) {
-            reinterpret_cast<uintptr_t *>(ptr)[-1] |= 1;
-        }
-    }
-
-    inline
-    ~ScopedAllocator() {
-        while (next) {
-            uintptr_t temp = *reinterpret_cast<uintptr_t *>(next);
-
-            bool bind = temp & 1;
-            temp &= ~1;
-
-            if (!bind) {
-                free(reinterpret_cast<void *>(next));
-            }
-
-            next = temp;
-        }
-    }
 };