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

Modified to disable interrupts while checking signals.

Browse Source
This commit is contained in:
Joel Sherrill
2000-04-13 13:37:29 +00:00
parent f3fea8685f
commit 6c48c6eec8
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
c/src/exec/posix/src/sigtimedwait.c
View File

@@ -21,6 +21,7 @@
#include <rtems/posix/psignal.h> #include <rtems/posix/psignal.h>
#include <rtems/posix/seterr.h> #include <rtems/posix/seterr.h>
#include <rtems/posix/time.h> #include <rtems/posix/time.h>
#include <rtems/score/isr.h>
int _POSIX_signals_Get_highest( int _POSIX_signals_Get_highest(
sigset_t set sigset_t set
@@ -55,7 +56,27 @@ int sigtimedwait(
siginfo_t signal_information; siginfo_t signal_information;
siginfo_t *the_info; siginfo_t *the_info;
int signo; int signo;
ISR_Level level;
/*
* Error check parameters before disabling interrupts.
*/
interval = 0;
if ( timeout ) {
if ( timeout->tv_nsec < 0 ||
timeout->tv_nsec >= TOD_NANOSECONDS_PER_SECOND) {
set_errno_and_return_minus_one( EINVAL );
}
interval = _POSIX_Timespec_to_interval( timeout );
}
/*
* Initialize local variables.
*/
the_info = ( info ) ? info : &signal_information; the_info = ( info ) ? info : &signal_information;
the_thread = _Thread_Executing; the_thread = _Thread_Executing;
@@ -68,11 +89,13 @@ int sigtimedwait(
/* API signals pending? */ /* API signals pending? */
_ISR_Disable( level );
if ( *set & api->signals_pending ) { if ( *set & api->signals_pending ) {
/* XXX real info later */ /* XXX real info later */
the_info->si_signo = _POSIX_signals_Get_highest( api->signals_pending ); the_info->si_signo = _POSIX_signals_Get_highest( api->signals_pending );
_POSIX_signals_Clear_signals( api, the_info->si_signo, the_info, _POSIX_signals_Clear_signals( api, the_info->si_signo, the_info, FALSE, FALSE );
FALSE, FALSE ); _ISR_Enable( level );
the_info->si_code = SI_USER; the_info->si_code = SI_USER;
the_info->si_value.sival_int = 0; the_info->si_value.sival_int = 0;
return the_info->si_signo; return the_info->si_signo;
@@ -83,6 +106,7 @@ int sigtimedwait(
if ( *set & _POSIX_signals_Pending ) { if ( *set & _POSIX_signals_Pending ) {
signo = _POSIX_signals_Get_highest( _POSIX_signals_Pending ); signo = _POSIX_signals_Get_highest( _POSIX_signals_Pending );
_POSIX_signals_Clear_signals( api, signo, the_info, TRUE, FALSE ); _POSIX_signals_Clear_signals( api, signo, the_info, TRUE, FALSE );
_ISR_Enable( level );
the_info->si_signo = signo; the_info->si_signo = signo;
the_info->si_code = SI_USER; the_info->si_code = SI_USER;
@@ -90,15 +114,6 @@ int sigtimedwait(
return signo; return signo;
} }
interval = 0;
if ( timeout ) {
if (timeout->tv_nsec < 0 || timeout->tv_nsec >= TOD_NANOSECONDS_PER_SECOND)
set_errno_and_return_minus_one( EINVAL );
interval = _POSIX_Timespec_to_interval( timeout );
}
the_info->si_signo = -1; the_info->si_signo = -1;
_Thread_Disable_dispatch(); _Thread_Disable_dispatch();
@@ -107,6 +122,7 @@ int sigtimedwait(
the_thread->Wait.option = *set; the_thread->Wait.option = *set;
the_thread->Wait.return_argument = (void *) the_info; the_thread->Wait.return_argument = (void *) the_info;
_Thread_queue_Enter_critical_section( &_POSIX_signals_Wait_queue ); _Thread_queue_Enter_critical_section( &_POSIX_signals_Wait_queue );
_ISR_Enable( level );
_Thread_queue_Enqueue( &_POSIX_signals_Wait_queue, interval ); _Thread_queue_Enqueue( &_POSIX_signals_Wait_queue, interval );
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
@@ -115,9 +131,7 @@ int sigtimedwait(
* the signal. * the signal.
*/ */
_POSIX_signals_Clear_signals( api, the_info->si_signo, the_info, _POSIX_signals_Clear_signals( api, the_info->si_signo, the_info, FALSE, FALSE );
FALSE, FALSE );
errno = _Thread_Executing->Wait.return_code; errno = _Thread_Executing->Wait.return_code;
return the_info->si_signo; return the_info->si_signo;
} }