yystopf/openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 增加内核epoll系统调用

Browse Source 
【背景】增加内核epoll系统调用适配musl接口并增加测试用例

【修改方案】
1, 删除musl仓的porting
2，内核实现epoll对应接口及注册系统调用
3，testsuit目录添加对应的用例

【影响】
对现有的产品编译不会有影响。

re #I4FXPT
Signed-off-by: wangchen <253227059@qq.com>

Change-Id: Ia97ea49067aa1ff47b8c1c83675ac75e75d25955
This commit is contained in:
lnlan
2021-10-20 03:46:41 +00:00
parent 38163de8f3
commit 2251b8a2d1
14 changed files with 849 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testsuites/unittest/IO/BUILD.gn Normal file → Executable file
View File

@@ -88,6 +88,8 @@ sources_full = [
"full/IO_test_ppoll_003.cpp",
"full/IO_test_pselect_001.cpp",
"full/IO_test_pselect_002.cpp",
"full/IO_test_epoll_001.cpp",
"full/IO_test_epoll_002.cpp",
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {

3
testsuites/unittest/IO/It_test_IO.h
View File

@@ -55,6 +55,7 @@
#include "pwd.h"
#include "sys/uio.h"
#include "syslog.h"
#include "sys/epoll.h"
extern int CloseRmAllFile(int fd[], char filePathName[][50], int cnt);
extern char *g_ioTestPath;
@@ -134,5 +135,7 @@ extern VOID IO_TEST_STRFMON_L_002(VOID);
extern VOID IO_TEST_PPOLL_001(VOID);
extern VOID IO_TEST_PPOLL_002(VOID);
extern VOID IO_TEST_PPOLL_003(VOID);
extern VOID IO_TEST_EPOLL_001(VOID);
extern VOID IO_TEST_EPOLL_002(VOID);
#endif

107
testsuites/unittest/IO/full/IO_test_epoll_001.cpp Executable file
View File

@@ -0,0 +1,107 @@
/*
* Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
* Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
* to endorse or promote products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "It_test_IO.h"
#include <sys/epoll.h>
#include "signal.h"
#include "pthread.h"
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
static UINT32 testcase(VOID)
{
fd_set rfds;
int retval;
pid_t pid;
int pipeFd[2]; /* 2, pipe id num */
char buffer[40]; /* 40, buffer size */
int i = 0;
int status;
int epFd;
sigset_t mask;
struct epoll_event ev;
struct epoll_event evWait[2]; /* 2, evs num */
retval = pipe(pipeFd);
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT);
/* Watch fd to see when it has input. */
FD_ZERO(&rfds);
FD_SET(pipeFd[0], &rfds);
/* Wait up to three seconds. */
epFd = epoll_create1(100); /* 100, cretae input, */
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT);
ev.events = EPOLLIN | EPOLLOUT | EPOLLRDNORM | EPOLLWRNORM;
retval = epoll_ctl(epFd, EPOLL_CTL_ADD, pipeFd[0], &ev);
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT);
pid = fork();
if (pid == 0) {
close(pipeFd[1]);
memset(evWait, 0, sizeof(struct epoll_event) * 2); /* 2, evs num */
retval = epoll_wait(epFd, evWait, 2, 3000); /* 2, num of wait fd. 3000, wait time */
close(pipeFd[0]);
if (retval) {
exit(LOS_OK);
} else {
exit(LOS_NOK);
}
} else {
sleep(1);
close(pipeFd[0]);
retval = write(pipeFd[1], "0123456789012345678901234567890123456789", 40); /* write 40 bytes to stdin(fd 0) */
ICUNIT_GOTO_EQUAL(retval, 40, retval, OUT);
close(pipeFd[1]);
wait(&status);
status = WEXITSTATUS(status);
ICUNIT_ASSERT_EQUAL(status, LOS_OK, status);
}
return LOS_OK;
OUT:
close(pipeFd[0]);
close(pipeFd[1]);
close(epFd);
return LOS_NOK;
}
VOID IO_TEST_EPOLL_001(VOID)
{
TEST_ADD_CASE(__FUNCTION__, testcase, TEST_LIB, TEST_LIBC, TEST_LEVEL1, TEST_FUNCTION);
}

