X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fsignal.c;h=66f5c0ecb9045804f3283bb1b19d0adfd5947c63;hb=cac75b7d290e610827a0958f763afe9b11af3d56;hp=d995fa970d318612b800ca76430ee0aa767f8b8b;hpb=11b3c493f4c3050570852ebb5dd5f71e7fb2e960;p=mono.git diff --git a/support/signal.c b/support/signal.c index d995fa970d3..66f5c0ecb90 100644 --- a/support/signal.c +++ b/support/signal.c @@ -4,6 +4,7 @@ * Authors: * Jonathan Pryor (jonpryor@vt.edu) * Jonathan Pryor (jpryor@novell.com) + * Tim Jenks (tim.jenks@realtimeworlds.com) * * Copyright (C) 2004-2005 Jonathan Pryor * Copyright (C) 2008 Novell, Inc. @@ -14,13 +15,15 @@ #include "map.h" #include "mph.h" -#ifndef PLATFORM_WIN32 +#ifndef HOST_WIN32 #include #include +#include #include #include #include #include +#include #endif G_BEGIN_DECLS @@ -28,6 +31,8 @@ G_BEGIN_DECLS typedef void (*mph_sighandler_t)(int); typedef struct Mono_Unix_UnixSignal_SignalInfo signal_info; +static int count_handlers (int signum); + void* Mono_Posix_Stdlib_SIG_DFL (void) { @@ -53,7 +58,66 @@ Mono_Posix_Stdlib_InvokeSignalHandler (int signum, void *handler) _h (signum); } -#ifndef PLATFORM_WIN32 +int Mono_Posix_SIGRTMIN (void) +{ +#ifdef SIGRTMIN + return SIGRTMIN; +#else /* def SIGRTMIN */ + return -1; +#endif /* ndef SIGRTMIN */ +} + +int Mono_Posix_SIGRTMAX (void) +{ +#ifdef SIGRTMAX + return SIGRTMAX; +#else /* def SIGRTMAX */ + return -1; +#endif /* ndef SIGRTMAX */ +} + +int Mono_Posix_FromRealTimeSignum (int offset, int *r) +{ + if (NULL == r) { + errno = EINVAL; + return -1; + } + *r = 0; +#if defined (SIGRTMIN) && defined (SIGRTMAX) + if ((offset < 0) || (SIGRTMIN > SIGRTMAX - offset)) { + errno = EINVAL; + return -1; + } + *r = SIGRTMIN+offset; + return 0; +#else /* defined (SIGRTMIN) && defined (SIGRTMAX) */ +# ifdef ENOSYS + errno = ENOSYS; +# endif /* ENOSYS */ + return -1; +#endif /* defined (SIGRTMIN) && defined (SIGRTMAX) */ +} + +#ifndef HOST_WIN32 + +#ifdef WAPI_ATOMIC_ASM + #define mph_int_get(p) InterlockedExchangeAdd ((p), 0) + #define mph_int_inc(p) InterlockedIncrement ((p)) + #define mph_int_dec_test(p) (InterlockedDecrement ((p)) == 0) + #define mph_int_set(p,o,n) InterlockedExchange ((p), (n)) +#elif GLIB_CHECK_VERSION(2,4,0) + #define mph_int_get(p) g_atomic_int_get ((p)) + #define mph_int_inc(p) do {g_atomic_int_inc ((p));} while (0) + #define mph_int_dec_test(p) g_atomic_int_dec_and_test ((p)) + #define mph_int_set(p,o,n) do { \ + while (!g_atomic_int_compare_and_exchange ((p), (o), (n))) {} \ + } while (0) +#else + #define mph_int_get(p) (*(p)) + #define mph_int_inc(p) do { (*(p))++; } while (0) + #define mph_int_dec_test(p) (--(*(p)) == 0) + #define mph_int_set(p,o,n) do { *(p) = n; } while (0) +#endif int Mono_Posix_Syscall_psignal (int sig, const char* s) @@ -66,6 +130,27 @@ Mono_Posix_Syscall_psignal (int sig, const char* s) #define NUM_SIGNALS 64 static signal_info signals[NUM_SIGNALS]; +static int acquire_mutex (pthread_mutex_t *mutex) +{ + int mr; + while ((mr = pthread_mutex_lock (mutex)) == EAGAIN) { + /* try to acquire again */ + } + if ((mr != 0) && (mr != EDEADLK)) { + errno = mr; + return -1; + } + return 0; +} + +static void release_mutex (pthread_mutex_t *mutex) +{ + int mr; + while ((mr = pthread_mutex_unlock (mutex)) == EAGAIN) { + /* try to release mutex again */ + } +} + static void default_handler (int signum) { @@ -73,13 +158,19 @@ default_handler (int signum) for (i = 0; i < NUM_SIGNALS; ++i) { int fd; signal_info* h = &signals [i]; - if (g_atomic_int_get (&h->signum) != signum) + if (mph_int_get (&h->signum) != signum) continue; - g_atomic_int_inc (&h->count); - fd = g_atomic_int_get (&h->write_fd); + mph_int_inc (&h->count); + fd = mph_int_get (&h->write_fd); if (fd > 0) { + int j,pipecounter; char c = signum; - write (fd, &c, 1); + pipecounter = mph_int_get (&h->pipecnt); + for (j = 0; j < pipecounter; ++j) { + int r; + do { r = write (fd, &c, 1); } while (r == -1 && errno == EINTR); + fsync (fd); /* force */ + } } } } @@ -89,16 +180,26 @@ static pthread_mutex_t signals_mutex = PTHREAD_MUTEX_INITIALIZER; void* Mono_Unix_UnixSignal_install (int sig) { - int i, mr; + int i; signal_info* h = NULL; int have_handler = 0; - void* handler; + void* handler = NULL; - mr = pthread_mutex_lock (&signals_mutex); - if (mr != 0) { - errno = mr; + if (acquire_mutex (&signals_mutex) == -1) return NULL; + +#if defined (SIGRTMIN) && defined (SIGRTMAX) + /*The runtime uses some rt signals for itself so it's important to not override them.*/ + if (sig >= SIGRTMIN && sig <= SIGRTMAX && count_handlers (sig) == 0) { + struct sigaction sinfo; + sigaction (sig, NULL, &sinfo); + if (sinfo.sa_handler != SIG_DFL || (void*)sinfo.sa_sigaction != (void*)SIG_DFL) { + pthread_mutex_unlock (&signals_mutex); + errno = EADDRINUSE; + return NULL; + } } +#endif /*defined (SIGRTMIN) && defined (SIGRTMAX)*/ for (i = 0; i < NUM_SIGNALS; ++i) { if (h == NULL && signals [i].signum == 0) { @@ -128,11 +229,12 @@ Mono_Unix_UnixSignal_install (int sig) } if (h) { - g_atomic_int_set (&h->count, 0); - g_atomic_int_set (&h->signum, sig); + mph_int_set (&h->count, h->count, 0); + mph_int_set (&h->signum, h->signum, sig); + mph_int_set (&h->pipecnt, h->pipecnt, 0); } - pthread_mutex_unlock (&signals_mutex); + release_mutex (&signals_mutex); return h; } @@ -153,13 +255,10 @@ int Mono_Unix_UnixSignal_uninstall (void* info) { signal_info* h; - int mr, r = -1; + int r = -1; - mr = pthread_mutex_lock (&signals_mutex); - if (mr != 0) { - errno = mr; + if (acquire_mutex (&signals_mutex) == -1) return -1; - } h = info; @@ -177,28 +276,33 @@ Mono_Unix_UnixSignal_uninstall (void* info) h->signum = 0; } - pthread_mutex_unlock (&signals_mutex); + release_mutex (&signals_mutex); return r; } static int -setup_pipes (signal_info** signals, int count, fd_set *read_fds, int *max_fd) +setup_pipes (signal_info** signals, int count, struct pollfd *fd_structs, int *currfd) { - int i, r; + int i; + int r = 0; for (i = 0; i < count; ++i) { signal_info* h; int filedes[2]; - if ((r = pipe (filedes)) != 0) { - break; - } h = signals [i]; - h->read_fd = filedes [0]; - h->write_fd = filedes [1]; - if (h->read_fd > *max_fd) - *max_fd = h->read_fd; - FD_SET (h->read_fd, read_fds); + + if (mph_int_get (&h->pipecnt) == 0) { + if ((r = pipe (filedes)) != 0) { + break; + } + h->read_fd = filedes [0]; + h->write_fd = filedes [1]; + } + mph_int_inc (&h->pipecnt); + fd_structs[*currfd].fd = h->read_fd; + fd_structs[*currfd].events = POLLIN; + ++(*currfd); } return r; } @@ -209,19 +313,22 @@ teardown_pipes (signal_info** signals, int count) int i; for (i = 0; i < count; ++i) { signal_info* h = signals [i]; - if (h->read_fd != 0) - close (h->read_fd); - if (h->write_fd != 0) - close (h->write_fd); - h->read_fd = 0; - h->write_fd = 0; + + if (mph_int_dec_test (&h->pipecnt)) { + if (h->read_fd != 0) + close (h->read_fd); + if (h->write_fd != 0) + close (h->write_fd); + h->read_fd = 0; + h->write_fd = 0; + } } } static int -wait_for_any (signal_info** signals, int count, int max_fd, fd_set* read_fds, int timeout) +wait_for_any (signal_info** signals, int count, int *currfd, struct pollfd* fd_structs, int timeout) { - int r; + int r, idx; do { struct timeval tv; struct timeval *ptv = NULL; @@ -230,58 +337,70 @@ wait_for_any (signal_info** signals, int count, int max_fd, fd_set* read_fds, in tv.tv_usec = (timeout % 1000)*1000; ptv = &tv; } - - r = select (max_fd + 1, read_fds, NULL, NULL, ptv); + r = poll (fd_structs, count, timeout); } while (r == -1 && errno == EINTR); - if (r > 0) { + idx = -1; + if (r == 0) + idx = timeout; + else if (r > 0) { int i; for (i = 0; i < count; ++i) { signal_info* h = signals [i]; - if (FD_ISSET (h->read_fd, read_fds)) { + if (fd_structs[i].revents & POLLIN) { + int r; char c; - read (h->read_fd, &c, 1); /* ignore error */ + do { + r = read (h->read_fd, &c, 1); + } while (r == -1 && errno == EINTR); + if (idx == -1) + idx = i; } } } - return r; + return idx; } /* * returns: -1 on error: - * 0 on timeout - * > 0 on success + * timeout on timeout + * index into _signals array of signal that was generated on success */ int Mono_Unix_UnixSignal_WaitAny (void** _signals, int count, int timeout /* milliseconds */) { - fd_set read_fds; - int mr, r; - int max_fd = 0; + int r; + int currfd = 0; + struct pollfd fd_structs[NUM_SIGNALS]; signal_info** signals = (signal_info**) _signals; - mr = pthread_mutex_lock (&signals_mutex); - if (mr != 0) { - errno = mr; + if (count > NUM_SIGNALS) return -1; - } - FD_ZERO (&read_fds); + if (acquire_mutex (&signals_mutex) == -1) + return -1; + + r = setup_pipes (signals, count, &fd_structs[0], &currfd); + + release_mutex (&signals_mutex); - r = setup_pipes (signals, count, &read_fds, &max_fd); if (r == 0) { - r = wait_for_any (signals, count, max_fd, &read_fds, timeout); + r = wait_for_any (signals, count, &currfd, &fd_structs[0], timeout); } + + if (acquire_mutex (&signals_mutex) == -1) + return -1; + teardown_pipes (signals, count); - pthread_mutex_unlock (&signals_mutex); + release_mutex (&signals_mutex); return r; } -#endif /* ndef PLATFORM_WIN32 */ +#endif /* ndef HOST_WIN32 */ G_END_DECLS