RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:27:45 +00:00
Code Issues Activity Actions

Kernel: Remove "restorer" field from SignalActionData.

Browse source 
I was originally implementing signals by looking at some man page about
sigaction() to see how it works. It seems like the restorer thingy is
system-specific and not required by POSIX, so let's get rid of it.
This commit is contained in:
Andreas Kling 2019-04-20 19:32:14 +02:00
parent 5562ab3f5a
commit 5f63f8120c
6 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Process.cpp
View file

@ -1601,10 +1601,8 @@ int Process::sys$sigaction(int signum, const sigaction* act, sigaction* old_act)
if (!validate_write_typed(old_act)) if (!validate_write_typed(old_act))
return -EFAULT; return -EFAULT;
old_act->sa_flags = action.flags; old_act->sa_flags = action.flags;
old_act->sa_restorer = (decltype(old_act->sa_restorer))action.restorer.get();
old_act->sa_sigaction = (decltype(old_act->sa_sigaction))action.handler_or_sigaction.get(); old_act->sa_sigaction = (decltype(old_act->sa_sigaction))action.handler_or_sigaction.get();
} }
action.restorer = LinearAddress((dword)act->sa_restorer);
action.flags = act->sa_flags; action.flags = act->sa_flags;
action.handler_or_sigaction = LinearAddress((dword)act->sa_sigaction); action.handler_or_sigaction = LinearAddress((dword)act->sa_sigaction);
return 0; return 0;

1
Kernel/Thread.h
View file

@ -21,7 +21,6 @@ struct SignalActionData {
LinearAddress handler_or_sigaction; LinearAddress handler_or_sigaction;
dword mask { 0 }; dword mask { 0 };
int flags { 0 }; int flags { 0 };
LinearAddress restorer;
}; };
class Thread : public InlineLinkedListNode<Thread> { class Thread : public InlineLinkedListNode<Thread> {

1
Kernel/UnixTypes.h
View file

@ -246,7 +246,6 @@ struct sigaction {
}; };
sigset_t sa_mask; sigset_t sa_mask;
int sa_flags; int sa_flags;
void (*sa_restorer)(void);
}; };
#define SA_NOCLDSTOP 1 #define SA_NOCLDSTOP 1

1
LibC/signal.cpp
View file

@ -33,7 +33,6 @@ sighandler_t signal(int signum, sighandler_t handler)
new_act.sa_handler = handler; new_act.sa_handler = handler;
new_act.sa_flags = 0; new_act.sa_flags = 0;
new_act.sa_mask = 0; new_act.sa_mask = 0;
new_act.sa_restorer = nullptr;
int rc = sigaction(signum, &new_act, &old_act); int rc = sigaction(signum, &new_act, &old_act);
if (rc < 0) if (rc < 0)
return SIG_ERR; return SIG_ERR;

1
LibC/signal.h
View file

@ -19,7 +19,6 @@ struct sigaction {
}; };
sigset_t sa_mask; sigset_t sa_mask;
int sa_flags; int sa_flags;
void (*sa_restorer)(void);
}; };
int kill(pid_t, int sig); int kill(pid_t, int sig);

1
Userland/sh.cpp
View file

@ -232,7 +232,6 @@ int main(int argc, char** argv)
sa.sa_handler = handle_sigint; sa.sa_handler = handle_sigint;
sa.sa_flags = 0; sa.sa_flags = 0;
sa.sa_mask = 0; sa.sa_mask = 0;
sa.sa_restorer = nullptr;
int rc = sigaction(SIGINT, &sa, nullptr); int rc = sigaction(SIGINT, &sa, nullptr);
assert(rc == 0); assert(rc == 0);
} }