From 98d6460918ee7918fa591e12ed0698b14e539c9d Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 01 三月 2021 16:03:35 +0800
Subject: [PATCH] update
---
test_net_socket/CMakeLists.txt | 5 ++++-
src/CMakeLists.txt | 13 +++++++++++++
test/test1.cpp | 2 ++
src/socket/shm_socket.cpp | 2 +-
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9026d92..51184f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,6 +52,19 @@
target_link_libraries(shm_queue PUBLIC ${EXTRA_LIBS} )
+
+if (BUILD_SHARED_LIBS)
+ add_custom_command(
+ OUTPUT ${PROJECT_BINARY_DIR}/lib/libshm_queue.so.md5
+ COMMAND md5sum ${PROJECT_BINARY_DIR}/lib/libshm_queue.so > ${PROJECT_BINARY_DIR}/lib/libshm_queue.so.md5
+ DEPENDS ${PROJECT_BINARY_DIR}/lib/libshm_queue.so
+ COMMENT "Generate libshm_queue.so.md5"
+ VERBATIM
+ )
+
+ add_custom_target("genmd5" ALL DEPENDS ${PROJECT_BINARY_DIR}/lib/libshm_queue.so.md5)
+endif()
+
# install rules
install(TARGETS shm_queue DESTINATION lib)
install(FILES
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 562682e..94b3fdd 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -325,7 +325,7 @@
const int send_size, const int key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags) {
- int rv, tryn = 6;
+ int rv, tryn = 16;
shm_packet_t sendpak;
shm_packet_t recvpak;
std::map<std::string, shm_packet_t>::iterator recvbufIter;
diff --git a/test/test1.cpp b/test/test1.cpp
index 136fb50..8c4b1f2 100644
--- a/test/test1.cpp
+++ b/test/test1.cpp
@@ -28,6 +28,8 @@
{
printf("===%d, %d \n", sizeof(cm_con_data_t), sizeof(cm_con_data2_t));
+
+
/* SIGQUIT here will terminate with core file */
}
\ No newline at end of file
diff --git a/test_net_socket/CMakeLists.txt b/test_net_socket/CMakeLists.txt
index 8abb1c2..748642c 100644
--- a/test_net_socket/CMakeLists.txt
+++ b/test_net_socket/CMakeLists.txt
@@ -3,11 +3,14 @@
OUTPUT ${PROJECT_BINARY_DIR}/bin/net_mod_socket.sh
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/net_mod_socket.sh ${PROJECT_BINARY_DIR}/bin/net_mod_socket.sh
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/net_mod_socket.sh
+ VERBATIM
)
+
+add_custom_target("net_mod_socket.sh" ALL DEPENDS ${PROJECT_BINARY_DIR}/bin/net_mod_socket.sh)
# add the executable
-add_executable(shm_util shm_util.cpp ${PROJECT_BINARY_DIR}/bin/net_mod_socket.sh)
+add_executable(shm_util shm_util.cpp )
target_link_libraries(shm_util PRIVATE shm_queue ${EXTRA_LIBS} )
target_include_directories(shm_util PRIVATE
"${PROJECT_BINARY_DIR}"
--
Gitblit v1.8.0