Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-08-28 07:02:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

posix: Statically init _POSIX_signals_Alarm_timer

Browse Source
This commit is contained in:
Sebastian Huber
2013-07-22 16:57:26 +02:00
parent 0eae7ba9ba
commit e2005af632
3 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/posix/include/rtems/posix/psignalimpl.h
-2
View File
@@ -59,8 +59,6 @@ extern const struct sigaction _POSIX_signals_Default_vectors[ SIG_ARRAY_MAX ];
extern struct sigaction _POSIX_signals_Vectors[ SIG_ARRAY_MAX ];
extern Watchdog_Control _POSIX_signals_Alarm_timer;
extern Watchdog_Control _POSIX_signals_Ualarm_timer;
extern Thread_queue_Control _POSIX_signals_Wait_queue;
cpukit/posix/src/alarm.c
+16 -19
View File
@@ -41,35 +41,32 @@ static void _POSIX_signals_Alarm_TSR(
/* XXX can't print from an ISR, should this be fatal? */
}
static Watchdog_Control _POSIX_signals_Alarm_timer = WATCHDOG_INITIALIZER(
_POSIX_signals_Alarm_TSR,
0,
NULL
);
unsigned int alarm(
unsigned int seconds
)
{
unsigned int remaining = 0;
Watchdog_Control *the_timer;
Watchdog_States state;
the_timer = &_POSIX_signals_Alarm_timer;
/*
* Initialize the timer used to implement alarm().
*/
state = _Watchdog_Remove( the_timer );
if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) {
/*
* The stop_time and start_time fields are snapshots of ticks since
* boot. Since alarm() is dealing in seconds, we must account for
* this.
*/
if ( !the_timer->routine ) {
_Watchdog_Initialize( the_timer, _POSIX_signals_Alarm_TSR, 0, NULL );
} else {
Watchdog_States state;
state = _Watchdog_Remove( the_timer );
if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) {
/*
* The stop_time and start_time fields are snapshots of ticks since
* boot. Since alarm() is dealing in seconds, we must account for
* this.
*/
remaining = the_timer->initial -
((the_timer->stop_time - the_timer->start_time) / TOD_TICKS_PER_SECOND);
}
remaining = the_timer->initial -
((the_timer->stop_time - the_timer->start_time) / TOD_TICKS_PER_SECOND);
}
if ( seconds )
cpukit/posix/src/psignal.c
-2
View File
@@ -95,7 +95,6 @@ Thread_queue_Control _POSIX_signals_Wait_queue;
Chain_Control _POSIX_signals_Inactive_siginfo;
Chain_Control _POSIX_signals_Siginfo[ SIG_ARRAY_MAX ];
Watchdog_Control _POSIX_signals_Alarm_timer;
Watchdog_Control _POSIX_signals_Ualarm_timer;
/*
@@ -234,6 +233,5 @@ void _POSIX_signals_Manager_Initialization(void)
/*
* Initialize the Alarm Timer
*/
_Watchdog_Initialize( &_POSIX_signals_Alarm_timer, NULL, 0, NULL );
_Watchdog_Initialize( &_POSIX_signals_Ualarm_timer, NULL, 0, NULL );
}