Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-10 16:51:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

posix: Make _POSIX_signals_Check_signal() static

Browse Source
This commit is contained in:
Sebastian Huber
2016-04-06 09:08:21 +02:00
parent 7d217001ab
commit 3c89525608
4 changed files with 75 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/posix/Makefile.am
+1 -1
View File
@@ -147,7 +147,7 @@ endif
## PSIGNAL_C_FILES
libposix_a_SOURCES += src/psignal.c src/alarm.c src/kill.c src/killinfo.c \
src/kill_r.c src/pause.c src/psignalclearprocesssignals.c \
src/psignalsetprocesssignals.c src/psignalchecksignal.c \
src/psignalsetprocesssignals.c \
src/psignalclearsignals.c src/psignalunblockthread.c src/pthreadkill.c \
src/pthreadsigmask.c src/sigaction.c
endif
cpukit/posix/include/rtems/posix/psignalimpl.h
-9
View File
@@ -95,15 +95,6 @@ bool _POSIX_signals_Unblock_thread(
siginfo_t *info
);
/**
* @brief Check POSIX signal.
*/
bool _POSIX_signals_Check_signal(
POSIX_API_Control *api,
int signo,
bool is_global
);
/**
* @brief Clear POSIX signals.
*/
cpukit/posix/src/psignal.c
+74
View File
@@ -107,6 +107,80 @@ Chain_Control _POSIX_signals_Siginfo[ SIG_ARRAY_MAX ];
(STATES_WAITING_FOR_SIGNAL|STATES_INTERRUPTIBLE_BY_SIGNAL)) == \
(STATES_WAITING_FOR_SIGNAL|STATES_INTERRUPTIBLE_BY_SIGNAL))
static void _POSIX_signals_Check_signal(
POSIX_API_Control *api,
int signo,
bool is_global
)
{
siginfo_t siginfo_struct;
sigset_t saved_signals_unblocked;
Thread_Wait_information stored_thread_wait_information;
Thread_Control *executing;
if ( ! _POSIX_signals_Clear_signals( api, signo, &siginfo_struct,
is_global, true, true ) )
return;
/*
* Since we made a union of these, only one test is necessary but this is
* safer.
*/
#if defined(RTEMS_DEBUG)
assert( _POSIX_signals_Vectors[ signo ].sa_handler ||
_POSIX_signals_Vectors[ signo ].sa_sigaction );
#endif
/*
* Just to prevent sending a signal which is currently being ignored.
*/
if ( _POSIX_signals_Vectors[ signo ].sa_handler == SIG_IGN )
return;
/*
* Block the signals requested in sa_mask
*/
saved_signals_unblocked = api->signals_unblocked;
api->signals_unblocked &= ~_POSIX_signals_Vectors[ signo ].sa_mask;
executing = _Thread_Get_executing();
/*
* We have to save the blocking information of the current wait queue
* because the signal handler may subsequently go on and put the thread
* on a wait queue, for its own purposes.
*/
memcpy( &stored_thread_wait_information, &executing->Wait,
sizeof( stored_thread_wait_information ));
/*
* Here, the signal handler function executes
*/
switch ( _POSIX_signals_Vectors[ signo ].sa_flags ) {
case SA_SIGINFO:
(*_POSIX_signals_Vectors[ signo ].sa_sigaction)(
signo,
&siginfo_struct,
NULL /* context is undefined per 1003.1b-1993, p. 66 */
);
break;
default:
(*_POSIX_signals_Vectors[ signo ].sa_handler)( signo );
break;
}
/*
* Restore the blocking information
*/
memcpy( &executing->Wait, &stored_thread_wait_information,
sizeof( executing->Wait ));
/*
* Restore the previous set of unblocked signals
*/
api->signals_unblocked = saved_signals_unblocked;
}
void _POSIX_signals_Action_handler(
Thread_Control *executing,
Thread_Action *action,
cpukit/posix/src/psignalchecksignal.c
-113
View File
@@ -1,113 +0,0 @@
/**
* @file
*
* @brief POSIX Signals Check Signal
* @ingroup POSIX_SIGNALS
*/
/*
* COPYRIGHT (c) 1989-2007.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#endif
#if defined(RTEMS_DEBUG)
#include <assert.h>
#endif
#include <errno.h>
#include <pthread.h>
#include <signal.h>
#include <string.h>
#include <rtems/system.h>
#include <rtems/score/isr.h>
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
#include <rtems/seterr.h>
#include <rtems/posix/threadsup.h>
#include <rtems/posix/psignalimpl.h>
#include <rtems/posix/pthreadimpl.h>
#include <stdio.h>
bool _POSIX_signals_Check_signal(
POSIX_API_Control *api,
int signo,
bool is_global
)
{
siginfo_t siginfo_struct;
sigset_t saved_signals_unblocked;
Thread_Wait_information stored_thread_wait_information;
Thread_Control *executing;
if ( ! _POSIX_signals_Clear_signals( api, signo, &siginfo_struct,
is_global, true, true ) )
return false;
/*
* Since we made a union of these, only one test is necessary but this is
* safer.
*/
#if defined(RTEMS_DEBUG)
assert( _POSIX_signals_Vectors[ signo ].sa_handler ||
_POSIX_signals_Vectors[ signo ].sa_sigaction );
#endif
/*
* Just to prevent sending a signal which is currently being ignored.
*/
if ( _POSIX_signals_Vectors[ signo ].sa_handler == SIG_IGN )
return false;
/*
* Block the signals requested in sa_mask
*/
saved_signals_unblocked = api->signals_unblocked;
api->signals_unblocked &= ~_POSIX_signals_Vectors[ signo ].sa_mask;
executing = _Thread_Get_executing();
/*
* We have to save the blocking information of the current wait queue
* because the signal handler may subsequently go on and put the thread
* on a wait queue, for its own purposes.
*/
memcpy( &stored_thread_wait_information, &executing->Wait,
sizeof( stored_thread_wait_information ));
/*
* Here, the signal handler function executes
*/
switch ( _POSIX_signals_Vectors[ signo ].sa_flags ) {
case SA_SIGINFO:
(*_POSIX_signals_Vectors[ signo ].sa_sigaction)(
signo,
&siginfo_struct,
NULL /* context is undefined per 1003.1b-1993, p. 66 */
);
break;
default:
(*_POSIX_signals_Vectors[ signo ].sa_handler)( signo );
break;
}
/*
* Restore the blocking information
*/
memcpy( &executing->Wait, &stored_thread_wait_information,
sizeof( executing->Wait ));
/*
* Restore the previous set of unblocked signals
*/
api->signals_unblocked = saved_signals_unblocked;
return true;
}