From 14be935a4f8231233487d510c8db0b544bcf0f69 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 17:40:29 +0800
Subject: [PATCH] fix conflict
---
test_net_socket/heart_beat.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test_net_socket/heart_beat.cpp b/test_net_socket/heart_beat.cpp
index 40ea621..cd21a84 100644
--- a/test_net_socket/heart_beat.cpp
+++ b/test_net_socket/heart_beat.cpp
@@ -15,9 +15,9 @@
void sigint_handler(int sig) {
// net_mod_socket_close(server_socket);
- printf("===Catch sigint======================\n");
- shm_mm_wrapper_destroy();
- exit(0);
+ // printf("===Catch sigint======================\n");
+ // shm_mm_wrapper_destroy();
+ // exit(0);
}
void server(int port) {
@@ -65,7 +65,7 @@
void *runclient(void *arg) {
- signal(SIGINT, sigint_handler);
+ // signal(SIGINT, sigint_handler);
Targ *targ = (Targ *)arg;
int port = targ->port;
void *client = net_mod_socket_open();
--
Gitblit v1.8.0