up

kbengine · kbengine · commit 296215cd616e · 2014-11-12T14:55:30.000+08:00
diff --git a/kbe/src/lib/entitydef/blob.cpp b/kbe/src/lib/entitydef/blob.cpp
@@ -20,6 +20,7 @@ along with KBEngine.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "blob.hpp"
 #include "datatypes.hpp"
+#include "pyscript/py_gc.hpp"
 
 namespace KBEngine{ 
 
@@ -39,32 +40,37 @@ Blob::Blob(std::string& strDictInitData, bool readonly):
 PyMemoryStream(getScriptType(), false, readonly)
 {
 	initialize(strDictInitData);
+	script::PyGC::incTracing("Blob");
 }
 
 //-------------------------------------------------------------------------------------
 Blob::Blob(PyObject* pyDictInitData, bool readonly):
 PyMemoryStream(getScriptType(), false, readonly)
 {
 	initialize(pyDictInitData);
+	script::PyGC::incTracing("Blob");
 }
 
 //-------------------------------------------------------------------------------------
 Blob::Blob(MemoryStream* streamInitData, bool readonly):
 PyMemoryStream(getScriptType(), false, readonly)
 {
 	initialize(streamInitData);
+	script::PyGC::incTracing("Blob");
 }
 
 //-------------------------------------------------------------------------------------
 Blob::Blob(bool readonly):
 PyMemoryStream(getScriptType(), false, readonly)
 {
 	initialize("");
+	script::PyGC::incTracing("Blob");
 }
 
 //-------------------------------------------------------------------------------------
 Blob::~Blob()
 {
+	script::PyGC::decTracing("Blob");
 }
 
 //-------------------------------------------------------------------------------------
diff --git a/kbe/src/lib/pyscript/vector2.cpp b/kbe/src/lib/pyscript/vector2.cpp
@@ -21,6 +21,8 @@ along with KBEngine.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "vector2.hpp"
 #include "vector3.hpp"
+#include "pyscript/py_gc.hpp"
+
 namespace KBEngine{ namespace script{
 
 const int ScriptVector2::VECTOR_SIZE = sizeof(Vector2) / sizeof(float);
@@ -123,6 +125,7 @@ ScriptObject(getScriptType(), false),
 val_(v),
 isCopy_(true)
 {
+	script::PyGC::incTracing("Vector2");
 }
 
 
@@ -132,6 +135,7 @@ ScriptObject(getScriptType(), false),
 isCopy_(false)
 {
 	val_ = new Vector2(v);
+	script::PyGC::incTracing("Vector2");
 }
 
 //-------------------------------------------------------------------------------------
@@ -140,14 +144,16 @@ ScriptObject(getScriptType(), false),
 isCopy_(false)
 {
 	val_ = new Vector2(x, y);
-
+	script::PyGC::incTracing("Vector2");
 }
 
 //-------------------------------------------------------------------------------------
 ScriptVector2::~ScriptVector2()
 {
 	if(!isCopy_)
 		delete val_;
+
+	script::PyGC::decTracing("Vector2");
 }
 
 //-------------------------------------------------------------------------------------
diff --git a/kbe/src/lib/pyscript/vector3.cpp b/kbe/src/lib/pyscript/vector3.cpp
@@ -21,6 +21,8 @@ along with KBEngine.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "vector3.hpp"
 #include "vector2.hpp"
+#include "pyscript/py_gc.hpp"
+
 namespace KBEngine{ namespace script{
 
 const int ScriptVector3::VECTOR_SIZE = sizeof(Vector3) / sizeof(float);
@@ -127,6 +129,7 @@ val_(v),
 isRef_(true),
 _pyVector3ChangedCallback(pyVector3ChangedCallback)
 {
+	script::PyGC::incTracing("Vector3");
 }
 
 
@@ -137,6 +140,7 @@ isRef_(false),
 _pyVector3ChangedCallback(NULL)
 {
 	val_ = new Vector3(v);
+	script::PyGC::incTracing("Vector3");
 }
 
 //-------------------------------------------------------------------------------------
@@ -146,6 +150,7 @@ isRef_(false),
 _pyVector3ChangedCallback(NULL)
 {
 	val_ = new Vector3(x, y, z);
+	script::PyGC::incTracing("Vector3");
 }
 
 //-------------------------------------------------------------------------------------
@@ -155,6 +160,7 @@ ScriptVector3::~ScriptVector3()
 		delete val_;
 
 	_pyVector3ChangedCallback = NULL;
+	script::PyGC::decTracing("Vector3");
 }
 
 //-------------------------------------------------------------------------------------
diff --git a/kbe/src/lib/pyscript/vector4.cpp b/kbe/src/lib/pyscript/vector4.cpp
@@ -22,6 +22,8 @@ along with KBEngine.  If not, see <http://www.gnu.org/licenses/>.
 #include "vector2.hpp"
 #include "vector3.hpp"
 #include "vector4.hpp"
+#include "pyscript/py_gc.hpp"
+
 namespace KBEngine{ namespace script{
 
 const int ScriptVector4::VECTOR_SIZE = sizeof(Vector4) / sizeof(float);
@@ -125,15 +127,16 @@ ScriptObject(getScriptType(), false),
 val_(v),
 isCopy_(true)
 {
+	script::PyGC::incTracing("Vector4");
 }
 
-
 //-------------------------------------------------------------------------------------
 ScriptVector4::ScriptVector4(Vector4 v):
 ScriptObject(getScriptType(), false),
 isCopy_(false)
 {
 	val_ = new Vector4(v);
+	script::PyGC::incTracing("Vector4");
 }
 
 //-------------------------------------------------------------------------------------
@@ -142,14 +145,16 @@ ScriptObject(getScriptType(), false),
 isCopy_(false)
 {
 	val_ = new Vector4(x, y, z, w);
-
+	script::PyGC::incTracing("Vector4");
 }
 
 //-------------------------------------------------------------------------------------
 ScriptVector4::~ScriptVector4()
 {
 	if(!isCopy_)
 		delete val_;
+
+	script::PyGC::decTracing("Vector4");
 }
 
 //-------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ along with KBEngine. If not, see <http://www.gnu.org/licenses/>.`
`20`	`20`
`21`	`21`	`#include "blob.hpp"`
`22`	`22`	`#include "datatypes.hpp"`
	`23`	`+#include "pyscript/py_gc.hpp"`
`23`	`24`
`24`	`25`	`namespace KBEngine{`
`25`	`26`
`@@ -39,32 +40,37 @@ Blob::Blob(std::string& strDictInitData, bool readonly):`
`39`	`40`	`PyMemoryStream(getScriptType(), false, readonly)`
`40`	`41`	`{`
`41`	`42`	`initialize(strDictInitData);`
	`43`	`+ script::PyGC::incTracing("Blob");`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`//-------------------------------------------------------------------------------------`
`45`	`47`	`Blob::Blob(PyObject* pyDictInitData, bool readonly):`
`46`	`48`	`PyMemoryStream(getScriptType(), false, readonly)`
`47`	`49`	`{`
`48`	`50`	`initialize(pyDictInitData);`
	`51`	`+ script::PyGC::incTracing("Blob");`
`49`	`52`	`}`
`50`	`53`
`51`	`54`	`//-------------------------------------------------------------------------------------`
`52`	`55`	`Blob::Blob(MemoryStream* streamInitData, bool readonly):`
`53`	`56`	`PyMemoryStream(getScriptType(), false, readonly)`
`54`	`57`	`{`
`55`	`58`	`initialize(streamInitData);`
	`59`	`+ script::PyGC::incTracing("Blob");`
`56`	`60`	`}`
`57`	`61`
`58`	`62`	`//-------------------------------------------------------------------------------------`
`59`	`63`	`Blob::Blob(bool readonly):`
`60`	`64`	`PyMemoryStream(getScriptType(), false, readonly)`
`61`	`65`	`{`
`62`	`66`	`initialize("");`
	`67`	`+ script::PyGC::incTracing("Blob");`
`63`	`68`	`}`
`64`	`69`
`65`	`70`	`//-------------------------------------------------------------------------------------`
`66`	`71`	`Blob::~Blob()`
`67`	`72`	`{`
	`73`	`+ script::PyGC::decTracing("Blob");`
`68`	`74`	`}`
`69`	`75`
`70`	`76`	`//-------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ along with KBEngine. If not, see <http://www.gnu.org/licenses/>.`
`21`	`21`
`22`	`22`	`#include "vector2.hpp"`
`23`	`23`	`#include "vector3.hpp"`
	`24`	`+#include "pyscript/py_gc.hpp"`
	`25`	`+`
`24`	`26`	`namespace KBEngine{ namespace script{`
`25`	`27`
`26`	`28`	`const int ScriptVector2::VECTOR_SIZE = sizeof(Vector2) / sizeof(float);`
`@@ -123,6 +125,7 @@ ScriptObject(getScriptType(), false),`
`123`	`125`	`val_(v),`
`124`	`126`	`isCopy_(true)`
`125`	`127`	`{`
	`128`	`+ script::PyGC::incTracing("Vector2");`
`126`	`129`	`}`
`127`	`130`
`128`	`131`
`@@ -132,6 +135,7 @@ ScriptObject(getScriptType(), false),`
`132`	`135`	`isCopy_(false)`
`133`	`136`	`{`
`134`	`137`	`val_ = new Vector2(v);`
	`138`	`+ script::PyGC::incTracing("Vector2");`
`135`	`139`	`}`
`136`	`140`
`137`	`141`	`//-------------------------------------------------------------------------------------`
`@@ -140,14 +144,16 @@ ScriptObject(getScriptType(), false),`
`140`	`144`	`isCopy_(false)`
`141`	`145`	`{`
`142`	`146`	`val_ = new Vector2(x, y);`
`143`		`-`
	`147`	`+ script::PyGC::incTracing("Vector2");`
`144`	`148`	`}`
`145`	`149`
`146`	`150`	`//-------------------------------------------------------------------------------------`
`147`	`151`	`ScriptVector2::~ScriptVector2()`
`148`	`152`	`{`
`149`	`153`	`if(!isCopy_)`
`150`	`154`	`delete val_;`
	`155`	`+`
	`156`	`+ script::PyGC::decTracing("Vector2");`
`151`	`157`	`}`
`152`	`158`
`153`	`159`	`//-------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ along with KBEngine. If not, see <http://www.gnu.org/licenses/>.`
`22`	`22`	`#include "vector2.hpp"`
`23`	`23`	`#include "vector3.hpp"`
`24`	`24`	`#include "vector4.hpp"`
	`25`	`+#include "pyscript/py_gc.hpp"`
	`26`	`+`
`25`	`27`	`namespace KBEngine{ namespace script{`
`26`	`28`
`27`	`29`	`const int ScriptVector4::VECTOR_SIZE = sizeof(Vector4) / sizeof(float);`
`@@ -125,15 +127,16 @@ ScriptObject(getScriptType(), false),`
`125`	`127`	`val_(v),`
`126`	`128`	`isCopy_(true)`
`127`	`129`	`{`
	`130`	`+ script::PyGC::incTracing("Vector4");`
`128`	`131`	`}`
`129`	`132`
`130`		`-`
`131`	`133`	`//-------------------------------------------------------------------------------------`
`132`	`134`	`ScriptVector4::ScriptVector4(Vector4 v):`
`133`	`135`	`ScriptObject(getScriptType(), false),`
`134`	`136`	`isCopy_(false)`
`135`	`137`	`{`
`136`	`138`	`val_ = new Vector4(v);`
	`139`	`+ script::PyGC::incTracing("Vector4");`
`137`	`140`	`}`
`138`	`141`
`139`	`142`	`//-------------------------------------------------------------------------------------`
`@@ -142,14 +145,16 @@ ScriptObject(getScriptType(), false),`
`142`	`145`	`isCopy_(false)`
`143`	`146`	`{`
`144`	`147`	`val_ = new Vector4(x, y, z, w);`
`145`		`-`
	`148`	`+ script::PyGC::incTracing("Vector4");`
`146`	`149`	`}`
`147`	`150`
`148`	`151`	`//-------------------------------------------------------------------------------------`
`149`	`152`	`ScriptVector4::~ScriptVector4()`
`150`	`153`	`{`
`151`	`154`	`if(!isCopy_)`
`152`	`155`	`delete val_;`
	`156`	`+`
	`157`	`+ script::PyGC::decTracing("Vector4");`
`153`	`158`	`}`
`154`	`159`
`155`	`160`	`//-------------------------------------------------------------------------------------`