From 5410446ade40493d17f7e2d7f0d687b0998acc6a Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 27 一月 2021 11:56:54 +0800
Subject: [PATCH] timeout wait 合一
---
test_net_socket/test_net_mod_socket.cpp | 93 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 83 insertions(+), 10 deletions(-)
diff --git a/test_net_socket/test_net_mod_socket.cpp b/test_net_socket/test_net_mod_socket.cpp
index a1a47ec..46b8be2 100644
--- a/test_net_socket/test_net_mod_socket.cpp
+++ b/test_net_socket/test_net_mod_socket.cpp
@@ -5,6 +5,7 @@
#include "shm_mm_wrapper.h"
#include "usg_common.h"
#include <getopt.h>
+#include "logger_factory.h"
#define SCALE 100000
@@ -141,7 +142,7 @@
int remote_port;
while ( (rv = net_mod_socket_recvfrom(client, &recvbuf, &size, &remote_port) ) == 0) {
// printf( "server: RECEIVED REQUEST FROM PORT %d NAME %s\n", remote_port, recvbuf);
- sprintf(sendbuf, "RECEIVED PORT %d NAME %s", remote_port, recvbuf);
+ sprintf(sendbuf, "RECEIVED锛� %s", recvbuf);
net_mod_socket_sendto(client, sendbuf, strlen(sendbuf) + 1, remote_port);
free(recvbuf);
}
@@ -194,7 +195,7 @@
n = net_mod_socket_sendandrecv_timeout(client, node_arr, node_arr_size, content, strlen(content), &recv_arr, &recv_arr_size, 1000);
printf(" %d nodes reply\n", n);
for(i=0; i<recv_arr_size; i++) {
- printf("host:%s, port: %d, key:%d, content: %s\n",
+ printf("reply from (host:%s, port: %d, key:%d) >> %s\n",
recv_arr[i].host,
recv_arr[i].port,
recv_arr[i].key,
@@ -247,7 +248,8 @@
Targ *targ = (Targ *)arg;
char sendbuf[512];
- int i,j, n, recv_arr_size;
+ int i,j, n;
+ int recv_arr_size;
net_mod_recv_msg_t *recv_arr;
int total = 0;
@@ -271,7 +273,7 @@
n = net_mod_socket_sendandrecv_timeout(client, node_arr, node_arr_size, sendbuf, strlen(sendbuf) + 1, &recv_arr, &recv_arr_size, 1000);
printf("%d: send %d nodes\n", i, n);
for(j=0; j < recv_arr_size; j++) {
- fprintf(fp, "reply: host:%s, port: %d, key:%d, content: %s\n",
+ fprintf(fp, "reply from (host:%s, port: %d, key:%d) >> %s\n",
recv_arr[j].host,
recv_arr[j].port,
recv_arr[j].key,
@@ -287,9 +289,10 @@
return (void *)total;
}
+//澶氱嚎绋媠end
void test_net_sendandrecv_threads(char *nodelist) {
- int status, i = 0, processors = 1;
+ int status, i = 0, processors = 4;
void *res[processors];
// Targ *targs = (Targ *)calloc(processors, sizeof(Targ));
Targ targs[processors];
@@ -326,10 +329,42 @@
}
+// 鏃犻檺寰幆send
+void test_net_sendandrecv(char *nodelist) {
+
+ int n, i;
+ void * client;
+ int recv_arr_size;
+ net_mod_recv_msg_t *recv_arr;
+ net_node_t *node_arr;
+ int node_arr_size = parse_node_list(nodelist, &node_arr);
+ char content[128];
+
+ sprintf(content, "pid:%ld say Hello!!", (long)getpid());
+ client = net_mod_socket_open();
+ while(true) {
+ n = net_mod_socket_sendandrecv_timeout(client, node_arr, node_arr_size, content, strlen(content), &recv_arr, &recv_arr_size, 1000);
+ printf(" %d nodes reply\n", n);
+ for(i=0; i<recv_arr_size; i++) {
+ LoggerFactory::getLogger()->debug("reply from (host:%s, port: %d, key:%d) >> %s\n",
+ recv_arr[i].host,
+ recv_arr[i].port,
+ recv_arr[i].key,
+ recv_arr[i].content
+ );
+ }
+
+ // 浣跨敤瀹屽悗锛屼笉瑕佸繕璁伴噴鏀炬帀
+ net_mod_socket_free_recv_msg_arr(recv_arr, recv_arr_size);
+ }
+
+ net_mod_socket_close(client);
+
+}
void *_run_pub_(void *arg) {
Targ *targ = (Targ *)arg;
- char sendbuf[512];
+ char sendbuf[128];
int i,j, n;
int total = 0;
@@ -338,9 +373,6 @@
int node_arr_size = parse_node_list(targ->nodelist, &node_arr);
char *topic = "news";
-
-
-
// char filename[512];
// sprintf(filename, "test%d.tmp", targ->id);
// FILE *fp = NULL;
@@ -353,7 +385,7 @@
n = net_mod_socket_pub(client, node_arr, node_arr_size, topic, strlen(topic)+1, sendbuf, strlen(sendbuf)+1);
// n = net_mod_socket_pub(client, node_arr, node_arr_size, sendbuf, strlen(sendbuf) + 1, &recv_arr, &recv_arr_size);
- printf( "pub:%s to %d nodes\n", sendbuf, n);
+ LoggerFactory::getLogger()->debug( "pub:%s to %d nodes\n", sendbuf, n);
total += n;
}
// fclose(fp);
@@ -361,6 +393,7 @@
return (void *)total;
}
+//澶氱嚎绋媝ub
void test_net_pub_threads(char *nodelist) {
int status, i = 0, processors = 4;
@@ -399,6 +432,28 @@
// fflush(stdout);
net_mod_socket_close(client);
}
+
+// 鏃犻檺寰幆pub
+void test_net_pub(char *nodelist) {
+
+ int n;
+ char sendbuf[512];
+ net_node_t *node_arr;
+ int node_arr_size = parse_node_list(nodelist, &node_arr);
+
+ char *topic = "news";
+ sprintf(sendbuf, "pid:%ld: Good news!!", (long)getpid());
+
+ void * client = net_mod_socket_open();
+ while (true) {
+ n = net_mod_socket_pub(client, node_arr, node_arr_size, topic, strlen(topic)+1, sendbuf, strlen(sendbuf)+1);
+ // n = net_mod_socket_pub(client, node_arr, node_arr_size, sendbuf, strlen(sendbuf) + 1, &recv_arr, &recv_arr_size);
+ LoggerFactory::getLogger()->debug( "pub to %d nodes\n", n);
+ }
+ net_mod_socket_close(client);
+}
+
+
@@ -456,6 +511,15 @@
test_net_sendandrecv_threads(opt.sendlist);
}
+ else if (strcmp("test_net_sendandrecv", opt.fun) == 0) {
+ if(opt.sendlist == 0) {
+ fprintf(stderr, "Missing sendlist .\n");
+ usage(argv[0]);
+ exit(1);
+ }
+
+ test_net_sendandrecv(opt.sendlist);
+ }
else if (strcmp("test_net_pub_threads", opt.fun) == 0) {
if(opt.publist == 0) {
fprintf(stderr, "Missing publist .\n");
@@ -465,6 +529,15 @@
test_net_pub_threads(opt.publist);
}
+ else if (strcmp("test_net_pub", opt.fun) == 0) {
+ if(opt.publist == 0) {
+ fprintf(stderr, "Missing publist .\n");
+ usage(argv[0]);
+ exit(1);
+ }
+
+ test_net_pub(opt.publist);
+ }
else {
usage(argv[0]);
--
Gitblit v1.8.0