From dd0714b75b2e29087e3cd1184995bf38a453d833 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 01 二月 2021 17:36:13 +0800
Subject: [PATCH] update
---
test_net_socket/test_net_mod_socket.cpp | 119 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 72 insertions(+), 47 deletions(-)
diff --git a/test_net_socket/test_net_mod_socket.cpp b/test_net_socket/test_net_mod_socket.cpp
index 53ccdd9..79f102a 100644
--- a/test_net_socket/test_net_mod_socket.cpp
+++ b/test_net_socket/test_net_mod_socket.cpp
@@ -11,6 +11,7 @@
#define SCALE 100000
typedef struct Targ {
+ net_node_t *node;
char *nodelist;
long id;
@@ -80,7 +81,7 @@
int key;
int rv;
while ((rv = net_mod_socket_recvfrom( sockt, &recvbuf, &size, &key) ) == 0) {
- printf("鏀跺埌璁㈤槄娑堟伅:%s\n", recvbuf);
+ printf("鏀跺埌璁㈤槄娑堟伅:%s\n", (char *)recvbuf);
free(recvbuf);
}
@@ -134,17 +135,17 @@
void start_reply(int key) {
printf("start reply\n");
- void *client = net_mod_socket_open();
- net_mod_socket_bind(client, key);
+ void *ser = net_mod_socket_open();
+ net_mod_socket_bind(ser, key);
int size;
void *recvbuf;
char sendbuf[512];
int rv;
int remote_port;
- while ( (rv = net_mod_socket_recvfrom(client, &recvbuf, &size, &remote_port) ) == 0) {
+ while ( (rv = net_mod_socket_recvfrom(ser, &recvbuf, &size, &remote_port) ) == 0) {
// printf( "server: RECEIVED REQUEST FROM PORT %d NAME %s\n", remote_port, recvbuf);
- sprintf(sendbuf, "%s", recvbuf);
- net_mod_socket_sendto(client, sendbuf, strlen(sendbuf) + 1, remote_port);
+ sprintf(sendbuf, "%d RECEIVED %s", net_mod_socket_get_key(ser), (char *)recvbuf);
+ net_mod_socket_sendto(ser, sendbuf, strlen(sendbuf) + 1, remote_port);
free(recvbuf);
}
}
@@ -200,7 +201,7 @@
recv_arr[i].host,
recv_arr[i].port,
recv_arr[i].key,
- recv_arr[i].content
+ (char *)recv_arr[i].content
);
}
@@ -245,7 +246,7 @@
}
-void *_run_sendandrecv_(void *arg) {
+void *_run_one_sendto_many_(void *arg) {
Targ *targ = (Targ *)arg;
char sendbuf[128];
@@ -254,17 +255,13 @@
net_mod_recv_msg_t *recv_arr;
int total = 0;
-
- net_node_t *node_arr;
- int node_arr_size = parse_node_list(targ->nodelist, &node_arr);
-
- long rtid;
+ int rkey, lkey;
unsigned int l = 0 , rl;
- const char *hello_format = "%ld say Hello %d";
+ const char *hello_format = "%d say Hello %d";
+ const char *reply_format = "%d RECEIVED %d say Hello %d";
-
- char filename[512];
- sprintf(filename, "test%d.tmp", targ->id);
+ char filename[128];
+ sprintf(filename, "test%d.tmp", targ->node->key);
FILE *fp = NULL;
fp = fopen(filename, "w+");
// fp = stdout;
@@ -272,59 +269,68 @@
int recvsize;
void *recvbuf;
for (l = 0; l < SCALE; l++) {
- sprintf(sendbuf, hello_format, targ->id, l);
+ sprintf(sendbuf, hello_format, net_mod_socket_get_key(client), 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);
+ n = net_mod_socket_sendandrecv_timeout(client, targ->node, 1, sendbuf, strlen(sendbuf) + 1, &recv_arr, &recv_arr_size, 1000);
printf("%d: send %d nodes\n", l, n);
for(j=0; j < recv_arr_size; j++) {
- fprintf(fp, "%ld send '%s'. received '%s' from (host:%s, port: %d, key:%d) \n",
- targ->id,
+ fprintf(fp, "%d send '%s' to %d. received from (host=%s, port= %d, key=%d) '%s'\n",
+ net_mod_socket_get_key(client),
sendbuf,
- recv_arr[j].content,
+ targ->node->key,
recv_arr[j].host,
recv_arr[j].port,
- recv_arr[j].key
-
+ recv_arr[j].key,
+ (char *)recv_arr[j].content
);
- assert(sscanf((const char *)recv_arr[j].content, hello_format, &rtid, &rl) == 2);
- assert(rtid == targ->id);
+ printf("key == %d\n", net_mod_socket_get_key(client));
+ assert(sscanf((const char *)recv_arr[j].content, reply_format, &rkey, &lkey, &rl) == 3);
+ assert(targ->node->key == rkey);
+ assert(net_mod_socket_get_key(client) == lkey);
assert(rl == l);
}
// 浣跨敤瀹屽悗锛屼笉瑕佸繕璁伴噴鏀炬帀
net_mod_socket_free_recv_msg_arr(recv_arr, recv_arr_size);
total += n;
}
- fclose(fp);
+ if(fp != NULL)
+ fclose(fp);
// net_mod_socket_close(client);
return (void *)total;
}
//澶氱嚎绋媠end
-void test_net_sendandrecv_threads(char *nodelist) {
+void one_sendto_many(char *nodelist) {
- int status, i = 0, processors = 4;
- void *res[processors];
+ int status, i = 0;
+
// Targ *targs = (Targ *)calloc(processors, sizeof(Targ));
- Targ targs[processors];
- pthread_t tids[processors];
+
char sendbuf[512];
struct timeval start, end;
long total = 0;
client = net_mod_socket_open();
+ net_mod_socket_bind(client, shm_mm_wrapper_alloc_key());
+ net_node_t *node_arr;
+ int node_arr_size = parse_node_list(nodelist, &node_arr);
+ Targ targs[node_arr_size];
+ pthread_t tids[node_arr_size];
+ void *res[node_arr_size];
+
printf("寮�濮嬫祴璇�...\n");
gettimeofday(&start, NULL);
- for (i = 0; i < processors; i++) {
- targs[i].nodelist = nodelist;
+ for (i = 0; i < node_arr_size; i++) {
+ targs[i].node = node_arr + i;
targs[i].id = i;
- pthread_create(&tids[i], NULL, _run_sendandrecv_, (void *)&targs[i]);
+ pthread_create(&tids[i], NULL, _run_one_sendto_many_, (void *)&targs[i]);
}
- for (i = 0; i < processors; i++) {
+ for (i = 0; i < node_arr_size; i++) {
if (pthread_join(tids[i], &res[i]) != 0) {
perror("multyThreadClient pthread_join");
} else {
@@ -353,34 +359,53 @@
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_t pid, retPid ;
+ unsigned int l , retl;
+ int remoteKey;
+ const char *hello_format = "%d say Hello %u ";
+ const char *reply_format = "%d RECEIVED %d say Hello %d";
pid = getpid();
l = 0;
client = net_mod_socket_open();
while(true) {
- sprintf(buf, hello_format, (long)pid, l);
+ sprintf(buf, hello_format, 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",
+ printf("%ld send '%s' . received '%s' from (host:%s, port: %d, key:%d) \n",
(long)pid,
buf,
- recv_arr[j].content,
+ (char *)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);
+ // printf( "%d send '%s' to %d. received from (host=%s, port= %d, key=%d) '%s'\n",
+ // net_mod_socket_get_key(client),
+ // sendbuf,
+ // targ->node->key,
+ // recv_arr[j].host,
+ // recv_arr[j].port,
+ // recv_arr[j].key,
+ // recv_arr[j].content
+ // );
+
+
+ // assert(sscanf((const char *)recv_arr[j].content, reply_format, &rkey, &lkey, &rl) == 3);
+ // assert(targ->node->key == rkey);
+ // assert(net_mod_socket_get_key(client) == lkey);
+ // assert(rl == l);
+
+ assert(sscanf((const char *)recv_arr[j].content, reply_format, &remoteKey, &retPid, &retl) == 3);
+ assert(retPid == pid);
+ assert(retl == l);
+ assert(remoteKey == recv_arr[j].key);
}
// 浣跨敤瀹屽悗锛屼笉瑕佸繕璁伴噴鏀炬帀
@@ -532,14 +557,14 @@
}
start_net_client(opt.sendlist, opt.publist);
}
- else if (strcmp("test_net_sendandrecv_threads", opt.fun) == 0) {
+ else if (strcmp("one_sendto_many", opt.fun) == 0) {
if(opt.sendlist == 0) {
fprintf(stderr, "Missing sendlist .\n");
usage(argv[0]);
exit(1);
}
- test_net_sendandrecv_threads(opt.sendlist);
+ one_sendto_many(opt.sendlist);
}
else if (strcmp("test_net_sendandrecv", opt.fun) == 0) {
if(opt.sendlist == 0) {
--
Gitblit v1.8.0