added missed HeapMmgr files

qse/include/qse/cmn/HeapMmgr.hpp

@@ -0,0 +1,63 @@
+/*
+ * $Id$
+ *
+    Copyright (c) 2006-2014 Chung, Hyung-Hwan. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _QSE_CMN_HEAPMMGR_HPP_
+#define _QSE_CMN_HEAPMMGR_HPP_
+
+#include <qse/cmn/Mmgr.hpp>
+#include <qse/cmn/Mmged.hpp>
+#include <qse/cmn/xma.h>
+
+/////////////////////////////////
+QSE_BEGIN_NAMESPACE(QSE)
+/////////////////////////////////
+
+/// The HeapMmgr class implements the heap-based memory manager interface.
+/// It is a memory manager that's memory managed by another memory manager.
+
+class QSE_EXPORT HeapMmgr: public Mmgr, public Mmged
+{
+public:
+	HeapMmgr (Mmgr* mmgr, qse_size_t heap_size, bool raise_exception = true);
+	~HeapMmgr ();
+
+	void* allocMem (qse_size_t n);
+	void* reallocMem (void* ptr, qse_size_t n);
+	void freeMem (void* ptr);
+
+	// the library does not provide a stock instance of this class
+	//static HeapMmgr* getInstance ();
+
+protected:
+	qse_xma_t* xma;
+	qse_size_t heap_size;
+};
+
+/////////////////////////////////
+QSE_END_NAMESPACE(QSE)
+/////////////////////////////////
+
+#endif

qse/include/qse/cmn/Mmgr.hpp

@@ -66,6 +66,10 @@ public:
 	///
 	Mmgr (bool raise_exception = true): raise_exception (raise_exception)
 	{
+		// NOTE:
+		//  the #qse_mmgr_t interface is not affected by raise_exception
+		//  because direct calls to the virtual functions that don't raise
+		//  exceptions are made via bridge functions below.
 		this->alloc = alloc_mem;
 		this->realloc = realloc_mem;
 		this->free = free_mem;
@@ -170,6 +174,13 @@ void* operator new (qse_size_t size, QSE::Mmgr* mmgr);
 void operator delete (void* ptr, QSE::Mmgr* mmgr);
 
 #if 0
+// i found no way to delete an array allocated with
+// the placement new operator. if the array element is an instance
+// of a class, the pointer returned by the new operator call
+// may not be the actual pointer allocated. some compilers
+// seem to put some information about the array at the 
+// beginning of the allocated memory and return the pointer
+// off a few bytes from the beginning.
 void* operator new[] (qse_size_t size, QSE::Mmgr* mmgr);
 void operator delete[] (void* ptr, QSE::Mmgr* mmgr);
 #endif

qse/include/qse/cmn/StdMmgr.hpp

@@ -40,6 +40,8 @@ QSE_BEGIN_NAMESPACE(QSE)
 class QSE_EXPORT StdMmgr: public Mmgr
 {
 public:
+	StdMmgr (bool raise_exception = true): Mmgr (raise_exception) {}
+
 	void* allocMem (qse_size_t n);
 	void* reallocMem (void* ptr, qse_size_t n);
 	void freeMem (void* ptr);

qse/lib/cmn/HeapMmgr.cpp

@@ -0,0 +1,91 @@
+/*
+ * $Id$
+ * 
+    Copyright (c) 2006-2014 Chung, Hyung-Hwan. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <qse/cmn/HeapMmgr.hpp>
+#include <qse/cmn/xma.h>
+
+/////////////////////////////////
+QSE_BEGIN_NAMESPACE(QSE)
+/////////////////////////////////
+
+struct xma_xtn_t
+{
+	HeapMmgr* heap;
+};
+
+HeapMmgr::HeapMmgr (Mmgr* mmgr, qse_size_t heap_size, bool raise_exception): 
+	Mmgr(raise_exception), Mmged(mmgr), xma(QSE_NULL), heap_size (heap_size)
+{
+}
+
+HeapMmgr::~HeapMmgr ()
+{
+	if (this->xma) qse_xma_close (this->xma);
+}
+
+void* HeapMmgr::allocMem (qse_size_t n)
+{
+	if (!this->xma)
+	{
+		this->xma = qse_xma_open (this->getMmgr(), QSE_SIZEOF(xma_xtn_t), heap_size);
+		if (!this->xma) return QSE_NULL;
+
+		xma_xtn_t* xtn = (xma_xtn_t*)qse_xma_getxtn (this->xma);
+		xtn->heap = this;
+	}
+
+	void* xptr = qse_xma_alloc (this->xma, n);
+	if (!xptr) QSE_THROW (MemoryError);
+	return xptr;
+}
+
+void* HeapMmgr::reallocMem (void* ptr, qse_size_t n)
+{
+	if (!this->xma)
+	{
+		this->xma = qse_xma_open (this->getMmgr(), QSE_SIZEOF(xma_xtn_t), heap_size);
+		if (!this->xma) return QSE_NULL;
+
+		xma_xtn_t* xtn = (xma_xtn_t*)qse_xma_getxtn (this->xma);
+		xtn->heap = this;
+	}
+
+	void* xptr = qse_xma_realloc (this->xma, ptr, n);
+	if (!xptr) QSE_THROW (MemoryError);
+	return xptr;
+}
+
+void HeapMmgr::freeMem (void* ptr)
+{
+	if (this->xma)
+	{
+		qse_xma_free (this->xma, ptr);
+	}
+}
+
+/////////////////////////////////
+QSE_END_NAMESPACE(QSE)
+/////////////////////////////////