call cleanup method when module is freed

Author: zeng-qinghui

.gitignore

@@ -5,4 +5,5 @@ dist
 build
 pynvjpeg.egg-info
 pynvjpeg
-MANIFEST
+MANIFEST
+__pycache__

nvjpeg-python.c

@@ -34,28 +34,22 @@ typedef struct
 
 static NvJpegPythonHandle* __gllobal_NvJpegPython = NULL;
 
-NvJpegPythonHandle* NvJpegPython_createHandle(){
+NvJpegPythonHandle* NvJpegPython_startUpEnv(){
     if(__gllobal_NvJpegPython==NULL){
         __gllobal_NvJpegPython = (NvJpegPythonHandle*)malloc(sizeof(NvJpegPythonHandle));
         nvjpegCreateSimple(&(__gllobal_NvJpegPython->nv_handle));
         nvjpegJpegStateCreate(__gllobal_NvJpegPython->nv_handle, &(__gllobal_NvJpegPython->nv_statue));
         nvjpegEncoderStateCreate(__gllobal_NvJpegPython->nv_handle, &(__gllobal_NvJpegPython->nv_enc_state), NULL);
     }
     return __gllobal_NvJpegPython;
-    // NvJpegPythonHandle* handle = NULL;
-    // handle = (NvJpegPythonHandle*)malloc(sizeof(NvJpegPythonHandle));
-    // nvjpegCreateSimple(&(handle->nv_handle));
-    // nvjpegJpegStateCreate(handle->nv_handle, &(handle->nv_statue));
-    // nvjpegEncoderStateCreate(handle->nv_handle, &(handle->nv_enc_state), NULL);
-    // return handle;
 }
 
-void NvJpegPython_destoryHandle(NvJpegPythonHandle** handle){
-    // nvjpegJpegStateDestroy((*handle)->nv_statue);
-    // nvjpegEncoderStateDestroy((*handle)->nv_enc_state);
-    // nvjpegDestroy((*handle)->nv_handle);
-    // free(*handle);
-    *handle = NULL;
+void NvJpegPython_cleanUpEnv(){
+    nvjpegJpegStateDestroy((__gllobal_NvJpegPython)->nv_statue);
+    nvjpegEncoderStateDestroy((__gllobal_NvJpegPython)->nv_enc_state);
+    nvjpegDestroy((__gllobal_NvJpegPython)->nv_handle);
+    free(__gllobal_NvJpegPython);
+    __gllobal_NvJpegPython = NULL;
 }
 
 NvJpegPythonImage* NvJpegPython_createImage(int width, int height, int nComponent, nvjpegChromaSubsampling_t subsampling){
@@ -114,8 +108,6 @@ void NvJpegPython_destoryImage(NvJpegPythonImage** img){
 NvJpegPythonImage* NvJpegPython_decode(NvJpegPythonHandle* handle, const unsigned char* jpegData, size_t length){
     nvjpegHandle_t nv_handle = handle->nv_handle;
     nvjpegJpegState_t nv_statue = handle->nv_statue;
-    // nvjpegCreateSimple(&nv_handle);
-    // nvjpegJpegStateCreate(nv_handle, &nv_statue);
 
     int widths[NVJPEG_MAX_COMPONENT];
     int heights[NVJPEG_MAX_COMPONENT];
@@ -132,9 +124,6 @@ NvJpegPythonImage* NvJpegPython_decode(NvJpegPythonHandle* handle, const unsigne
         return NULL;
     }
 
-    // nvjpegJpegStateDestroy(nv_statue);
-    // nvjpegDestroy(nv_handle);
-
     return imgdesc;
 }
 
@@ -160,12 +149,10 @@ void NvJpegPython_destoryJpegData(NvJpegJpegData** jpegData){
 
 NvJpegJpegData* NvJpegPython_encode(NvJpegPythonHandle* handle, NvJpegPythonImage* img, int quality){
     nvjpegHandle_t nv_handle = handle->nv_handle;
-    // nvjpegCreateSimple(&nv_handle);
 
     nvjpegEncoderState_t nv_enc_state = handle->nv_enc_state;
     nvjpegEncoderParams_t nv_enc_params;
 
-    // nvjpegEncoderStateCreate(nv_handle, &nv_enc_state, NULL);
     nvjpegEncoderParamsCreate(nv_handle, &nv_enc_params, NULL);
 
     nvjpegEncoderParamsSetQuality(nv_enc_params, quality, NULL);
@@ -181,8 +168,6 @@ NvJpegJpegData* NvJpegPython_encode(NvJpegPythonHandle* handle, NvJpegPythonImag
     nvjpegEncodeRetrieveBitstream(nv_handle, nv_enc_state, jpegData->data, &(jpegData->size), NULL);
 
     nvjpegEncoderParamsDestroy(nv_enc_params);
-    // nvjpegEncoderStateDestroy(nv_enc_state);
-    // nvjpegDestroy(nv_handle);
     return jpegData;
 }
 
@@ -196,7 +181,7 @@ int NvJpegPython_test(char* inputJpegFilePath, char* outputRawPath, char* output
         return -1;
     }
 
-    NvJpegPythonHandle* handle = NvJpegPython_createHandle();
+    NvJpegPythonHandle* handle = NvJpegPython_startUpEnv();
     FILE* fp = fopen(inputJpegFilePath, "rb");
     unsigned char* jpegData = (unsigned char*)malloc(fileInfo.st_size);
     size_t size = fread(jpegData, 1, fileInfo.st_size, fp);
@@ -239,7 +224,7 @@ int NvJpegPython_test(char* inputJpegFilePath, char* outputRawPath, char* output
     NvJpegPython_destoryImage(&img);
     NvJpegPython_destoryJpegData(&jd);
 
-    NvJpegPython_destoryHandle(&handle);
+    NvJpegPython_cleanUpEnv();
     return 0;
 }
 
@@ -270,13 +255,11 @@ static PyMemberDef NvJpeg_DataMembers[] =
 
 static void NvJpeg_init(NvJpeg* Self, PyObject* pArgs)
 {
-    Self->m_handle = (long long)(NvJpegPython_createHandle());
+    Self->m_handle = (long long)(NvJpegPython_startUpEnv());
 }
 
 static void NvJpeg_Destruct(NvJpeg* Self)
 {
-    NvJpegPythonHandle* m_handle = (NvJpegPythonHandle*)Self->m_handle;
-    NvJpegPython_destoryHandle(&m_handle);
     Py_TYPE(Self)->tp_free((PyObject*)Self);
 }
 
@@ -347,7 +330,6 @@ static PyObject* NvJpeg_encode(NvJpeg* Self, PyObject* Argvs)
 
     NvJpegJpegData* data = NvJpegPython_encode(m_handle, img, quality);
 
-    // PyObject* rtn = PyByteArray_FromStringAndSize((const char*)data->data, data->size);
     PyObject* rtn = PyBytes_FromStringAndSize((const char*)data->data, data->size);
 
     NvJpegPython_destoryJpegData(&data);
@@ -472,14 +454,18 @@ static PyTypeObject NvJpeg_ClassInfo =
         NULL,
 };
 
+void NvJpeg_module_destroy(void *_){
+    NvJpegPython_cleanUpEnv();
+}
 
 static PyModuleDef ModuleInfo =
 {
         PyModuleDef_HEAD_INIT,
         "NvJpeg Module",
         "NvJpeg by Nvjpeg",
         -1,
-        NULL, NULL, NULL, NULL, NULL
+        NULL, NULL, NULL, NULL,
+        NvJpeg_module_destroy
 };
 
 PyMODINIT_FUNC
@@ -501,5 +487,4 @@ PyInit_nvjpeg(void) {
     return pReturn;
 }
 
-
 #endif

setup.py

@@ -9,7 +9,7 @@
 
 from distutils.core import setup, Extension
 setup(name='pynvjpeg',
-    version='0.0.8',
+    version='0.0.9',
     ext_modules=[Extension('nvjpeg', ['nvjpeg-python.c'])],
     author="Usingnet",
     author_email="developer@usingnet.com",