Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Xts Acts
提交
c2250aef
X
Xts Acts
项目概览
OpenHarmony
/
Xts Acts
12 个月 前同步成功
通知
9
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
Xts Acts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c2250aef
编写于
5月 17, 2021
作者:
O
openharmony_ci
提交者:
Gitee
5月 17, 2021
浏览文件
操作
浏览文件
下载
差异文件
!195 修改会导致net模块失败的用例
Merge pull request !195 from limeng/kernel_lite_20210514_01
上级
74472fc4
890ed232
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
30 addition
and
13 deletion
+30
-13
kernel_lite/net_posix/src/ActsNetTest.cpp
kernel_lite/net_posix/src/ActsNetTest.cpp
+30
-13
未找到文件。
kernel_lite/net_posix/src/ActsNetTest.cpp
浏览文件 @
c2250aef
...
@@ -39,9 +39,9 @@ using namespace testing::ext;
...
@@ -39,9 +39,9 @@ using namespace testing::ext;
#define PROTOCOL_COUNT 36
#define PROTOCOL_COUNT 36
#define TEST_FD_COUNT 10
#define TEST_FD_COUNT 10
#define STACK_PORT 22
77
#define STACK_PORT 22
88
#define PEER_PORT 22
77
#define PEER_PORT 22
88
#define BUF_SIZE (10
24 * 8
)
#define BUF_SIZE (10
0
)
static
const
char
*
g_udpMsg
=
"Hi, this is UDP"
;
static
const
char
*
g_udpMsg
=
"Hi, this is UDP"
;
static
const
char
*
g_srvMsg
=
"Hi, this is TCP server"
;
static
const
char
*
g_srvMsg
=
"Hi, this is TCP server"
;
static
const
char
*
g_cliMsg
=
"Hello, this is TCP client"
;
static
const
char
*
g_cliMsg
=
"Hello, this is TCP client"
;
...
@@ -235,17 +235,23 @@ static void* SampleTcpServerTask(void *p)
...
@@ -235,17 +235,23 @@ static void* SampleTcpServerTask(void *p)
EXPECT_EQ
(
len
*
srvMsgLen
,
(
unsigned
int
)
ret
);
EXPECT_EQ
(
len
*
srvMsgLen
,
(
unsigned
int
)
ret
);
WAIT
();
WAIT
();
memset_s
(
buf
,
BUF_SIZE
,
0
,
BUF_SIZE
);
static
char
bufrec
[
BUF_SIZE
+
1
]
=
{
0
};
memset_s
(
bufrec
,
BUF_SIZE
,
0
,
BUF_SIZE
);
memset_s
(
&
msg
,
sizeof
(
msg
),
0
,
sizeof
(
msg
));
memset_s
(
&
msg
,
sizeof
(
msg
),
0
,
sizeof
(
msg
));
msg
.
msg_name
=
&
clnAddr
;
msg
.
msg_name
=
&
clnAddr
;
msg
.
msg_namelen
=
sizeof
(
clnAddr
);
msg
.
msg_namelen
=
sizeof
(
clnAddr
);
msg
.
msg_iov
=
iov
;
msg
.
msg_iov
=
iov
;
msg
.
msg_iovlen
=
1
;
msg
.
msg_iovlen
=
1
;
iov
[
0
].
iov_base
=
buf
;
iov
[
0
].
iov_base
=
buf
rec
;
iov
[
0
].
iov_len
=
sizeof
(
buf
);
iov
[
0
].
iov_len
=
sizeof
(
buf
rec
);
ret
=
recvmsg
(
clnFd
,
&
msg
,
0
);
ret
=
recvmsg
(
clnFd
,
&
msg
,
0
);
printf
(
"[tcp server]recvmsg on socket %d:%d, msg[%s]
\n
"
,
clnFd
,
ret
,
buf
);
if
(
len
*
strlen
(
g_cliMsg
)
==
(
unsigned
int
)
ret
)
{
EXPECT_EQ
(
len
*
strlen
(
g_cliMsg
),
(
unsigned
int
)
ret
);
bufrec
[
ret
]
=
0
;
printf
(
"[tcp server]recvmsg on socket %d:%d, msg[%s]
\n
"
,
clnFd
,
ret
,
buf
);
}
else
{
EXPECT_TRUE
(
false
);
printf
(
"[tcp server] recvmsg on socket %d: %d
\n
"
,
clnFd
,
ret
);
}
ret
=
shutdown
(
clnFd
,
SHUT_RDWR
);
ret
=
shutdown
(
clnFd
,
SHUT_RDWR
);
printf
(
"[tcp server]shutdown
\n
"
);
printf
(
"[tcp server]shutdown
\n
"
);
...
@@ -324,17 +330,23 @@ static void* SampleTcpClientTask(void *p)
...
@@ -324,17 +330,23 @@ static void* SampleTcpClientTask(void *p)
EXPECT_EQ
(
len
*
cliMsgLen
,
(
unsigned
int
)
ret
);
EXPECT_EQ
(
len
*
cliMsgLen
,
(
unsigned
int
)
ret
);
WAIT
();
WAIT
();
memset_s
(
buf
,
BUF_SIZE
,
0
,
BUF_SIZE
);
static
char
bufrec
[
BUF_SIZE
+
1
]
=
{
0
};
memset_s
(
bufrec
,
BUF_SIZE
,
0
,
BUF_SIZE
);
memset_s
(
&
msg
,
sizeof
(
msg
),
0
,
sizeof
(
msg
));
memset_s
(
&
msg
,
sizeof
(
msg
),
0
,
sizeof
(
msg
));
msg
.
msg_name
=
&
clnAddr
;
msg
.
msg_name
=
&
clnAddr
;
msg
.
msg_namelen
=
sizeof
(
clnAddr
);
msg
.
msg_namelen
=
sizeof
(
clnAddr
);
msg
.
msg_iov
=
iov
;
msg
.
msg_iov
=
iov
;
msg
.
msg_iovlen
=
1
;
msg
.
msg_iovlen
=
1
;
iov
[
0
].
iov_base
=
buf
;
iov
[
0
].
iov_base
=
buf
rec
;
iov
[
0
].
iov_len
=
sizeof
(
buf
);
iov
[
0
].
iov_len
=
sizeof
(
buf
rec
);
ret
=
recvmsg
(
clnFd
,
&
msg
,
0
);
ret
=
recvmsg
(
clnFd
,
&
msg
,
0
);
printf
(
"[tcp client]recvmsg, ret=%d, msg[%s]
\n
"
,
ret
,
buf
);
if
(
len
*
strlen
(
g_srvMsg
)
==
(
unsigned
int
)
ret
)
{
EXPECT_EQ
(
len
*
strlen
(
g_srvMsg
),
(
unsigned
int
)
ret
);
bufrec
[
ret
]
=
0
;
printf
(
"[tcp client]recvmsg, ret=%d, msg[%s]
\n
"
,
ret
,
bufrec
);
}
else
{
EXPECT_TRUE
(
false
);
printf
(
"[tcp clien]recvmsg, ret=%d
\n
"
,
ret
);
}
ret
=
shutdown
(
clnFd
,
SHUT_RDWR
);
ret
=
shutdown
(
clnFd
,
SHUT_RDWR
);
printf
(
"[tcp client]shutdown
\n
"
);
printf
(
"[tcp client]shutdown
\n
"
);
...
@@ -369,6 +381,8 @@ static void* TcpServerLoopTask(void *p)
...
@@ -369,6 +381,8 @@ static void* TcpServerLoopTask(void *p)
EXPECT_NE
(
-
1
,
ret
)
<<
"[***---][tcp server loop] close fd index["
<<
i
<<
"]"
;
EXPECT_NE
(
-
1
,
ret
)
<<
"[***---][tcp server loop] close fd index["
<<
i
<<
"]"
;
i
--
;
i
--
;
}
}
ret
=
close
(
srvFd
);
EXPECT_NE
(
-
1
,
ret
);
return
nullptr
;
return
nullptr
;
}
}
...
@@ -637,6 +651,7 @@ static int PollServerForFork(int timeoutSec)
...
@@ -637,6 +651,7 @@ static int PollServerForFork(int timeoutSec)
close
(
fds
[
i
].
fd
);
close
(
fds
[
i
].
fd
);
}
}
}
}
close
(
srvFd
);
return
ret
;
return
ret
;
}
}
...
@@ -692,6 +707,8 @@ HWTEST_F(ActsNetTest, testTcpConcurrentConnect, Function | MediumTest | Level2)
...
@@ -692,6 +707,8 @@ HWTEST_F(ActsNetTest, testTcpConcurrentConnect, Function | MediumTest | Level2)
ret
=
pthread_create
(
&
cliThree
,
nullptr
,
TcpClientOnlyConnectTask
,
&
tIdThree
);
ret
=
pthread_create
(
&
cliThree
,
nullptr
,
TcpClientOnlyConnectTask
,
&
tIdThree
);
EXPECT_EQ
(
0
,
ret
);
EXPECT_EQ
(
0
,
ret
);
ret
=
pthread_join
(
srv
,
nullptr
);
EXPECT_EQ
(
0
,
ret
);
ret
=
pthread_join
(
cliOne
,
nullptr
);
ret
=
pthread_join
(
cliOne
,
nullptr
);
EXPECT_EQ
(
0
,
ret
);
EXPECT_EQ
(
0
,
ret
);
printf
(
"[******]testTcpConnect thread[1] finish!
\n
"
);
printf
(
"[******]testTcpConnect thread[1] finish!
\n
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录