Skip to content

{bp-3538} ostest: Make POSIX timers test work with CONFIG_ENABLE_PARTIAL_SIGNALS #3548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Jun 17, 2026
+36 −96
Merged

{bp-3538} ostest: Make POSIX timers test work with CONFIG_ENABLE_PARTIAL_SIGNALS #3548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion testing/ostest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ if(CONFIG_TESTING_OSTEST)
endif() # CONFIG_DISABLE_MQUEUE

if(NOT CONFIG_DISABLE_POSIX_TIMERS)
list(APPEND SRCS posixtimer.c)
if(NOT CONFIG_DISABLE_ALL_SIGNALS)
list(APPEND SRCS posixtimer.c)
endif()
if(CONFIG_SIG_EVTHREAD)
list(APPEND SRCS sigev_thread.c)
endif()
Expand Down
2 changes: 2 additions & 0 deletions testing/ostest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ endif # CONFIG_DISABLE_PTHREAD
endif # CONFIG_DISABLE_MQUEUE

ifneq ($(CONFIG_DISABLE_POSIX_TIMERS),y)
ifneq ($(CONFIG_DISABLE_ALL_SIGNALS),y)
CSRCS += posixtimer.c
endif
ifeq ($(CONFIG_SIG_EVTHREAD),y)
CSRCS += sigev_thread.c
endif
Expand Down
16 changes: 8 additions & 8 deletions testing/ostest/ostest_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,14 @@ static int user_main(int argc, char *argv[])
suspend_test();
check_test_memory_usage();
#endif

#ifndef CONFIG_DISABLE_POSIX_TIMERS
/* Verify POSIX timers (SIGEV_SIGNAL delivered via sigwaitinfo()) */

printf("\nuser_main: POSIX timer test\n");
timer_test();
check_test_memory_usage();
#endif
#endif /* !CONFIG_DISABLE_ALL_SIGNALS */

#ifdef CONFIG_ENABLE_ALL_SIGNALS
Expand All @@ -537,14 +545,6 @@ static int user_main(int argc, char *argv[])
printf("\nuser_main: nested signal handler test\n");
signest_test();
check_test_memory_usage();

#ifndef CONFIG_DISABLE_POSIX_TIMERS
/* Verify posix timers (with SIGEV_SIGNAL) */

printf("\nuser_main: POSIX timer test\n");
timer_test();
check_test_memory_usage();
#endif
#endif

#ifdef CONFIG_BUILD_FLAT
Expand Down
110 changes: 23 additions & 87 deletions testing/ostest/posixtimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <assert.h>
#include <errno.h>
#include <sched.h>
#include <semaphore.h>
#include <signal.h>
#include <stdio.h>
#include <unistd.h>
Expand All @@ -47,23 +46,14 @@
* Private Data
****************************************************************************/

static sem_t sem;
static int g_nsigreceived = 0;

/****************************************************************************
* Private Functions
****************************************************************************/

static void timer_expiration(int signo, siginfo_t *info, void *ucontext)
static void timer_expiration(int signo, FAR const siginfo_t *info)
{
sigset_t oldset;
sigset_t allsigs;
int status;

printf("timer_expiration: Received signal %d\n" , signo);

g_nsigreceived++;

/* Check signo */

if (signo != MY_TIMER_SIGNAL)
Expand Down Expand Up @@ -104,28 +94,8 @@ static void timer_expiration(int signo, siginfo_t *info, void *ucontext)
ASSERT(false);
}

/* Check ucontext_t */

printf("timer_expiration: ucontext=%p\n" , ucontext);

/* Check sigprocmask */

sigfillset(&allsigs);
status = sigprocmask(SIG_SETMASK, NULL, &oldset);
if (status != OK)
{
printf("timer_expiration: ERROR sigprocmask failed, status=%d\n",
status);
ASSERT(false);
}

if (!sigset_isequal(&oldset, &allsigs))
{
printf("timer_expiration: ERROR sigprocmask=" SIGSET_FMT
" expected=" SIGSET_FMT "\n",
SIGSET_ELEM(&oldset), SIGSET_ELEM(&allsigs));
ASSERT(false);
}
g_nsigreceived++;
printf("timer_expiration: g_nsigreceived=%d\n", g_nsigreceived);
}

