From 2c77d385d949f32f41bd4d10ac814b0cca5a9835 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 17:27:01 +0800
Subject: [PATCH] update
---
test_socket/bus_test.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/test_socket/bus_test.cpp b/test_socket/bus_test.cpp
index b815476..a186d7f 100644
--- a/test_socket/bus_test.cpp
+++ b/test_socket/bus_test.cpp
@@ -3,6 +3,10 @@
#include "shm_mm_wrapper.h"
#include "usg_common.h"
#include "mm.h"
+#include "logger_factory.h"
+#include "bus_error.h"
+
+static Logger *logger = LoggerFactory::getLogger();
BusServerSocket * server_socket;
void sigint_handler(int sig) {
@@ -24,31 +28,61 @@
void *recvbuf;
int size;
int key;
+ int rv;
ShmModSocket *sk = (ShmModSocket *)skptr;
- while ( true) {
- sk->recvfrom( &recvbuf, &size, &key);
- printf("鏀跺埌璁㈤槄娑堟伅:%s\n", recvbuf);
- free(recvbuf);
+printf("run_recv\n");
+ struct timespec timeout = {2, 0};
+ while (true) {
+ printf("run_recv before\n");
+
+ // rv = sk->recvfrom_timeout( &recvbuf, &size, &key, &timeout);
+ rv = sk->recvfrom( &recvbuf, &size, &key);
+ if(rv == 0) {
+ printf("鏀跺埌璁㈤槄娑堟伅:%s\n", recvbuf);
+ free(recvbuf);
+ } else {
+ printf("recvfrom error %d\n", rv);
+ }
+
}
+ return NULL;
+}
+
+void *run_recv2(void *skptr) {
+ pthread_detach(pthread_self());
+ while(true) {
+ logger->debug("================run_recv\n");
+ // sleep(1);
+ }
+}
+
+void client2(int key) {
+ ShmModSocket *sk = new ShmModSocket();
+ run_recv((void *)sk);
}
void client(int key) {
ShmModSocket *sk = new ShmModSocket();
pthread_t tid;
- pthread_create(&tid, NULL, run_recv, (void *)sk);
+
int size;
char action[512];
char topic[512];
char content[512];
long i = 0;
+
+ pthread_create(&tid, NULL, run_recv, (void *)sk);
+
while (true) {
//printf("Usage: pub <topic> [content] or sub <topic>\n");
- printf("Can I help you? sub, pub, desub or quit\n");
- scanf("%s",action);
-
+ printf("Can I help you? sub, pub, desub or quit %d\n", i++);
+ printf("client 1\n");
+ // scanf("%s", action);
+ std::cin >> action;
+ printf("client 2\n");
if(strcmp(action, "sub") == 0) {
printf("Please input topic!\n");
scanf("%s", topic);
--
Gitblit v1.8.0