diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-03-28 01:07:05 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-03-28 01:07:05 +0000 |
| commit | 03a5e62300f3cfb96d14570b73a758e6fa64c449 (patch) | |
| tree | 4a7ffaf0c81f243be536ca03af31f16edb7cc326 /source | |
| parent | d5cdba337a13e29fe0ce9f3b058ddb87e8c97b78 (diff) | |
| download | samba-03a5e62300f3cfb96d14570b73a758e6fa64c449.tar.gz samba-03a5e62300f3cfb96d14570b73a758e6fa64c449.tar.xz samba-03a5e62300f3cfb96d14570b73a758e6fa64c449.zip | |
merged real time signal fixes from head
Diffstat (limited to 'source')
| -rw-r--r-- | source/include/includes.h | 4 | ||||
| -rw-r--r-- | source/smbd/notify_kernel.c | 5 | ||||
| -rw-r--r-- | source/smbd/oplock_linux.c | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index bdd8661f6f2..168256fd567 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -864,6 +864,10 @@ struct printjob; #define SIGCLD SIGCHLD #endif +#ifndef SIGRTMIN +#define SIGRTMIN 32 +#endif + #ifndef MAP_FILE #define MAP_FILE 0 #endif diff --git a/source/smbd/notify_kernel.c b/source/smbd/notify_kernel.c index 8b7ff21ecb9..efe93de5afb 100644 --- a/source/smbd/notify_kernel.c +++ b/source/smbd/notify_kernel.c @@ -39,7 +39,7 @@ static SIG_ATOMIC_T signals_received; #ifndef RT_SIGNAL_NOTIFY -#define RT_SIGNAL_NOTIFY 34 +#define RT_SIGNAL_NOTIFY (SIGRTMIN+2) #endif #ifndef F_SETSIG @@ -233,6 +233,9 @@ struct cnotify_fns *kernel_notify_init(void) cnotify.remove_notify = kernel_remove_notify; cnotify.select_time = -1; + /* the signal can start off blocked due to a bug in bash */ + BlockSignals(False, RT_SIGNAL_NOTIFY); + return &cnotify; } diff --git a/source/smbd/oplock_linux.c b/source/smbd/oplock_linux.c index deed0c51073..84083dffc97 100644 --- a/source/smbd/oplock_linux.c +++ b/source/smbd/oplock_linux.c @@ -39,7 +39,7 @@ static SIG_ATOMIC_T fd_pending_array[FD_PENDING_SIZE]; #endif #ifndef RT_SIGNAL_LEASE -#define RT_SIGNAL_LEASE 33 +#define RT_SIGNAL_LEASE (SIGRTMIN+1) #endif #ifndef F_SETSIG @@ -296,6 +296,9 @@ struct kernel_oplocks *linux_init_kernel_oplocks(void) koplocks.msg_waiting = linux_oplock_msg_waiting; koplocks.notification_fd = -1; + /* the signal can start off blocked due to a bug in bash */ + BlockSignals(False, RT_SIGNAL_LEASE); + DEBUG(3,("Linux kernel oplocks enabled\n")); return &koplocks; |