From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit
---
test_socket/bus_test.cpp | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/test_socket/bus_test.cpp b/test_socket/bus_test.cpp
index 3d3b776..8d630b6 100644
--- a/test_socket/bus_test.cpp
+++ b/test_socket/bus_test.cpp
@@ -4,8 +4,10 @@
#include "usg_common.h"
#include "mm.h"
#include "logger_factory.h"
-static Logger *logger = LoggerFactory::getLogger();
+
+#include "bus_error.h"
+static Logger *logger = LoggerFactory::getLogger();
BusServerSocket * server_socket;
void sigint_handler(int sig) {
@@ -27,14 +29,24 @@
void *recvbuf;
int size;
int key;
- struct timespec timeout = {2, 0};
+
+ int rv;
ShmModSocket *sk = (ShmModSocket *)skptr;
- while ( true) {
- logger->debug("=========run_recv=====");
- sk->recvfrom_timeout( &recvbuf, &size, &key, &timeout);
- printf("鏀跺埌璁㈤槄娑堟伅:%s\n", recvbuf);
- free(recvbuf);
+ 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;
}
@@ -42,18 +54,23 @@
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++);
+ // scanf("%s", action);
+ std::cin >> action;
if(strcmp(action, "sub") == 0) {
printf("Please input topic!\n");
scanf("%s", topic);
--
Gitblit v1.8.0