From e1bea2c6430ddadd589fd3377b69ca06226bb872 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期一, 08 二月 2021 11:52:53 +0800 Subject: [PATCH] update --- src/CMakeLists.txt | 5 +++-- src/shm/shm_mm_wrapper.cpp | 2 ++ src/bus_error.cpp | 2 +- src/socket/shm_socket.cpp | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c47e209..fcaf0c6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,10 +30,11 @@ if (BUILD_SHARED_LIBS) add_library(shm_queue SHARED ${_SOURCES_}) else() - add_library(shm_queue STATIC ${_SOURCES_}) + add_library(shm_queue SHARED ${_SOURCES_}) endif() -#add_library(shm_queue ${_SOURCES_}) +# STATIC +# add_library(shm_queue ${_SOURCES_}) target_include_directories(shm_queue PUBLIC ${EXTRA_INCLUDES} ) diff --git a/src/bus_error.cpp b/src/bus_error.cpp index 5752cfd..913a771 100644 --- a/src/bus_error.cpp +++ b/src/bus_error.cpp @@ -11,7 +11,7 @@ static pthread_key_t strerrorKey; -static char *_bus_errlist[_bus_nerr] = { +static const char *_bus_errlist[_bus_nerr] = { "\0", "Timed out", "The other end is not inline", diff --git a/src/shm/shm_mm_wrapper.cpp b/src/shm/shm_mm_wrapper.cpp index 6560f83..59487c6 100644 --- a/src/shm/shm_mm_wrapper.cpp +++ b/src/shm/shm_mm_wrapper.cpp @@ -31,6 +31,7 @@ if(difftime(time(NULL), mqueue->getCreateTime()) > BUFFER_TIME ) { delete mqueue; hashtable_remove(hashtable, keys[i]); + LoggerFactory::getLogger()->debug("remove queue %d", keys[i]); count++; } @@ -62,6 +63,7 @@ if(difftime(time(NULL), mqueue->getCreateTime()) > BUFFER_TIME ) { delete mqueue; hashtable_remove(hashtable, *keyItr); + LoggerFactory::getLogger()->debug("remove queue %d", *keyItr); count++; } diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp index c0ddeee..82eaa1f 100644 --- a/src/socket/shm_socket.cpp +++ b/src/socket/shm_socket.cpp @@ -418,12 +418,13 @@ void *_buf = malloc(recvpak.size); memcpy(_buf, recvpak.buf, recvpak.size); *recv_buf = _buf; + mm_free(recvpak.buf); } if(recv_size != NULL) *recv_size = recvpak.size; - mm_free(recvpak.buf); + return 0; @@ -524,12 +525,13 @@ void *_buf = malloc(recvpak.size); memcpy(_buf, recvpak.buf, recvpak.size); *recv_buf = _buf; + mm_free(recvpak.buf); } if(recv_size != NULL) *recv_size = recvpak.size; - mm_free(recvpak.buf); + return 0; } -- Gitblit v1.8.0