Changeset fdf97f6 in mainline for uspace/lib/posix/include/posix/signal.h

Timestamp:

2013-02-25T19:11:50Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1935591

Parents:

c84f1a4

Message:

Libposix functions are without posix_ prefix

Prior this commit, libposix headers declared all functions as posix_*
and used macros to rename e.g. strncpy to posix_strncpy in all (ported)
sources.

After this change, libposix headers look as normal POSIX compliant headers
(well, almost) and no renaming is done in the source codei (of the ported
applications). Instead, the renaming is done at object files level to
bypass weird problems that are bound to happen if you use macros.

The scheme is following. libposix headers use special macro to declare
the names. When included from outside, the functions have their normal
(standard) names. When included from the libposix sources, posix_ prefix
is added. Thus, when libposix is compiled and linked, it contains the
posix_* naming while compiling of ported software uses the normal
non-prefixed versions. This way the posix_* can use HelenOS libc without
any problem. Before linking, the posix_* prefix is removed from all
symbols and special prefix helenos_libc_ is added to all functions
that exists in our (HelenOS) libc and its name clashes with the POSIX
one.

The following happens, for example, to the open() function that exists in
both libposix and in libc.

• Headers and sources of libc are left intact.
• Copy of libc.a is made and to all clashing functions is added the helenos_libc prefix. This library is called libc4posix.a.
• POSIX_DEF(open)(const char *) is used in libposix headers. This macro expands to plain open when included from the "outside world". But it expands to posix_open when included from libposix sources.
• Libposix is compiled and linked, containing posix_open() that internally calls open() [the original one from libc].
• Libposix is transformed - all open() are replaced with prefix variant: helenos_libc_open() and all posix_open() are replaced with open(). The transformed library is stored as libposixaslibc.a

Binutils and PCC are then linked with libc4posix and libposixaslibc
libraries instead of libc and libposix as was done previously.

WARNING: it looks that binutils, PCC and MSIM still works but not all
architectures were tested.

File:

• uspace/lib/posix/include/posix/signal.h (modified) (6 diffs)

uspace/lib/posix/include/posix/signal.h

@@ -36 +36 @@
 #define POSIX_SIGNAL_H_
 
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
+
 #include "sys/types.h"
 
@@ -51 +55 @@
 #define SIG_IGN ((void (*)(int)) __posix_ignore_signal_handler)
 
-typedef int posix_sig_atomic_t;
-typedef uint32_t posix_sigset_t;
-typedef struct posix_mcontext {
+typedef int __POSIX_DEF__(sig_atomic_t);
+typedef uint32_t __POSIX_DEF__(sigset_t);
+typedef struct __POSIX_DEF__(mcontext) {
         /* must not be empty to avoid compiler warnings (-pedantic) */
         int dummy;
-} posix_mcontext_t;
-
-union posix_sigval {
+} __POSIX_DEF__(mcontext_t);
+
+union __POSIX_DEF__(sigval) {
         int sival_int;
         void *sival_ptr;
 };
 
-struct posix_sigevent {
+struct __POSIX_DEF__(sigevent) {
         int sigev_notify; /* Notification type. */
         int sigev_signo; /* Signal number. */
-        union posix_sigval sigev_value; /* Signal value. */
-        void (*sigev_notify_function)(union posix_sigval); /* Notification function. */
-        posix_thread_attr_t *sigev_notify_attributes; /* Notification attributes. */
+        union __POSIX_DEF__(sigval) sigev_value; /* Signal value. */
+        void (*sigev_notify_function)(union __POSIX_DEF__(sigval)); /* Notification function. */
+        __POSIX_DEF__(thread_attr_t) *sigev_notify_attributes; /* Notification attributes. */
 };
 
@@ -77 +81 @@
         int si_errno;
 
-        posix_pid_t si_pid;
-        posix_uid_t si_uid;
+        __POSIX_DEF__(pid_t) si_pid;
+        __POSIX_DEF__(uid_t) si_uid;
         void *si_addr;
         int si_status;
@@ -84 +88 @@
         long si_band;
 
-        union posix_sigval si_value;
-} posix_siginfo_t;
-
-struct posix_sigaction {
+        union __POSIX_DEF__(sigval) si_value;
+} __POSIX_DEF__(siginfo_t);
+
+struct __POSIX_DEF__(sigaction) {
         void (*sa_handler)(int);
-        posix_sigset_t sa_mask;
+        __POSIX_DEF__(sigset_t) sa_mask;
         int sa_flags;
-        void (*sa_sigaction)(int, posix_siginfo_t *, void *);
+        void (*sa_sigaction)(int, __POSIX_DEF__(siginfo_t) *, void *);
 };
 
@@ -98 +102 @@
         size_t ss_size;
         int ss_flags;
-} posix_stack_t;
-
-typedef struct posix_ucontext {
-        struct posix_ucontext *uc_link;
-        posix_sigset_t uc_sigmask;
-        posix_stack_t uc_stack;
-        posix_mcontext_t uc_mcontext;
-} posix_ucontext_t;
-
-/* Values of posix_sigevent::sigev_notify */
+} __POSIX_DEF__(stack_t);
+
+typedef struct __POSIX_DEF__(ucontext) {
+        struct __POSIX_DEF__(ucontext) *uc_link;
+        __POSIX_DEF__(sigset_t) uc_sigmask;
+        __POSIX_DEF__(stack_t) uc_stack;
+        __POSIX_DEF__(mcontext_t) uc_mcontext;
+} __POSIX_DEF__(ucontext_t);
+
+/* Values of __POSIX_DEF__(sigevent)::sigev_notify */
 #undef SIGEV_NONE
 #undef SIGEV_SIGNAL
