general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix signal testcase and a bug in sig_set

Browse Source
This commit is contained in:
Hui, Chunyang 2020-07-17 06:53:27 +00:00 committed by tate.thl
parent c7e225a4eb
commit c43fbfea7f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libos/src/signal/sig_set.rs
View File

@ -34,7 +34,7 @@ impl SigSet {
} }
pub fn empty(&self) -> bool { pub fn empty(&self) -> bool {
self.bits != 0 self.bits == 0
} }
pub fn full(&self) -> bool { pub fn full(&self) -> bool {

8
test/signal/main.c
View File

@ -112,6 +112,8 @@ static void handle_sigio(int num, siginfo_t *info, void *context) {
int test_raise() { int test_raise() {
struct sigaction new_action, old_action; struct sigaction new_action, old_action;
memset(&new_action, 0, sizeof(struct sigaction));
memset(&old_action, 0, sizeof(struct sigaction));
new_action.sa_sigaction = handle_sigio; new_action.sa_sigaction = handle_sigio;
new_action.sa_flags = SA_SIGINFO | SA_NODEFER; new_action.sa_flags = SA_SIGINFO | SA_NODEFER;
if (sigaction(SIGIO, &new_action, &old_action) < 0) { if (sigaction(SIGIO, &new_action, &old_action) < 0) {
@ -236,6 +238,8 @@ int test_handle_sigfpe() {
#else #else
// Set up a signal handler that handles divide-by-zero exception // Set up a signal handler that handles divide-by-zero exception
struct sigaction new_action, old_action; struct sigaction new_action, old_action;
memset(&new_action, 0, sizeof(struct sigaction));
memset(&old_action, 0, sizeof(struct sigaction));
new_action.sa_sigaction = handle_sigfpe; new_action.sa_sigaction = handle_sigfpe;
new_action.sa_flags = SA_SIGINFO; new_action.sa_flags = SA_SIGINFO;
if (sigaction(SIGFPE, &new_action, &old_action) < 0) { if (sigaction(SIGFPE, &new_action, &old_action) < 0) {
@ -290,6 +294,8 @@ int test_handle_sigsegv() {
#else #else
// Set up a signal handler that handles divide-by-zero exception // Set up a signal handler that handles divide-by-zero exception
struct sigaction new_action, old_action; struct sigaction new_action, old_action;
memset(&new_action, 0, sizeof(struct sigaction));
memset(&old_action, 0, sizeof(struct sigaction));
new_action.sa_sigaction = handle_sigsegv; new_action.sa_sigaction = handle_sigsegv;
new_action.sa_flags = SA_SIGINFO; new_action.sa_flags = SA_SIGINFO;
if (sigaction(SIGSEGV, &new_action, &old_action) < 0) { if (sigaction(SIGSEGV, &new_action, &old_action) < 0) {
@ -357,6 +363,8 @@ int test_sigaltstack() {
} }
struct sigaction new_action, old_action; struct sigaction new_action, old_action;
memset(&new_action, 0, sizeof(struct sigaction));
memset(&old_action, 0, sizeof(struct sigaction));
new_action.sa_sigaction = handle_sigpipe; new_action.sa_sigaction = handle_sigpipe;
new_action.sa_flags = SA_SIGINFO | SA_NODEFER | SA_ONSTACK; new_action.sa_flags = SA_SIGINFO | SA_NODEFER | SA_ONSTACK;
if (sigaction(SIGPIPE, &new_action, &old_action) < 0) { if (sigaction(SIGPIPE, &new_action, &old_action) < 0) {