destroy logic

Author: whybeyoung

pyWrapper.cpp

@@ -128,6 +128,7 @@ PyWrapper::PyWrapper() {
     _wrapperCreate = _obj.attr("wrapperCreate");
     _wrapperWrite = _obj.attr("wrapperWrite");
     _wrapperRead = _obj.attr("wrapperRead");
+    _wrapperDestroy = _obj.attr("wrapperDestroy");
     _wrapperTest = _obj.attr("wrapperTestFunc");
 
     py::gil_scoped_release release;
@@ -521,10 +522,14 @@ int PyWrapper::wrapperRead(char *handle, pDataList *respData, std::string sid) {
     return 0;
 }
 
-int PyWrapper::wrapperDestroy(std::string sid) {
+int PyWrapper::wrapperDestroy(std::string sid, char * handle) {
     DelSidCallback(sid);
     DelSidUsrTag(sid);
-    return 0;
+    py::object r = _wrapperDestroy(handle);
+    // 此段根据python的返回 ，回写 respData
+    spdlog::info("Destroy .. thread_id: {}, sid: {}", gettid(), sid);
+    ret = r.cast<int>();
+    return ret;
 }
 
 int PyWrapper::wrapperExecFree(const char *usrTag) {

pyWrapper.h

@@ -142,7 +142,7 @@ class PyWrapper {
 
     int wrapperRead(char *handle, pDataList *respData, std::string sid);
 
-    int wrapperDestroy(std::string sid);
+    int wrapperDestroy(std::string sid, char * handle);
 
     int wrapperExecFree(const char *usrTag);
 
@@ -166,6 +166,8 @@ class PyWrapper {
     py::object _wrapperOnceExecAsync;
     py::object _wrapperError;
     py::object _wrapperCreate;
+    py::object _wrapperDestroy;
+
     py::object _wrapperWrite;
     py::object _wrapperRead;
     py::object _wrapperLoadRes;

wrapper.cpp

@@ -286,8 +286,9 @@ int WrapperAPI wrapperRead(const void *handle, pDataList *respData) {
 
 int WrapperAPI wrapperDestroy(const void *handle) {
     int ret = 0;
+    py::gil_scoped_acquire acquire;
     std::string sid = GetHandleSid((char *) handle);
-    ret = pyWrapper->wrapperDestroy(sid);
+    ret = pyWrapper->wrapperDestroy(sid, (char *) handle);
     if (ret != 0) {
         spdlog::get("stderr_console")->error("wrapper destroy error!");
     }