Changeset 7f9df7b9 in mainline for uspace/lib/posix/src/signal.c

Timestamp:

2018-01-22T22:42:57Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7a08c70

Parents:

e0f47f5

Message:

Remove unnecessary symbol renaming from libposix.

File:

• uspace/lib/posix/src/signal.c (modified) (30 diffs)

uspace/lib/posix/src/signal.c

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "posix/signal.h"
 #include "internal/common.h"
@@ -61 +58 @@
 static LIST_INITIALIZE(_signal_queue);
 
-static posix_sigset_t _signal_mask = 0;
+static sigset_t _signal_mask = 0;
 
 #define DEFAULT_HANDLER { .sa_handler = SIG_DFL, \
@@ -67 +64 @@
 
 /* Actions associated with each signal number. */
-static struct posix_sigaction _signal_actions[_TOP_SIGNAL + 1] = {
+static struct sigaction _signal_actions[_TOP_SIGNAL + 1] = {
         DEFAULT_HANDLER, DEFAULT_HANDLER, DEFAULT_HANDLER, DEFAULT_HANDLER, 
         DEFAULT_HANDLER, DEFAULT_HANDLER, DEFAULT_HANDLER, DEFAULT_HANDLER, 
@@ -111 +108 @@
         case SIGILL:
         case SIGSEGV:
-                posix_psignal(signo, "Hardware exception raised by user code");
+                psignal(signo, "Hardware exception raised by user code");
                 abort();
         case SIGSYS:
@@ -124 +121 @@
         case SIGTTIN:
         case SIGTTOU:
-                posix_psignal(signo, "Unsupported signal caught");
+                psignal(signo, "Unsupported signal caught");
                 abort();
         case SIGCHLD:
@@ -164 +161 @@
  * @return Always returns zero.
  */
-int posix_sigemptyset(posix_sigset_t *set)
+int sigemptyset(sigset_t *set)
 {
         assert(set != NULL);
@@ -178 +175 @@
  * @return Always returns zero.
  */
-int posix_sigfillset(posix_sigset_t *set)
+int sigfillset(sigset_t *set)
 {
         assert(set != NULL);
@@ -193 +190 @@
  * @return Always returns zero.
  */
-int posix_sigaddset(posix_sigset_t *set, int signo)
+int sigaddset(sigset_t *set, int signo)
 {
         assert(set != NULL);
@@ -208 +205 @@
  * @return Always returns zero.
  */
-int posix_sigdelset(posix_sigset_t *set, int signo)
+int sigdelset(sigset_t *set, int signo)
 {
         assert(set != NULL);
@@ -223 +220 @@
  * @return 1 if the signal is in the set, 0 otherwise.
  */
-int posix_sigismember(const posix_sigset_t *set, int signo)
+int sigismember(const sigset_t *set, int signo)
 {
         assert(set != NULL);
@@ -239 +236 @@
  * @param oact
  */
-static void _sigaction_unsafe(int sig, const struct posix_sigaction *restrict act,
-    struct posix_sigaction *restrict oact)
+static void _sigaction_unsafe(int sig, const struct sigaction *restrict act,
+    struct sigaction *restrict oact)
 {
         if (oact != NULL) {
                 memcpy(oact, &_signal_actions[sig],
-                    sizeof(struct posix_sigaction));
+                    sizeof(struct sigaction));
         }
 
         if (act != NULL) {
                 memcpy(&_signal_actions[sig], act,
-                    sizeof(struct posix_sigaction));
+                    sizeof(struct sigaction));
         }
 }
@@ -263 +260 @@
  * @return -1 with errno set on failure, 0 on success.
  */
-int posix_sigaction(int sig, const struct posix_sigaction *restrict act,
-    struct posix_sigaction *restrict oact)
+int sigaction(int sig, const struct sigaction *restrict act,
+    struct sigaction *restrict oact)
 {
         if (sig > _TOP_SIGNAL || (act != NULL &&
@@ -273 +270 @@
 
         if (sig > _TOP_CATCHABLE_SIGNAL) {
-                posix_psignal(sig,
+                psignal(sig,
                     "WARNING: registering handler for a partially"
                     " or fully unsupported signal. This handler may only be"
@@ -294 +291 @@
  * @return SIG_ERR on failure, original handler on success.
  */
-void (*posix_signal(int sig, void (*func)(int)))(int)
-{
-        struct posix_sigaction new = {
+void (*signal(int sig, void (*func)(int)))(int)
+{
+        struct sigaction new = {
                 .sa_handler = func,
                 .sa_mask = 0,
@@ -302 +299 @@
                 .sa_sigaction = NULL
         };
-        struct posix_sigaction old;
-        if (posix_sigaction(sig, func == NULL ? NULL : &new, &old) == 0) {
+        struct sigaction old;
+        if (sigaction(sig, func == NULL ? NULL : &new, &old) == 0) {
                 return old.sa_handler;
         } else {
@@ -313 +310 @@
         link_t link;
         int signo;
-        posix_siginfo_t siginfo;
+        siginfo_t siginfo;
 } signal_queue_item;
 
@@ -322 +319 @@
  * @param siginfo Additional information about the signal.
  */
-static void _queue_signal(int signo, posix_siginfo_t *siginfo)
+static void _queue_signal(int signo, siginfo_t *siginfo)
 {
         assert(signo >= 0 && signo <= _TOP_SIGNAL);
@@ -330 +327 @@
         link_initialize(&(item->link));
         item->signo = signo;
-        memcpy(&item->siginfo, siginfo, sizeof(posix_siginfo_t));
+        memcpy(&item->siginfo, siginfo, sizeof(siginfo_t));
         list_append(&(item->link), &_signal_queue);
 }
@@ -343 +340 @@
  *     blocked.
  */
-static int _raise_sigaction(int signo, posix_siginfo_t *siginfo)
+static int _raise_sigaction(int signo, siginfo_t *siginfo)
 {
         assert(signo >= 0 && signo <= _TOP_SIGNAL);
@@ -350 +347 @@
         fibril_mutex_lock(&_signal_mutex);
 
-        struct posix_sigaction action = _signal_actions[signo];
-
-        if (posix_sigismember(&_signal_mask, signo) ||
+        struct sigaction action = _signal_actions[signo];
+
+        if (sigismember(&_signal_mask, signo) ||
             action.sa_handler == SIG_HOLD) {
                 _queue_signal(signo, siginfo);
@@ -364 +361 @@
 
         if ((action.sa_flags & SA_RESETHAND) && signo != SIGILL && signo != SIGTRAP) {
-                _signal_actions[signo] = (struct posix_sigaction) DEFAULT_HANDLER;
+                _signal_actions[signo] = (struct sigaction) DEFAULT_HANDLER;
         }
 
@@ -394 +391 @@
                     list_get_instance(iterator, signal_queue_item, link);
                 
-                if (!posix_sigismember(&_signal_mask, item->signo) &&
+                if (!sigismember(&_signal_mask, item->signo) &&
                     _signal_actions[item->signo].sa_handler != SIG_HOLD) {
                         list_remove(&(item->link));
@@ -411 +408 @@
  * @return -1 with errno set on failure, 0 on success.
  */
-int posix_raise(int sig)
+int raise(int sig)
 {
         if (sig >= 0 && sig <= _TOP_SIGNAL) {
-                posix_siginfo_t siginfo = {
+                siginfo_t siginfo = {
                         .si_signo = sig,
                         .si_code = SI_USER
@@ -433 +430 @@
  *     action, invalid signal number, lack of permissions, etc.), 0 on success.
  */
-int posix_kill(posix_pid_t pid, int signo)
+int kill(pid_t pid, int signo)
 {
         if (pid < 1) {
@@ -446 +443 @@
         }
 
-        if (pid == (posix_pid_t) task_get_id()) {
-                return posix_raise(signo);
+        if (pid == (pid_t) task_get_id()) {
+                return raise(signo);
         }
 
@@ -471 +468 @@
  * @return -1 on failure, 0 on success (see kill()).
  */
-int posix_killpg(posix_pid_t pid, int sig)
+int killpg(pid_t pid, int sig)
 {
         assert(pid > 1);
-        return posix_kill(-pid, sig);
+        return kill(-pid, sig);
 }
 
@@ -483 +480 @@
  * @param message String to output alongside human-readable signal description.
  */
-void posix_psiginfo(const posix_siginfo_t *pinfo, const char *message)
+void psiginfo(const siginfo_t *pinfo, const char *message)
 {
         assert(pinfo != NULL);
-        posix_psignal(pinfo->si_signo, message);
+        psignal(pinfo->si_signo, message);
         // TODO: print si_code
 }
@@ -496 +493 @@
  * @param message String to output alongside human-readable signal description.
  */
-void posix_psignal(int signum, const char *message)
-{
-        char *sigmsg = posix_strsignal(signum);
+void psignal(int signum, const char *message)
+{
+        char *sigmsg = strsignal(signum);
         if (message == NULL || *message == '\0') {
                 fprintf(stderr, "%s\n", sigmsg);
@@ -514 +511 @@
  * @return 0 success, errorcode on failure.
  */
-int posix_thread_sigmask(int how, const posix_sigset_t *restrict set,
-    posix_sigset_t *restrict oset)
+int thread_sigmask(int how, const sigset_t *restrict set,
+    sigset_t *restrict oset)
 {
         fibril_mutex_lock(&_signal_mutex);
@@ -554 +551 @@
  * @return 0 on success, -1 with errno set on failure.
  */
-int posix_sigprocmask(int how, const posix_sigset_t *restrict set,
-    posix_sigset_t *restrict oset)
-{
-        int result = posix_thread_sigmask(how, set, oset);
+int sigprocmask(int how, const sigset_t *restrict set,
+    sigset_t *restrict oset)
+{
+        int result = thread_sigmask(how, set, oset);
         if (result != 0) {
                 errno = result;