@@ -272,8 +272,6 @@ int PyWrapper::wrapperOnceExec(const char *usrTag, std::map <std::string, std::s
272
272
}
273
273
ptr = PyBytes_AsString (itemData.data .ptr ());
274
274
Py_ssize_t size = PyBytes_GET_SIZE (itemData.data .ptr ());
275
- printf (" GetSIze, %d" , size);
276
- printf (" item data len: %d" , itemData.len );
277
275
memcpy (pr, ptr, itemData.len );
278
276
// char *data_ = new char[itemData.data.length()+1];
279
277
// strdup(.c_str());
@@ -286,9 +284,10 @@ int PyWrapper::wrapperOnceExec(const char *usrTag, std::map <std::string, std::s
286
284
curPtr->next = tmpData;
287
285
curPtr = tmpData;
288
286
}
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 ,
291
289
tmpData->status , sid);
290
+
292
291
}
293
292
*respData = headPtr;
294
293
}
@@ -417,6 +416,7 @@ int PyWrapper::wrapperRead(char *handle, pDataList *respData, std::string sid) {
417
416
resp = r.cast <Response *>();
418
417
pDataList headPtr;
419
418
pDataList curPtr;
419
+ char *ptr;
420
420
// 先判断python有没有抛出错误. response中的 errorCode
421
421
if (resp->errCode != 0 ) {
422
422
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) {
445
445
spdlog::get (" stderr_console" )->error (" can't malloc memory for data, sid:{}" , sid);
446
446
return ret;
447
447
}
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);
449
451
// char *data_ = new char[itemData.data.length()+1];
450
452
// strdup(.c_str());
451
453
tmpData->data = pr;
@@ -457,8 +459,8 @@ int PyWrapper::wrapperRead(char *handle, pDataList *respData, std::string sid) {
457
459
curPtr->next = tmpData;
458
460
curPtr = tmpData;
459
461
}
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 ,
462
464
tmpData->status , sid);
463
465
}
464
466
*respData = headPtr;
@@ -483,7 +485,7 @@ int PyWrapper::wrapperDestroy(std::string sid) {
483
485
int PyWrapper::wrapperExecFree (const char *usrTag) {
484
486
std::string sid = GetSidByUsrTag (usrTag);
485
487
if (sid != " " )
486
- DelSidUsrTag (sid);
488
+ DelSidUsrTag (sid);
487
489
return 0 ;
488
490
}
489
491
@@ -541,7 +543,7 @@ int callBack(Response *resp, std::string sid) {
541
543
spdlog::get (" stderr_console" )->error (" find error from python: {}" , resp->errCode );
542
544
return resp->errCode ;
543
545
}
544
- char * ptr;
546
+ char * ptr;
545
547
int dataSize = resp->list .size ();
546
548
if (dataSize == 0 ) {
547
549
spdlog::get (" stderr_console" )->error (" error, not find any data from resp" );
@@ -564,9 +566,9 @@ int callBack(Response *resp, std::string sid) {
564
566
spdlog::get (" stderr_console" )->error (" can't malloc memory for data, sid:{}" , sid);
565
567
return ret;
566
568
}
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 );
570
572
// 还是有问题::memcpy(pr, (const void *) itemData.data.ptr(), itemData.len);
571
573
// char *data_ = new char[itemData.data.length()+1];
572
574
// strdup(.c_str());
@@ -579,8 +581,8 @@ int callBack(Response *resp, std::string sid) {
579
581
curPtr->next = tmpData;
580
582
curPtr = tmpData;
581
583
}
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 ,
584
586
tmpData->status , sid);
585
587
}
586
588
@@ -650,7 +652,7 @@ void DelHandleSid(char *handle) {
650
652
651
653
void DelSidCallback (std::string sid) {
652
654
RECORD_MUTEX.lock ();
653
-
655
+
654
656
SID_CB.erase (sid);
655
657
RECORD_MUTEX.unlock ();
656
658
}
0 commit comments