From e924ba2fc0f4e57aae032fade3a566c2019f4630 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 29 一月 2021 09:52:30 +0800
Subject: [PATCH] update
---
test_net_socket/test_net_mod_socket.cpp | 155 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 129 insertions(+), 26 deletions(-)
diff --git a/test_net_socket/test_net_mod_socket.cpp b/test_net_socket/test_net_mod_socket.cpp
index a1a47ec..53ccdd9 100644
--- a/test_net_socket/test_net_mod_socket.cpp
+++ b/test_net_socket/test_net_mod_socket.cpp
@@ -1,3 +1,4 @@
+#include <assert.h>
#include "net_mod_server_socket_wrapper.h"
#include "net_mod_socket_wrapper.h"
#include "bus_server_socket_wrapper.h"
@@ -5,12 +6,13 @@
#include "shm_mm_wrapper.h"
#include "usg_common.h"
#include <getopt.h>
+#include "logger_factory.h"
#define SCALE 100000
typedef struct Targ {
char *nodelist;
- int id;
+ long id;
}Targ;
@@ -27,7 +29,7 @@
argument_t parse_args (int argc, char *argv[]);
void usage(char *name);
-int parse_node_list(char *str, net_node_t *node_arr_addr[]) ;
+int parse_node_list(const char *str, net_node_t *node_arr_addr[]) ;
void print_node_list(net_node_t *node_arr, int len);
@@ -141,7 +143,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, "%s", recvbuf);
net_mod_socket_sendto(client, sendbuf, strlen(sendbuf) + 1, remote_port);
free(recvbuf);
}
@@ -194,7 +196,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,
@@ -245,16 +247,21 @@
void *_run_sendandrecv_(void *arg) {
Targ *targ = (Targ *)arg;
- char sendbuf[512];
+ char sendbuf[128];
- int i,j, n, recv_arr_size;
+ int j, n;
+ int recv_arr_size;
net_mod_recv_msg_t *recv_arr;
int total = 0;
- void *client = net_mod_socket_open();
+
net_node_t *node_arr;
int node_arr_size = parse_node_list(targ->nodelist, &node_arr);
+ long rtid;
+ unsigned int l = 0 , rl;
+ const char *hello_format = "%ld say Hello %d";
+
char filename[512];
sprintf(filename, "test%d.tmp", targ->id);
@@ -264,32 +271,41 @@
int recvsize;
void *recvbuf;
- for (i = 0; i < SCALE; i++) {
- sprintf(sendbuf, "thread(%d) %d", targ->id, i);
- fprintf(fp, "requst:%s\n", sendbuf);
+ for (l = 0; l < SCALE; l++) {
+ sprintf(sendbuf, hello_format, targ->id, l);
+ // fprintf(fp, "requst:%s\n", sendbuf);
// n = net_mod_socket_sendandrecv(client, node_arr, node_arr_size, sendbuf, strlen(sendbuf) + 1, &recv_arr, &recv_arr_size);
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);
+ printf("%d: send %d nodes\n", l, n);
for(j=0; j < recv_arr_size; j++) {
- fprintf(fp, "reply: host:%s, port: %d, key:%d, content: %s\n",
- recv_arr[j].host,
- recv_arr[j].port,
- recv_arr[j].key,
- recv_arr[j].content
- );
+
+ fprintf(fp, "%ld send '%s'. received '%s' from (host:%s, port: %d, key:%d) \n",
+ targ->id,
+ sendbuf,
+ recv_arr[j].content,
+ recv_arr[j].host,
+ recv_arr[j].port,
+ recv_arr[j].key
+
+ );
+
+ assert(sscanf((const char *)recv_arr[j].content, hello_format, &rtid, &rl) == 2);
+ assert(rtid == targ->id);
+ assert(rl == l);
}
// 浣跨敤瀹屽悗锛屼笉瑕佸繕璁伴噴鏀炬帀
net_mod_socket_free_recv_msg_arr(recv_arr, recv_arr_size);
total += n;
}
fclose(fp);
- net_mod_socket_close(client);
+ // net_mod_socket_close(client);
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];
@@ -298,6 +314,7 @@
struct timeval start, end;
long total = 0;
+ client = net_mod_socket_open();
printf("寮�濮嬫祴璇�...\n");
gettimeofday(&start, NULL);
@@ -326,10 +343,58 @@
}
+// 鏃犻檺寰幆send
+void test_net_sendandrecv(char *nodelist) {
+
+ int n, j;
+ 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 buf[128];
+ pid_t pid, rpid ;
+ unsigned int l , rl;
+ const char *hello_format = "%ld say Hello %u";
+
+ pid = getpid();
+ l = 0;
+
+ client = net_mod_socket_open();
+ while(true) {
+ sprintf(buf, hello_format, (long)pid, l);
+ n = net_mod_socket_sendandrecv_timeout(client, node_arr, node_arr_size, buf, strlen(buf)+1,
+ &recv_arr, &recv_arr_size, 1000);
+ printf(" %d nodes reply\n", n);
+ for(j = 0; j < recv_arr_size; j++) {
+
+ LoggerFactory::getLogger()->debug("%ld send '%s'. received '%s' from (host:%s, port: %d, key:%d) \n",
+ (long)pid,
+ buf,
+ recv_arr[j].content,
+ recv_arr[j].host,
+ recv_arr[j].port,
+ recv_arr[j].key
+
+ );
+
+ assert(sscanf((const char *)recv_arr[j].content, hello_format, &rpid, &rl) == 2);
+ assert(rpid == pid);
+ assert(rl == l);
+ }
+
+ // 浣跨敤瀹屽悗锛屼笉瑕佸繕璁伴噴鏀炬帀
+ net_mod_socket_free_recv_msg_arr(recv_arr, recv_arr_size);
+ l++;
+ }
+
+ 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 +403,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;
@@ -349,11 +411,11 @@
for (i = 0; i < SCALE; i++) {
- sprintf(sendbuf, "thread(%d) %d", targ->id, i);
+ sprintf(sendbuf, "thread(%ld) %d", targ->id, i);
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 +423,7 @@
return (void *)total;
}
+//澶氱嚎绋媝ub
void test_net_pub_threads(char *nodelist) {
int status, i = 0, processors = 4;
@@ -399,6 +462,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 +541,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");
@@ -464,6 +558,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 {
@@ -619,7 +722,7 @@
* }
* @return 鏁扮粍鐨勯暱搴�
*/
-int parse_node_list(char *str, net_node_t *node_arr_addr[]) {
+int parse_node_list(const char *str, net_node_t *node_arr_addr[]) {
int i, j;
char **property_arr;
int property_arr_len;
--
Gitblit v1.8.0