Merged silc_1_0_branch to trunk.

[silc.git] / lib / silcutil / unix / silcunixschedule.c

diff --git a/lib/silcutil/unix/silcunixschedule.c b/lib/silcutil/unix/silcunixschedule.c
index 846cfa4bf68e2aac91751e0e83253dbeeca5e556..d27ceacdb527beb3de1eef7ac02dc6305d02e7e7 100644 (file)
--- a/lib/silcutil/unix/silcunixschedule.c
+++ b/lib/silcutil/unix/silcunixschedule.c
@@ -4,13 +4,12 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1998 - 2001 Pekka Riikonen
+  Copyright (C) 1998 - 2004 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -24,7 +23,7 @@
 
 /* Calls normal select() system call. */
 
-int silc_select(SilcScheduleFd fds, SilcUInt32 fds_count, 
+int silc_select(SilcScheduleFd fds, SilcUInt32 fds_count,
                struct timeval *timeout)
 {
   fd_set in, out;
@@ -119,10 +118,10 @@ void *silc_schedule_internal_init(SilcSchedule schedule,
     return NULL;
   }
 
-  internal->wakeup_task = 
+  internal->wakeup_task =
     silc_schedule_task_add(schedule, internal->wakeup_pipe[0],
                           silc_schedule_wakeup_cb, internal,
-                          0, 0, SILC_TASK_FD, 
+                          0, 0, SILC_TASK_FD,
                           SILC_TASK_PRI_NORMAL);
   if (!internal->wakeup_task) {
     SILC_LOG_ERROR(("Could not add a wakeup task, threads won't work"));
@@ -138,6 +137,9 @@ void *silc_schedule_internal_init(SilcSchedule schedule,
   return (void *)internal;
 }
 
+void silc_schedule_internal_signals_block(void *context);
+void silc_schedule_internal_signals_unblock(void *context);
+
 /* Uninitializes the platform specific scheduler context. */
 
 void silc_schedule_internal_uninit(void *context)
@@ -180,7 +182,9 @@ void silc_schedule_internal_signal_register(void *context,
   if (!internal)
     return;
 
-  sigprocmask(SIG_BLOCK, &internal->signals, &internal->signals_blocked);
+  SILC_LOG_DEBUG(("Registering signal %d", signal));
+
+  silc_schedule_internal_signals_block(context);
 
   for (i = 0; i < SIGNAL_COUNT; i++) {
     if (!internal->signal_call[i].signal) {
@@ -192,7 +196,7 @@ void silc_schedule_internal_signal_register(void *context,
     }
   }
 
-  sigprocmask(SIG_SETMASK, &internal->signals_blocked, NULL);
+  silc_schedule_internal_signals_unblock(context);
   sigaddset(&internal->signals, signal);
 }
 
@@ -207,7 +211,9 @@ void silc_schedule_internal_signal_unregister(void *context,
   if (!internal)
     return;
 
-  sigprocmask(SIG_BLOCK, &internal->signals, &internal->signals_blocked);
+  SILC_LOG_DEBUG(("Unregistering signal %d", signal));
+
+  silc_schedule_internal_signals_block(context);
 
   for (i = 0; i < SIGNAL_COUNT; i++) {
     if (internal->signal_call[i].signal == signal &&
@@ -220,7 +226,7 @@ void silc_schedule_internal_signal_unregister(void *context,
     }
   }
 
-  sigprocmask(SIG_SETMASK, &internal->signals_blocked, NULL);
+  silc_schedule_internal_signals_unblock(context);
   sigdelset(&internal->signals, signal);
 }
 
@@ -234,16 +240,19 @@ void silc_schedule_internal_signal_call(void *context, SilcUInt32 signal)
   if (!internal)
     return;
 
-  sigprocmask(SIG_BLOCK, &internal->signals, &internal->signals_blocked);
+  silc_schedule_internal_signals_block(context);
 
   for (i = 0; i < SIGNAL_COUNT; i++) {
-    if (internal->signal_call[i].signal == signal)
+    if (internal->signal_call[i].signal == signal) {
       internal->signal_call[i].call = TRUE;
+      SILC_LOG_DEBUG(("Scheduling signal %d to be called",
+                     internal->signal_call[i].signal));
+    }
   }
 
-  sigprocmask(SIG_SETMASK, &internal->signals_blocked, NULL);
+  silc_schedule_internal_signals_unblock(context);
 }
-                                        
+
 /* Call all signals */
 
 void silc_schedule_internal_signals_call(void *context,
@@ -252,14 +261,18 @@ void silc_schedule_internal_signals_call(void *context,
   SilcUnixScheduler internal = (SilcUnixScheduler)context;
   int i;
 
+  SILC_LOG_DEBUG(("Start"));
+
   if (!internal)
     return;
 
-  sigprocmask(SIG_BLOCK, &internal->signals, &internal->signals_blocked);
+  silc_schedule_internal_signals_block(context);
 
   for (i = 0; i < SIGNAL_COUNT; i++) {
     if (internal->signal_call[i].call &&
         internal->signal_call[i].callback) {
+      SILC_LOG_DEBUG(("Calling signal %d callback",
+                     internal->signal_call[i].signal));
       internal->signal_call[i].callback(schedule, internal->app_context,
                                        SILC_TASK_INTERRUPT,
                                        internal->signal_call[i].signal,
@@ -268,7 +281,7 @@ void silc_schedule_internal_signals_call(void *context,
     }
   }
 
-  sigprocmask(SIG_SETMASK, &internal->signals_blocked, NULL);
+  silc_schedule_internal_signals_unblock(context);
 }
 
 /* Block registered signals in scheduler. */