139
testsuites/unittest/IO/full/IO_test_epoll_002.cpp Executable file
View File

@@ -0,0 +1,139 @@
/*
* Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
* Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
* to endorse or promote products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "It_test_IO.h"
#include <sys/epoll.h>
#include "signal.h"
#include "pthread.h"
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
static void SigPrint(int sig)
{
return;
}
static UINT32 testcase(VOID)
{
fd_set rfds;
struct timespec tv;
int retval;
pid_t pid;
int pipeFd[2]; /* 2, pipe id num */
char buffer[40]; /* 40, buffer size */
int i = 0;
int status;
int epFd;
sigset_t mask;
void (*retSig)(int);
struct epoll_event ev;
struct epoll_event evWait[2];
retSig = signal(SIGALRM, SigPrint);
ICUNIT_ASSERT_NOT_EQUAL(retSig, NULL, retSig);
retSig = signal(SIGUSR1, SigPrint);
ICUNIT_ASSERT_NOT_EQUAL(retSig, NULL, retSig);
retval = sigemptyset(&mask);
ICUNIT_ASSERT_EQUAL(retval, 0, retval);
retval = sigaddset(&mask, SIGALRM);
ICUNIT_ASSERT_EQUAL(retval, 0, retval);
retval = sigaddset(&mask, SIGUSR1);
ICUNIT_ASSERT_EQUAL(retval, 0, retval);
retval = pipe(pipeFd);
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT);
/* Watch fd to see when it has input. */
FD_ZERO(&rfds);
FD_SET(pipeFd[0], &rfds);
/* Wait up to three seconds. */
tv.tv_sec = 3; /* 3, wait timer, second */
tv.tv_nsec = 5; /* 5, wait timer, nano second */
epFd = epoll_create1(100); /* 100, cretae input, */
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT);
ev.events = EPOLLRDNORM;
retval = epoll_ctl(epFd, EPOLL_CTL_ADD, pipeFd[0], &ev);
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT);
pid = fork();
if (pid == 0) {
close(pipeFd[1]);
memset(evWait, 0, sizeof(struct epoll_event) * 2); /* 2, evs num */
evWait[0].data.fd = pipeFd[0];
retval = epoll_pwait(epFd, evWait, 2, 3000, &mask); /* 2, num of wait fd. 3000, wait time */
close(pipeFd[0]);
if (retval) {
exit(LOS_OK);
} else {
exit(LOS_NOK);
}
} else {
sleep(1);
close(pipeFd[0]);
retval = kill(pid, SIGALRM);
ICUNIT_ASSERT_EQUAL(retval, 0, retval);
retval = kill(pid, SIGUSR1);
ICUNIT_ASSERT_EQUAL(retval, 0, retval);
close(pipeFd[1]);
wait(&status);
status = WEXITSTATUS(status);
ICUNIT_ASSERT_EQUAL(status, LOS_OK, status);
}
return LOS_OK;
OUT:
close(pipeFd[0]);
close(pipeFd[1]);
close(epFd);
return LOS_NOK;
}
VOID IO_TEST_EPOLL_002(VOID)
{
TEST_ADD_CASE(__FUNCTION__, testcase, TEST_LIB, TEST_LIBC, TEST_LEVEL1, TEST_FUNCTION);
}

23
testsuites/unittest/IO/io_test.cpp
View File

@@ -148,6 +148,29 @@ HWTEST_F(IoTest, IO_TEST_PPOLL_003, TestSize.Level0)
IO_TEST_PPOLL_003();
}
/* *
* @tc.name: IO_TEST_EPOLL_001
* @tc.desc: function for IoTest
* @tc.type: FUNC
* @tc.require: AR000EEMQ9
*/
HWTEST_F(IoTest, IO_TEST_EPOLL_001, TestSize.Level0)
{
IO_TEST_EPOLL_001();
}
/* *
* @tc.name: IO_TEST_EPOLL_002
* @tc.desc: function for IoTest
* @tc.type: FUNC
* @tc.require: AR000EEMQ9
*/
HWTEST_F(IoTest, IO_TEST_EPOLL_002, TestSize.Level0)
{
IO_TEST_EPOLL_002();
}
/* *
* @tc.name: IT_STDLIB_POLL_002
* @tc.desc: function for IoTest