@@ -255 +259 @@
 };
 
-extern int posix_sigaction(int sig, const struct posix_sigaction *restrict act,
-    struct posix_sigaction *restrict oact);
-
-extern void (*posix_signal(int sig, void (*func)(int)))(int);
-extern int posix_raise(int sig);
-extern int posix_kill(posix_pid_t pid, int sig);
-extern int posix_killpg(posix_pid_t pid, int sig);
-
-extern void posix_psiginfo(const posix_siginfo_t *pinfo, const char *message);
-extern void posix_psignal(int signum, const char *message);
-
-extern int posix_sigemptyset(posix_sigset_t *set);
-extern int posix_sigfillset(posix_sigset_t *set);
-extern int posix_sigaddset(posix_sigset_t *set, int signo);
-extern int posix_sigdelset(posix_sigset_t *set, int signo);
-extern int posix_sigismember(const posix_sigset_t *set, int signo);
-
-extern int posix_thread_sigmask(int how, const posix_sigset_t *restrict set,
-    posix_sigset_t *restrict oset);
-extern int posix_sigprocmask(int how, const posix_sigset_t *restrict set,
-    posix_sigset_t *restrict oset);
-
-#ifndef LIBPOSIX_INTERNAL
-        #define sig_atomic_t posix_sig_atomic_t
-        #define sigset_t posix_sigset_t
-        #define sigval posix_sigval
-        #ifndef sigevent
-                #define sigevent posix_sigevent
-        #endif
-        #define mcontext_t posix_mcontext_t
-        #define ucontext_t posix_ucontext_t
-        #define stack_t posix_stack_t
-        #define siginfo_t posix_siginfo_t
-
-        #define sigaction posix_sigaction
-
-        #define signal posix_signal
-        #define raise posix_raise
-        #define kill posix_kill
-        #define killpg posix_killpg
-
-        #define psiginfo posix_psiginfo
-        #define psignal posix_psignal
-
-        #define sigemptyset posix_sigemptyset
-        #define sigfillset posix_sigfillset
-        #define sigaddset posix_sigaddset
-        #define sigdelset posix_sigdelset
-        #define sigismember posix_sigismember
-
-        #define pthread_sigmask posix_thread_sigmask
-        #define sigprocmask posix_sigprocmask
-#endif
+extern int __POSIX_DEF__(sigaction)(int sig, const struct __POSIX_DEF__(sigaction) *restrict act,
+    struct __POSIX_DEF__(sigaction) *restrict oact);
+
+extern void (*__POSIX_DEF__(signal)(int sig, void (*func)(int)))(int);
+extern int __POSIX_DEF__(raise)(int sig);
+extern int __POSIX_DEF__(kill)(__POSIX_DEF__(pid_t) pid, int sig);
+extern int __POSIX_DEF__(killpg)(__POSIX_DEF__(pid_t) pid, int sig);
+
+extern void __POSIX_DEF__(psiginfo)(const __POSIX_DEF__(siginfo_t) *pinfo, const char *message);
+extern void __POSIX_DEF__(psignal)(int signum, const char *message);
+
+extern int __POSIX_DEF__(sigemptyset)(__POSIX_DEF__(sigset_t) *set);
+extern int __POSIX_DEF__(sigfillset)(__POSIX_DEF__(sigset_t) *set);
+extern int __POSIX_DEF__(sigaddset)(__POSIX_DEF__(sigset_t) *set, int signo);
+extern int __POSIX_DEF__(sigdelset)(__POSIX_DEF__(sigset_t) *set, int signo);
+extern int __POSIX_DEF__(sigismember)(const __POSIX_DEF__(sigset_t) *set, int signo);
+
+extern int __POSIX_DEF__(thread_sigmask)(int how, const __POSIX_DEF__(sigset_t) *restrict set,
+    __POSIX_DEF__(sigset_t) *restrict oset);
+extern int __POSIX_DEF__(sigprocmask)(int how, const __POSIX_DEF__(sigset_t) *restrict set,
+    __POSIX_DEF__(sigset_t) *restrict oset);
+
 
 #endif /* POSIX_SIGNAL_H_ */