feat: timer_create支持以SIGEV_THREAD方式创建定时器

【背景】当前timer_create接口不支持以SIGEV_THREAD的方式创建多个定时器

【修改方案】
1、内核timer_create接口在创建software timers相应的线程时,使用线程
taskCB所携带的信息识别各个线程的信号并依据该信息分别派发出信号。
2、关于用户任务操作许可验证的修改,现在允许同一用户线程向其自身派发信
号,软件定时器计时结束,向用户态发送相应的信号,完成用户态线程的回调。

【影响】
对现有的产品暂无影响。

re #I3SRFI

Signed-off-by: yansira <yansira@hotmail.com>
Change-Id: Ia23f5ef01975bf867dd7f5db797a30c264c50501
This commit is contained in:
Kiita
2021-06-03 20:38:03 +08:00
parent e93c52c091
commit e5f6bf0556
11 changed files with 239 additions and 44 deletions
+1
View File
@@ -46,6 +46,7 @@ sources_smoke = [
"smoke/timer_test_002.cpp",
"smoke/timer_test_003.cpp",
"smoke/timer_test_004.cpp",
"smoke/timer_test_005.cpp",
"smoke/timer_test_tzset_001.cpp",
"smoke/timer_test_tzset_002.cpp",
]
@@ -41,6 +41,7 @@ void TimerTest001(void);
void TimerTest002(void);
void TimerTest003(void);
void TimerTest004(void);
void TimerTest005(void);
void TIME_TEST_TZSET_001(void);
void TIME_TEST_TZSET_002(void);
@@ -42,7 +42,7 @@ static int g_sigHdlCnt;
static int g_overRunCnt;
static timer_t g_timerID;
static void SigHandler(int sig)
static void SigHandler01(int sig)
{
g_sigHdlCnt++;
g_overRunCnt += timer_getoverrun(g_timerID);
@@ -52,7 +52,7 @@ static void SigHandler(int sig)
static int TimerTest(void)
{
int interval = 3; // 3, seconds
timer_t timerid;
timer_t timerid01, timerid02;
struct sigevent sev;
struct itimerspec its;
sigset_t mask;
@@ -60,7 +60,7 @@ static int TimerTest(void)
int ret;
sa.sa_flags = 0;
sa.sa_handler = SigHandler;
sa.sa_handler = SigHandler01;
sigemptyset(&sa.sa_mask);
ret = sigaction(SIG, &sa, nullptr);
LogPrintln("sigaction %d: %d", SIG, ret);
@@ -76,12 +76,12 @@ static int TimerTest(void)
/* Create the timer */
sev.sigev_notify = SIGEV_SIGNAL;
sev.sigev_signo = SIG;
sev.sigev_value.sival_ptr = &timerid;
ret = timer_create(CLOCKID, &sev, &timerid);
LogPrintln("timer_create %p: %d", timerid, ret);
sev.sigev_value.sival_ptr = &timerid01;
ret = timer_create(CLOCKID, &sev, &timerid01);
LogPrintln("timer_create %p: %d", timerid01, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
g_timerID = timerid;
g_timerID = timerid01;
/* Start the timer */
its.it_value.tv_sec = 0;
@@ -89,23 +89,39 @@ static int TimerTest(void)
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
ret = timer_settime(timerid, 0, &its, nullptr);
LogPrintln("timer_settime %p: %d", timerid, ret);
ret = timer_settime(timerid01, 0, &its, nullptr);
LogPrintln("timer_settime %p: %d", timerid01, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
/* Test of evp is NULL */
ret = timer_create(CLOCKID, NULL, &timerid02);
LogPrintln("timer_settime %p: %d", timerid02, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
its.it_value.tv_sec = 1;
its.it_value.tv_nsec = 0;
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
ret = timer_settime(timerid02, 0, &its, nullptr);
LogPrintln("timer_settime %p: %d", timerid02, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
sleep(6);
/* Sleep for a while */
LogPrintln("sleep %ds", interval);
sleep(interval); // timer signal is blocked, this sleep should not be interrupted
ICUNIT_ASSERT_EQUAL(g_sigHdlCnt, 0, g_sigHdlCnt);
/* Get the timer's time */
ret = timer_gettime(timerid, &its);
LogPrintln("timer_gettime %p: %d", timerid, ret);
ret = timer_gettime(timerid01, &its);
LogPrintln("timer_gettime %p: %d", timerid01, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
/* Get the timer's overruns */
ret = timer_getoverrun(timerid);
LogPrintln("timer_getoverrun %p: %d", timerid, ret);
ret = timer_getoverrun(timerid01);
LogPrintln("timer_getoverrun %p: %d", timerid01, ret);
ICUNIT_ASSERT_NOT_EQUAL(ret, -1, ret); // before timer deliver, return value of timer_getoverrun is unspecified
LogPrintln("unblock signal %d", SIG);
@@ -124,8 +140,12 @@ static int TimerTest(void)
sleep(interval); // this sleep may be interrupted by the timer
LogPrintln("sleep time over, g_sigHdlCnt = %d", g_sigHdlCnt);
ret = timer_delete(timerid);
LogPrintln("timer_delete %p %d", timerid, ret);
ret = timer_delete(timerid01);
LogPrintln("timer_delete %p %d", timerid01, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = timer_delete(timerid02);
LogPrintln("timer_delete %p %d", timerid02, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_NOT_EQUAL(g_sigHdlCnt, 0, g_sigHdlCnt);
@@ -0,0 +1,123 @@
/*
* 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 <unistd.h>
#include <signal.h>
#include <time.h>
#include <sys/time.h>
#include "osTest.h"
#include <stdio.h>
#include <string.h>
#include "lt_timer_test.h"
static int g_sigHdlCnt01;
static int g_sigHdlCnt02;
static int g_sigHdlCnt03;
static void TempSigHandler(union sigval v)
{
LogPrintln("This is TempSigHandler ...\r\n");
(*(void(*)(void))(v.sival_ptr))();
}
static void TempSigHandler01(void)
{
g_sigHdlCnt01++;
}
static void TempSigHandler02(void)
{
g_sigHdlCnt02++;
}
static int TimerTest(void)
{
timer_t timerid01, timerid02, timerid03;
struct sigevent sev;
struct itimerspec its;
int ret;
int i;
(void)memset(&sev, 0, sizeof(struct sigevent));
sev.sigev_notify = SIGEV_THREAD;
sev.sigev_notify_function = TempSigHandler;
sev.sigev_value.sival_ptr = (void *)TempSigHandler01;
/* Start the timer */
its.it_value.tv_sec = 3; // 3, timer time 3 seconds.
its.it_value.tv_nsec = 0;
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
ret = timer_create(CLOCK_REALTIME, &sev, &timerid01);
LogPrintln("timer_settime %p: %d", timerid01, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = timer_settime(timerid01, 0, &its, nullptr);
LogPrintln("timer_create %p: %d", timerid01, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
its.it_value.tv_sec = 4; // 4, timer time 4 seconds.
its.it_value.tv_nsec = 0;
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
sev.sigev_value.sival_ptr = (void *)TempSigHandler02;
ret = timer_create(CLOCK_REALTIME, &sev, &timerid02);
LogPrintln("timer_settime %p: %d", timerid02, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = timer_settime(timerid02, 0, &its, nullptr);
LogPrintln("timer_settime %p: %d", timerid02, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
its.it_value.tv_sec = 5; // 5, timer time 5 seconds.
its.it_value.tv_nsec = 0;
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
sleep(20); // 20, sleep seconds for timer.
ret = timer_delete(timerid01);
LogPrintln("timer_delete %p %d", timerid01, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = timer_delete(timerid02);
LogPrintln("timer_delete %p %d", timerid02, ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_NOT_EQUAL(g_sigHdlCnt01, 0, g_sigHdlCnt01);
ICUNIT_ASSERT_NOT_EQUAL(g_sigHdlCnt02, 0, g_sigHdlCnt02);
return 0;
}
void TimerTest005(void)
{
TEST_ADD_CASE(__FUNCTION__, TimerTest, TEST_POSIX, TEST_SWTMR, TEST_LEVEL0, TEST_FUNCTION);
}
@@ -86,5 +86,16 @@ HWTEST_F(TimeTimerTest, TimerTest003, TestSize.Level0)
{
TimerTest004(); // TODO: musl sigaction handler have only one param.
}*/
/* *
* @tc.name: TimerTest005
* @tc.desc: function for timer_create SIGEV_THREAD.
* @tc.type: FUNC
* @tc.require: AR000EEMQ9
*/
HWTEST_F(TimeTimerTest, TimerTest005, TestSize.Level0)
{
TimerTest005();
}
#endif
} // namespace OHOS