sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct an error in timer_created intoduced when SIGEV_THREAD support was added.

Browse Source
This commit is contained in:
Gregory Nutt 2016-01-28 16:38:54 -06:00
parent eb53d0158e
commit da5115e3e6
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs

@ -1 +1 @@
Subproject commit 2d69d8ab99187e4270bb4b4bd1d61d5324b81916
Subproject commit 94cc2c17de89faf152b3388349092173f0d165b0

34
sched/timer/timer_create.c
View File

@ -1,7 +1,7 @@
/********************************************************************************
* sched/timer/timer_create.c
*
* Copyright (C) 2007-2009, 2011, 2014-2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011, 2014-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -52,18 +52,6 @@
#ifndef CONFIG_DISABLE_POSIX_TIMERS
/********************************************************************************
* Pre-processor Definitions
********************************************************************************/
/********************************************************************************
* Private Data
********************************************************************************/
/********************************************************************************
* Public Data
********************************************************************************/
/********************************************************************************
* Private Functions
********************************************************************************/
@ -213,13 +201,31 @@ int timer_create(clockid_t clockid, FAR struct sigevent *evp, FAR timer_t *timer
ret->pt_delay = 0;
ret->pt_wdog = wdog;
/* Was a struct sigevent provided? */
if (evp)
{
/* Yes, copy the entire struct sigevent content */
memcpy(&ret->pt_event, evp, sizeof(struct sigevent));
}
else
{
memset(&ret->pt_event, 0, sizeof(struct sigevent));
/* "If the evp argument is NULL, the effect is as if the evp argument
* pointed to a sigevent structure with the sigev_notify member
* having the value SIGEV_SIGNAL, the sigev_signo having a default
* signal number, and the sigev_value member having the value of the
* timer ID."
*/
ret->pt_event.sigev_notify = SIGEV_SIGNAL;
ret->pt_event.sigev_signo = SIGALRM;
ret->pt_event.sigev_value.sival_ptr = ret;
#ifdef CONFIG_SIG_EVTHREAD
ret->pt_event.sigev_value.sigev_notify_function = NULL;
ret->pt_event.sigev_value.sigev_notify_attributes = NULL;
#endif
}
/* Return the timer */