ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: cleanup signal.c 

No functional changes. Prepare the field for future fixes.

Remove memset(.., 0, ...) that is useless on a static array

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Taylor Simpson <tsimpson@quicinc.com>
Message-Id: <20200212125658.644558-3-laurent@vivier.eu>
This commit is contained in:
Laurent Vivier 2020-02-12 13:56:56 +01:00
parent 9d660adc32
commit 365510fb86
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
linux-user/signal.c
View File

@ -66,12 +66,6 @@ static uint8_t host_to_target_signal_table[_NSIG] = {
[SIGPWR] = TARGET_SIGPWR, [SIGPWR] = TARGET_SIGPWR,
[SIGSYS] = TARGET_SIGSYS, [SIGSYS] = TARGET_SIGSYS,
/* next signals stay the same */ /* next signals stay the same */
/* Nasty hack: Reverse SIGRTMIN and SIGRTMAX to avoid overlap with
host libpthread signals. This assumes no one actually uses SIGRTMAX :-/
To fix this properly we need to do manual signal delivery multiplexed
over a single host signal. */
[__SIGRTMIN] = __SIGRTMAX,
[__SIGRTMAX] = __SIGRTMIN,
}; };
static uint8_t target_to_host_signal_table[_NSIG]; static uint8_t target_to_host_signal_table[_NSIG];
@ -480,31 +474,45 @@ static int core_dump_signal(int sig)
} }
} }
static void signal_table_init(void)
{
int host_sig, target_sig;
/*
* Nasty hack: Reverse SIGRTMIN and SIGRTMAX to avoid overlap with
* host libpthread signals. This assumes no one actually uses SIGRTMAX :-/
* To fix this properly we need to do manual signal delivery multiplexed
* over a single host signal.
*/
host_to_target_signal_table[__SIGRTMIN] = __SIGRTMAX;
host_to_target_signal_table[__SIGRTMAX] = __SIGRTMIN;
/* generate signal conversion tables */
for (host_sig = 1; host_sig < _NSIG; host_sig++) {
if (host_to_target_signal_table[host_sig] == 0) {
host_to_target_signal_table[host_sig] = host_sig;
}
}
for (host_sig = 1; host_sig < _NSIG; host_sig++) {
target_sig = host_to_target_signal_table[host_sig];
target_to_host_signal_table[target_sig] = host_sig;
}
}
void signal_init(void) void signal_init(void)
{ {
TaskState *ts = (TaskState *)thread_cpu->opaque; TaskState *ts = (TaskState *)thread_cpu->opaque;
struct sigaction act; struct sigaction act;
struct sigaction oact; struct sigaction oact;
int i, j; int i;
int host_sig; int host_sig;
/* generate signal conversion tables */ /* initialize signal conversion tables */
for(i = 1; i < _NSIG; i++) { signal_table_init();
if (host_to_target_signal_table[i] == 0)
host_to_target_signal_table[i] = i;
}
for(i = 1; i < _NSIG; i++) {
j = host_to_target_signal_table[i];
target_to_host_signal_table[j] = i;
}
/* Set the signal mask from the host mask. */ /* Set the signal mask from the host mask. */
sigprocmask(0, 0, &ts->signal_mask); sigprocmask(0, 0, &ts->signal_mask);
/* set all host signal handlers. ALL signals are blocked during
the handlers to serialize them. */
memset(sigact_table, 0, sizeof(sigact_table));
sigfillset(&act.sa_mask); sigfillset(&act.sa_mask);
act.sa_flags = SA_SIGINFO; act.sa_flags = SA_SIGINFO;
act.sa_sigaction = host_signal_handler; act.sa_sigaction = host_signal_handler;