diff options
author | Renato Filho <renato.filho@openbossa.org> | 2010-05-10 11:44:11 -0300 |
---|---|---|
committer | Renato Filho <renato.filho@openbossa.org> | 2010-05-10 17:28:19 -0300 |
commit | 2351a7009b83beadb12c75210278684a5b08b362 (patch) | |
tree | 17a304302afc5d7e1783501f017985c2ce988788 /libshiboken | |
parent | e3f3c1007a435e647eb0ee026559b9a64b44da9e (diff) |
Created userdata on Python type object.
User type userdata to store metaobject information.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>,
Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'libshiboken')
-rw-r--r-- | libshiboken/basewrapper.cpp | 33 | ||||
-rw-r--r-- | libshiboken/basewrapper.h | 13 |
2 files changed, 45 insertions, 1 deletions
diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp index dde7a7151..88ea8225f 100644 --- a/libshiboken/basewrapper.cpp +++ b/libshiboken/basewrapper.cpp @@ -220,6 +220,21 @@ bool cppObjectIsInvalid(PyObject* wrapper) return true; } +void setTypeUserData(SbkBaseWrapper* wrapper, void *user_data, DeleteUserDataFunc d_func) +{ + SbkBaseWrapperType* ob_type = reinterpret_cast<SbkBaseWrapperType*>(wrapper->ob_type); + if (ob_type->user_data) + ob_type->d_func(ob_type->user_data); + + ob_type->d_func = d_func; + ob_type->user_data = user_data; +} + +void* getTypeUserData(SbkBaseWrapper* wrapper) +{ + return reinterpret_cast<SbkBaseWrapperType*>(wrapper->ob_type)->user_data; +} + void deallocWrapperWithPrivateDtor(PyObject* self) { if (((SbkBaseWrapper *)self)->weakreflist) @@ -303,7 +318,9 @@ static void deallocPythonTypes(PyObject* pyObj) delete[] sbkObj->cptr; sbkObj->cptr = 0; + Py_TYPE(pyObj)->tp_free(pyObj); + } void deallocWrapper(PyObject* pyObj) @@ -328,6 +345,16 @@ void deallocWrapper(PyObject* pyObj) Py_TYPE(pyObj)->tp_free(pyObj); } +void SbkBaseWrapperType_dealloc(PyObject* pyObj) +{ + SbkBaseWrapperType *sbkType = reinterpret_cast<SbkBaseWrapperType*>(pyObj->ob_type); + + if(sbkType->user_data && sbkType->d_func) { + sbkType->d_func(sbkType->user_data); + sbkType->user_data = 0; + } +} + static PyObject* SbkBaseWrapperType_TpNew(PyTypeObject* metatype, PyObject* args, PyObject* kwds) { @@ -362,17 +389,21 @@ SbkBaseWrapperType_TpNew(PyTypeObject* metatype, PyObject* args, PyObject* kwds) newType->cpp_dtor = 0; newType->is_multicpp = 1; } + newType->user_data = 0; + newType->d_func = 0; newType->is_user_type = 1; return reinterpret_cast<PyObject*>(newType); } + + PyTypeObject SbkBaseWrapperType_Type = { PyObject_HEAD_INIT(0) /*ob_size*/ 0, /*tp_name*/ "Shiboken.BaseWrapperType", /*tp_basicsize*/ sizeof(SbkBaseWrapperType), /*tp_itemsize*/ 0, - /*tp_dealloc*/ 0, + /*tp_dealloc*/ SbkBaseWrapperType_dealloc, /*tp_print*/ 0, /*tp_getattr*/ 0, /*tp_setattr*/ 0, diff --git a/libshiboken/basewrapper.h b/libshiboken/basewrapper.h index 168d3f43f..b6a9b7950 100644 --- a/libshiboken/basewrapper.h +++ b/libshiboken/basewrapper.h @@ -68,6 +68,9 @@ typedef std::list<TypeDiscoveryFunc> TypeDiscoveryFuncList; typedef void* (*ExtendedToCppFunc)(PyObject*); typedef bool (*ExtendedIsConvertibleFunc)(PyObject*); +// Used in userdata dealloc function +typedef void (*DeleteUserDataFunc)(void*); + LIBSHIBOKEN_API PyAPI_DATA(PyTypeObject) SbkBaseWrapperType_Type; LIBSHIBOKEN_API PyAPI_DATA(SbkBaseWrapperType) SbkBaseWrapper_Type; @@ -99,6 +102,9 @@ struct LIBSHIBOKEN_API SbkBaseWrapperType int is_multicpp:1; /// True if this type was definied by the user. int is_user_type:1; + /// Type user data + void *user_data; + DeleteUserDataFunc d_func; }; struct ParentInfo; @@ -179,6 +185,13 @@ LIBSHIBOKEN_API void* getCppPointer(PyObject* wrapper, PyTypeObject* desiredType LIBSHIBOKEN_API bool setCppPointer(SbkBaseWrapper* wrapper, PyTypeObject* desiredType, void* cptr); /** + * Get/Set Userdata in type class + */ +LIBSHIBOKEN_API void setTypeUserData(SbkBaseWrapper* wrapper, void* user_data, DeleteUserDataFunc d_func); +LIBSHIBOKEN_API void* getTypeUserData(SbkBaseWrapper* wrapper); + + +/** * Shiboken_TypeCheck macro performs a type check using the values registered with SbkType<>() template. */ #define Shiboken_TypeCheck(pyobj, type) (PyObject_TypeCheck(pyobj, SbkType<type>())) |