general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine the data comparison in server_epoll test

Browse Source 
Verify received data with the length of the data sent from client.
Otherwise, it may fail when there was dirty data in the buffer for
receiving.
This commit is contained in:
He Sun 2020-10-22 10:57:41 +08:00 committed by Zongmin.Gu
parent 66bd826b6b
commit dd63f0194f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/server_epoll/main.c
View File

@ -16,6 +16,8 @@
#define MAXEVENTS 64 #define MAXEVENTS 64
#define DEFAULT_PROC_NUM 3 #define DEFAULT_PROC_NUM 3
#define DEFAULT_MSG "Hello World!\n" #define DEFAULT_MSG "Hello World!\n"
// The recv buf length should be longer than that of DEFAULT_MSG
#define RECV_BUF_LENGTH 32
static int create_and_bind() { static int create_and_bind() {
int listenfd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); int listenfd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
@ -123,9 +125,12 @@ int test_ip_socket() {
} }
} else if (events[i].events & EPOLLIN) { } else if (events[i].events & EPOLLIN) {
// Channel is ready to read. // Channel is ready to read.
char buf[36]; char buf[RECV_BUF_LENGTH];
if ((read(events[i].data.fd, buf, sizeof buf)) != 0) { if ((read(events[i].data.fd, buf, sizeof buf)) != 0) {
if (strcmp(buf, DEFAULT_MSG) != 0) { if (strncmp(buf, DEFAULT_MSG, strlen(DEFAULT_MSG)) != 0) {
for (int i = 0; i < RECV_BUF_LENGTH; i++) {
printf("%c, ", buf[i]);
}
close_files(2, server_fd, epfd); close_files(2, server_fd, epfd);
THROW_ERROR("msg mismatched"); THROW_ERROR("msg mismatched");
} }