From cb85aa8a8d02a3d6dc16e3f32e78da9e70f9c7f5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 02 二月 2021 17:49:21 +0800
Subject: [PATCH] update
---
test_net_socket/test_net_mod_socket.cpp | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/test_net_socket/test_net_mod_socket.cpp b/test_net_socket/test_net_mod_socket.cpp
index 9de375e..94be25b 100644
--- a/test_net_socket/test_net_mod_socket.cpp
+++ b/test_net_socket/test_net_mod_socket.cpp
@@ -8,7 +8,7 @@
#include <getopt.h>
#include "logger_factory.h"
-#define SCALE 1000000
+#define SCALE 100000
typedef struct Targ {
net_node_t *node;
@@ -81,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);
}
@@ -144,7 +144,7 @@
int remote_port;
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, "%d RECEIVED %s", net_mod_socket_get_key(ser), recvbuf);
+ 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);
}
@@ -201,7 +201,7 @@
recv_arr[i].host,
recv_arr[i].port,
recv_arr[i].key,
- recv_arr[i].content
+ (char *)recv_arr[i].content
);
}
@@ -272,18 +272,18 @@
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, targ->node, 1, 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, 1);
printf("%d: send %d nodes\n", l, n);
for(j=0; j < recv_arr_size; j++) {
- fprintf(fp, "%d send '%s' to %d. received from (host=%s, port= %d, key=%d) '%s'\n",
+ fprintf(stdout, "%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
+ (char *)recv_arr[j].content
);
printf("key == %d\n", net_mod_socket_get_key(client));
@@ -359,34 +359,39 @@
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);
+ &recv_arr, &recv_arr_size, 1);
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);
+
+
+ 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);
}
// 浣跨敤瀹屽悗锛屼笉瑕佸繕璁伴噴鏀炬帀
--
Gitblit v1.8.0