RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

posix: Statically init _POSIX_signals_Ualarm_timer

Browse Source
This commit is contained in:
Sebastian Huber
2013-07-22 15:03:04 +02:00
parent a9cc1beb42
commit 43f97f1de9
3 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/posix/include/rtems/posix/psignalimpl.h
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 struct sigaction _POSIX_signals_Vectors[ SIG_ARRAY_MAX ];
extern Watchdog_Control _POSIX_signals_Ualarm_timer;
extern Thread_queue_Control _POSIX_signals_Wait_queue; extern Thread_queue_Control _POSIX_signals_Wait_queue;
extern Chain_Control _POSIX_signals_Inactive_siginfo; extern Chain_Control _POSIX_signals_Inactive_siginfo;

7
cpukit/posix/src/psignal.c
View File

@@ -95,8 +95,6 @@ Thread_queue_Control _POSIX_signals_Wait_queue;
Chain_Control _POSIX_signals_Inactive_siginfo; Chain_Control _POSIX_signals_Inactive_siginfo;
Chain_Control _POSIX_signals_Siginfo[ SIG_ARRAY_MAX ]; Chain_Control _POSIX_signals_Siginfo[ SIG_ARRAY_MAX ];
Watchdog_Control _POSIX_signals_Ualarm_timer;
/* /*
* XXX - move these * XXX - move these
*/ */
@@ -229,9 +227,4 @@ void _POSIX_signals_Manager_Initialization(void)
} else { } else {
_Chain_Initialize_empty( &_POSIX_signals_Inactive_siginfo ); _Chain_Initialize_empty( &_POSIX_signals_Inactive_siginfo );
} }
/*
* Initialize the Alarm Timer
*/
_Watchdog_Initialize( &_POSIX_signals_Ualarm_timer, NULL, 0, NULL );
} }

45
cpukit/posix/src/ualarm.c
View File

@@ -27,6 +27,14 @@
#include <rtems/posix/psignalimpl.h> #include <rtems/posix/psignalimpl.h>
#include <rtems/posix/time.h> #include <rtems/posix/time.h>
static void _POSIX_signals_Ualarm_TSR( Objects_Id id, void *argument );
static Watchdog_Control _POSIX_signals_Ualarm_timer = WATCHDOG_INITIALIZER(
_POSIX_signals_Ualarm_TSR,
0,
NULL
);
/* /*
* _POSIX_signals_Ualarm_TSR * _POSIX_signals_Ualarm_TSR
*/ */
@@ -56,35 +64,26 @@ useconds_t ualarm(
useconds_t remaining = 0; useconds_t remaining = 0;
Watchdog_Control *the_timer; Watchdog_Control *the_timer;
Watchdog_Interval ticks; Watchdog_Interval ticks;
Watchdog_States state;
struct timespec tp; struct timespec tp;
the_timer = &_POSIX_signals_Ualarm_timer; the_timer = &_POSIX_signals_Ualarm_timer;
/* state = _Watchdog_Remove( the_timer );
* Initialize the timer used to implement alarm(). 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 ) { ticks = the_timer->initial;
_Watchdog_Initialize( the_timer, _POSIX_signals_Ualarm_TSR, 0, NULL ); ticks -= (the_timer->stop_time - the_timer->start_time);
} else { /* remaining is now in ticks */
Watchdog_States state;
state = _Watchdog_Remove( the_timer ); _Timespec_From_ticks( ticks, &tp );
if ( (state == WATCHDOG_ACTIVE) || (state == WATCHDOG_REMOVE_IT) ) { remaining = tp.tv_sec * TOD_MICROSECONDS_PER_SECOND;
/* remaining += tp.tv_nsec / 1000;
* The stop_time and start_time fields are snapshots of ticks since
* boot. Since alarm() is dealing in seconds, we must account for
* this.
*/
ticks = the_timer->initial;
ticks -= (the_timer->stop_time - the_timer->start_time);
/* remaining is now in ticks */
_Timespec_From_ticks( ticks, &tp );
remaining = tp.tv_sec * TOD_MICROSECONDS_PER_SECOND;
remaining += tp.tv_nsec / 1000;
}
} }
/* /*