X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=mymemory.h;h=05b89be959e0872386d955ebffd09b3b4076ffae;hp=2379b5f6c5deddae1b8fe79cd8eb0ff57be7faa4;hb=4159ba45e83f6542e3a3320e83bca9fbaf2da3ea;hpb=958af9f89dff567c26582d09687fcf0a1a461bc2

diff --git a/mymemory.h b/mymemory.h
index 2379b5f6..05b89be9 100644
--- a/mymemory.h
+++ b/mymemory.h
@@ -7,6 +7,8 @@
 #include <stdlib.h>
 #include <limits>
 
+#include "config.h"
+
 /** MEMALLOC declares the allocators for a class to allocate
  *	memory in the non-snapshotting heap. */
 #define MEMALLOC \
@@ -45,10 +47,9 @@ void model_free(void *ptr);
 
 void * snapshot_malloc(size_t size);
 void * snapshot_calloc(size_t count, size_t size);
+void * snapshot_realloc(void *ptr, size_t size);
 void snapshot_free(void *ptr);
 
-void *system_malloc(size_t size );
-
 /** @brief Provides a non-snapshotting allocator for use in STL classes.
  *
  * The code was adapted from a code example from the book The C++
@@ -141,19 +142,115 @@ bool operator!= (const ModelAlloc<T1>&,
 	return false;
 }
 
+/** @brief Provides a snapshotting allocator for use in STL classes.
+ *
+ * The code was adapted from a code example from the book The C++
+ * Standard Library - A Tutorial and Reference by Nicolai M. Josuttis,
+ * Addison-Wesley, 1999 © Copyright Nicolai M. Josuttis 1999
+ * Permission to copy, use, modify, sell and distribute this software
+ * is granted provided this copyright notice appears in all copies.
+ * This software is provided "as is" without express or implied
+ * warranty, and with no claim as to its suitability for any purpose.
+ */
+template <class T>
+class SnapshotAlloc {
+ public:
+	// type definitions
+	typedef T        value_type;
+	typedef T*       pointer;
+	typedef const T* const_pointer;
+	typedef T&       reference;
+	typedef const T& const_reference;
+	typedef size_t   size_type;
+	typedef size_t   difference_type;
+
+	// rebind allocator to type U
+	template <class U>
+	struct rebind {
+		typedef SnapshotAlloc<U> other;
+	};
+
+	// return address of values
+	pointer address(reference value) const {
+		return &value;
+	}
+	const_pointer address(const_reference value) const {
+		return &value;
+	}
+
+	/* constructors and destructor
+	 * - nothing to do because the allocator has no state
+	 */
+	SnapshotAlloc() throw() {
+	}
+	SnapshotAlloc(const SnapshotAlloc&) throw() {
+	}
+	template <class U>
+	SnapshotAlloc(const SnapshotAlloc<U>&) throw() {
+	}
+	~SnapshotAlloc() throw() {
+	}
+
+	// return maximum number of elements that can be allocated
+	size_type max_size() const throw() {
+		return std::numeric_limits<size_t>::max() / sizeof(T);
+	}
+
+	// allocate but don't initialize num elements of type T
+	pointer allocate(size_type num, const void * = 0) {
+		pointer p = (pointer)snapshot_malloc(num * sizeof(T));
+		return p;
+	}
+
+	// initialize elements of allocated storage p with value value
+	void construct(pointer p, const T& value) {
+		// initialize memory with placement new
+		new((void*)p)T(value);
+	}
+
+	// destroy elements of initialized storage p
+	void destroy(pointer p) {
+		// destroy objects by calling their destructor
+		p->~T();
+	}
+
+	// deallocate storage p of deleted elements
+	void deallocate(pointer p, size_type num) {
+		snapshot_free((void*)p);
+	}
+};
+
+/** Return that all specializations of this allocator are interchangeable. */
+template <class T1, class T2>
+bool operator ==(const SnapshotAlloc<T1>&,
+		const SnapshotAlloc<T2>&) throw() {
+	return true;
+}
+
+/** Return that all specializations of this allocator are interchangeable. */
+template <class T1, class T2>
+bool operator!= (const SnapshotAlloc<T1>&,
+		const SnapshotAlloc<T2>&) throw() {
+	return false;
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef void * mspace;
-extern void* mspace_malloc(mspace msp, size_t bytes);
-extern void mspace_free(mspace msp, void* mem);
-extern void* mspace_realloc(mspace msp, void* mem, size_t newsize);
-extern void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
-extern mspace create_mspace_with_base(void* base, size_t capacity, int locked);
-extern mspace create_mspace(size_t capacity, int locked);
-
-/** @brief mspace for the snapshotting heap */
-extern mspace snapshot_space;
+	typedef void * mspace;
+	extern void * mspace_malloc(mspace msp, size_t bytes);
+	extern void mspace_free(mspace msp, void* mem);
+	extern void * mspace_realloc(mspace msp, void* mem, size_t newsize);
+	extern void * mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
+	extern mspace create_mspace_with_base(void* base, size_t capacity, int locked);
+	extern mspace create_mspace(size_t capacity, int locked);
+
+#if USE_MPROTECT_SNAPSHOT
+	extern mspace user_snapshot_space;
+#endif
+
+	extern mspace model_snapshot_space;
+
 #ifdef __cplusplus
 };  /* end of extern "C" */
 #endif