Added on_dealloc and on_realloc callbacks

Author: Ayuto

src/core/modules/memory/memory_callback.cpp

@@ -114,18 +114,6 @@ CCallback::CCallback(object oCallback, Convention_t eConv, tuple args, object re
     m_ulAddr = (unsigned long) a.make();
 }
 
-CCallback::~CCallback()
-{	
-	if (m_bAutoDealloc)
-	{
-		PythonLog(4, "[SP] Automatically deallocating callback at %u.", m_ulAddr);
-		Dealloc();
-
-		// This prevents ~CPointer from calling CPointer::Dealloc() again
-		m_bAutoDealloc = false;
-	}
-}
-
 int CCallback::GetPopSize()
 {
 	/*

src/core/modules/memory/memory_callback.h

@@ -75,7 +75,6 @@ class CCallback: public CFunction
 {
 public:
     CCallback(object oCallback, Convention_t eConv, tuple args, object return_type, bool bAutoDealloc = true);
-	virtual ~CCallback();
 
     int          GetPopSize();
     int          GetArgumentOffset(int iIndex);

src/core/modules/memory/memory_tools.cpp

@@ -55,15 +55,6 @@ CPointer::CPointer(unsigned long ulAddr /* = 0 */, bool bAutoDealloc /* false */
 	m_bAutoDealloc = bAutoDealloc;
 }
 
-CPointer::~CPointer()
-{
-	if (m_bAutoDealloc)
-	{
-		PythonLog(4, "[SP] Automatically deallocating pointer at %u.", m_ulAddr);
-		Dealloc();
-	}
-}
-
 void CPointer::SetStringPtr(char* szText, int iOffset /* = 0 */)
 {
 	if (!IsValid())
@@ -202,6 +193,47 @@ CFunction* CPointer::MakeVirtualFunction(int iIndex, Convention_t eConv, tuple a
 	return GetVirtualFunc(iIndex)->MakeFunction(eConv, args, return_type);
 }
 
+void CPointer::CallCallback(PyObject* self, char* szCallback)
+{
+	PyObject* callback = PyObject_GetAttrString(self, szCallback);
+	if (callback && PyCallable_Check(callback))
+	{
+		if (!PyObject_HasAttrString(callback, "__self__"))
+		{
+			xdecref(PyObject_CallFunction(callback, "O", self));
+		}
+		else
+		{
+			xdecref(PyObject_CallMethod(self, szCallback, NULL));
+		}
+	}
+	xdecref(callback);
+}
+
+void CPointer::PreDealloc(PyObject* self)
+{
+	CallCallback(self, "on_dealloc");
+	CPointer* pointer = extract<CPointer *>(self);
+	pointer->Dealloc();
+}
+
+void CPointer::PreRealloc(PyObject* self, int iSize)
+{
+	CallCallback(self, "on_realloc");
+	CPointer* pointer = extract<CPointer *>(self);
+	pointer->Realloc(iSize);
+}
+ 
+void CPointer::__del__(PyObject* self)
+{
+	if (PyObject_IsTrue(PyObject_GetAttrString(self, "auto_dealloc")))
+	{
+		unsigned long ulAddr = extract<unsigned long>(PyObject_GetAttrString(self, "address"));
+		PythonLog(4, "[SP] Automatically deallocating pointer at %u.", ulAddr);
+		PreDealloc(self);
+	}
+}
+
 //-----------------------------------------------------------------------------
 // CFunction class
 //-----------------------------------------------------------------------------

src/core/modules/memory/memory_tools.h

@@ -202,7 +202,6 @@ class CPointer
 {
 public:
 	CPointer(unsigned long ulAddr = 0, bool bAutoDealloc = false);
-	virtual ~CPointer();
 
 	operator unsigned long() const { return m_ulAddr; }
 
@@ -282,6 +281,11 @@ class CPointer
 	CFunction*          MakeFunction(Convention_t eConv, boost::python::tuple args, object return_type);
 	CFunction*          MakeVirtualFunction(int iIndex, Convention_t eConv, boost::python::tuple args, object return_type);
 
+	static void         CallCallback(PyObject* self, char* szCallback);
+	static void         PreDealloc(PyObject* self);
+	static void         PreRealloc(PyObject* self, int iSize);
+	static void         __del__(PyObject* self);
+
 public:
 	unsigned long m_ulAddr;
 	bool          m_bAutoDealloc;

src/core/modules/memory/memory_wrap_python.cpp

@@ -261,16 +261,20 @@ void export_memtools()
 		)
 
 		.def("realloc",
-			&CPointer::Realloc,
+			&CPointer::PreRealloc,
 			"Reallocates a memory block.",
 			args("size")
 		)
 
 		.def("dealloc",
-			&CPointer::Dealloc,
+			&CPointer::PreDealloc,
 			"Deallocates a memory block."
 		)
 
+		.def("__del__",
+			&CPointer::__del__
+		)
+
 		 .def("get_size",
 			&CPointer::GetSize,
 			"Returns the size of the memory block."