@@ -272,8 +272,6 @@ int PyWrapper::wrapperOnceExec(const char *usrTag, std::map <std::string, std::s
272272 }
273273 ptr = PyBytes_AsString (itemData.data .ptr ());
274274 Py_ssize_t size = PyBytes_GET_SIZE (itemData.data .ptr ());
275- printf (" GetSIze, %d" , size);
276- printf (" item data len: %d" , itemData.len );
277275 memcpy (pr, ptr, itemData.len );
278276 // char *data_ = new char[itemData.data.length()+1];
279277 // strdup(.c_str());
@@ -286,9 +284,10 @@ int PyWrapper::wrapperOnceExec(const char *usrTag, std::map <std::string, std::s
286284 curPtr->next = tmpData;
287285 curPtr = tmpData;
288286 }
289- spdlog::debug (" get result,key:{},data:{},len:{},type:{},status:{},sid:{}" ,
290- tmpData->key , (char *) tmpData->data , tmpData->len , tmpData->type ,
287+ spdlog::debug (" get result,key:{},data:{},len:{},size:{}, type:{},status:{},sid:{}" ,
288+ tmpData->key , (char *) tmpData->data , tmpData->len , size, tmpData->type ,
291289 tmpData->status , sid);
290+
292291 }
293292 *respData = headPtr;
294293 }
@@ -417,6 +416,7 @@ int PyWrapper::wrapperRead(char *handle, pDataList *respData, std::string sid) {
417416 resp = r.cast <Response *>();
418417 pDataList headPtr;
419418 pDataList curPtr;
419+ char *ptr;
420420 // 先判断python有没有抛出错误. response中的 errorCode
421421 if (resp->errCode != 0 ) {
422422 spdlog::get (" stderr_console" )->error (" find error from python: {}" , resp->errCode );
@@ -445,7 +445,9 @@ int PyWrapper::wrapperRead(char *handle, pDataList *respData, std::string sid) {
445445 spdlog::get (" stderr_console" )->error (" can't malloc memory for data, sid:{}" , sid);
446446 return ret;
447447 }
448- memcpy (pr, (const void *) itemData.data .ptr (), itemData.len );
448+ ptr = PyBytes_AsString (itemData.data .ptr ());
449+ Py_ssize_t size = PyBytes_GET_SIZE (itemData.data .ptr ());
450+ memcpy (pr, ptr, size);
449451 // char *data_ = new char[itemData.data.length()+1];
450452 // strdup(.c_str());
451453 tmpData->data = pr;
@@ -457,8 +459,8 @@ int PyWrapper::wrapperRead(char *handle, pDataList *respData, std::string sid) {
457459 curPtr->next = tmpData;
458460 curPtr = tmpData;
459461 }
460- spdlog::debug (" get result,key:{},data:{},len:{},type:{},status:{},sid:{}" ,
461- tmpData->key , (char *) tmpData->data , tmpData->len , tmpData->type ,
462+ spdlog::debug (" callback result,key:{},data:{},len:{},size, {},type:{},status:{},sid:{}" ,
463+ tmpData->key , (char *) tmpData->data , tmpData->len , size, tmpData->type ,
462464 tmpData->status , sid);
463465 }
464466 *respData = headPtr;
@@ -483,7 +485,7 @@ int PyWrapper::wrapperDestroy(std::string sid) {
483485int PyWrapper::wrapperExecFree (const char *usrTag) {
484486 std::string sid = GetSidByUsrTag (usrTag);
485487 if (sid != " " )
486- DelSidUsrTag (sid);
488+ DelSidUsrTag (sid);
487489 return 0 ;
488490}
489491
@@ -541,7 +543,7 @@ int callBack(Response *resp, std::string sid) {
541543 spdlog::get (" stderr_console" )->error (" find error from python: {}" , resp->errCode );
542544 return resp->errCode ;
543545 }
544- char * ptr;
546+ char * ptr;
545547 int dataSize = resp->list .size ();
546548 if (dataSize == 0 ) {
547549 spdlog::get (" stderr_console" )->error (" error, not find any data from resp" );
@@ -564,9 +566,9 @@ int callBack(Response *resp, std::string sid) {
564566 spdlog::get (" stderr_console" )->error (" can't malloc memory for data, sid:{}" , sid);
565567 return ret;
566568 }
567- ptr = PyBytes_AsString (itemData.data .ptr ());
568- Py_ssize_t size = PyBytes_GET_SIZE (itemData.data .ptr ());
569- memcpy (pr, ptr,itemData.len );
569+ ptr = PyBytes_AsString (itemData.data .ptr ());
570+ Py_ssize_t size = PyBytes_GET_SIZE (itemData.data .ptr ());
571+ memcpy (pr, ptr, itemData.len );
570572 // 还是有问题::memcpy(pr, (const void *) itemData.data.ptr(), itemData.len);
571573 // char *data_ = new char[itemData.data.length()+1];
572574 // strdup(.c_str());
@@ -579,8 +581,8 @@ int callBack(Response *resp, std::string sid) {
579581 curPtr->next = tmpData;
580582 curPtr = tmpData;
581583 }
582- spdlog::debug (" callback result,key:{},data:{},len:{},type:{},status:{},sid:{}" ,
583- tmpData->key , (char *) tmpData->data , tmpData->len , tmpData->type ,
584+ spdlog::debug (" callback result,key:{},data:{},len:{},size,{}, type:{},status:{},sid:{}" ,
585+ tmpData->key , (char *) tmpData->data , tmpData->len , size, tmpData->type ,
584586 tmpData->status , sid);
585587 }
586588
@@ -650,7 +652,7 @@ void DelHandleSid(char *handle) {
650652
651653void DelSidCallback (std::string sid) {
652654 RECORD_MUTEX.lock ();
653-
655+
654656 SID_CB.erase (sid);
655657 RECORD_MUTEX.unlock ();
656658}
0 commit comments