/****************************************************************************
Expand All @@ -135,51 +105,30 @@ static void timer_expiration(int signo, siginfo_t *info, void *ucontext)
void timer_test(void)
{
sigset_t set;
struct sigaction act;
struct sigaction oact;
siginfo_t info;
struct sigevent notify;
struct itimerspec timer;
timer_t timerid;
int status;
int i;

printf("timer_test: Initializing semaphore to 0\n");
sem_init(&sem, 0, 0);

/* Start waiter thread */

printf("timer_test: Unmasking signal %d\n" , MY_TIMER_SIGNAL);
/* Block the timer signal so that it stays pending until we explicitly
* wait for it via sigwaitinfo().
*/

sigemptyset(&set);
sigaddset(&set, MY_TIMER_SIGNAL);
status = sigprocmask(SIG_UNBLOCK, &set, NULL);
if (status != OK)
{
printf("timer_test: ERROR sigprocmask failed, status=%d\n",
status);
ASSERT(false);
}

printf("timer_test: Registering signal handler\n");
act.sa_sigaction = timer_expiration;
act.sa_flags = SA_SIGINFO;

sigfillset(&act.sa_mask);
sigdelset(&act.sa_mask, MY_TIMER_SIGNAL);
printf("timer_test: Masking signal %d\n", MY_TIMER_SIGNAL);

status = sigaction(MY_TIMER_SIGNAL, &act, &oact);
status = sigprocmask(SIG_BLOCK, &set, NULL);
if (status != OK)
{
printf("timer_test: ERROR sigaction failed, status=%d\n" , status);
printf("timer_test: ERROR sigprocmask failed, status=%d\n",
status);
ASSERT(false);
}

#ifndef SDCC
printf("timer_test: oact.sigaction=%p oact.sa_flags=%x "
"oact.sa_mask=" SIGSET_FMT "\n",
oact.sa_sigaction, oact.sa_flags, SIGSET_ELEM(&oact.sa_mask));
#endif

/* Create the POSIX timer */

printf("timer_test: Creating timer\n");
Expand Down Expand Up @@ -217,53 +166,40 @@ void timer_test(void)
goto errorout;
}

/* Take the semaphore */
/* Synchronously wait for the timer signal via sigwaitinfo(). */

for (i = 0; i < 5; i++)
{
printf("timer_test: Waiting on semaphore\n");
printf("timer_test: Waiting on sigwaitinfo\n");
FFLUSH();
status = sem_wait(&sem);
if (status != 0)
status = sigwaitinfo(&set, &info);
if (status < 0)
{
int error = errno;
if (error == EINTR)
{
printf("timer_test: sem_wait() successfully interrupted "
"by signal\n");
}
else
{
printf("timer_test: ERROR sem_wait failed, errno=%d\n", error);
ASSERT(false);
}
printf("timer_test: ERROR sigwaitinfo failed, errno=%d\n", errno);
ASSERT(false);
}
else
{
printf("timer_test: ERROR awakened with no error!\n");
ASSERT(false);
printf("timer_test: sigwaitinfo() returned signo=%d\n", status);
timer_expiration(status, &info);
}

printf("timer_test: g_nsigreceived=%d\n", g_nsigreceived);
}

errorout:
sem_destroy(&sem);

/* Then delete the timer */
/* Delete the timer */

printf("timer_test: Deleting timer\n");
status = timer_delete(timerid);
if (status != OK)
{
printf("timer_test: ERROR timer_create failed, errno=%d\n", errno);
printf("timer_test: ERROR timer_delete failed, errno=%d\n", errno);
ASSERT(false);
}

/* Detach the signal handler */
/* Restore the signal mask */

act.sa_handler = SIG_DFL;
status = sigaction(MY_TIMER_SIGNAL, &act, &oact);
sigprocmask(SIG_UNBLOCK, &set, NULL);

printf("timer_test: done\n");
FFLUSH();
Expand Down
Loading