FOSA-PaRTiKle: changes in allocated signals for longjumps

[frescor/fosa.git] / src_partikle / fosa_long_jump.c

diff --git a/src_partikle/fosa_long_jump.c b/src_partikle/fosa_long_jump.c
index 446207474bac4d68b022a5d57c8ac6ef88f99ad3..3e502ce950d05c2dcbcc7bf7805eb6c0d5ad62a4 100644 (file)
--- a/src_partikle/fosa_long_jump.c
+++ b/src_partikle/fosa_long_jump.c
@@ -49,7 +49,7 @@
 // however invalidate any other reasons why the executable file might be
 // covered by the GNU Public License.
 // -----------------------------------------------------------------------
-//fosa_long_jump.h
+//fosa_long_jump.c
 //==============================================
 //  ********  ******    ********  **********
 //  **///// /**    **  **//////  /**     /**
@@ -69,11 +69,10 @@
 
 enum {
   LONGJMP_MAGIC = 0x01234567,
-  LONGJMP_NSIG = 3,
-  LONGJMP_FIRSTSIG = SIGRTMIN + 1,
 };
 
 int jmp_used_signals [LONGJMP_NSIG] = {[0 ... (LONGJMP_NSIG - 1)] = 0};
+pthread_mutex_t signal_pool_m = PTHREAD_MUTEX_INITIALIZER;
 
 
 int fosa_long_jump_save_context
@@ -110,10 +109,11 @@ int fosa_long_jump_was_performed
 void jmp_handler (int signo, siginfo_t *info, void *context)
 {
   fosa_long_jump_context_t *jmp_info = (fosa_long_jump_context_t *) info -> si_value.sival_ptr;
-  sigset_t set;
 
 #ifdef CONFIG_LONGJUMP_FREE_SIGNALS
-  // Restore the signal mask beofre the context save
+  sigset_t set;
+
+  // Restore the signal mask
   pthread_sigmask (SIG_SETMASK, &(context -> jmp_sigmask), NULL);
 
   // Free this signal
@@ -121,9 +121,9 @@ void jmp_handler (int signo, siginfo_t *info, void *context)
   sigaddset (&set, signo);
   pthread_sigmask (SIG_BLOCK, &sigmask, NULL);
 
-  pthread_mutex_lock ();
+  pthread_mutex_lock (&signal_pool_m);
   jmp_used_signals [signo] = 0;
-  pthread_mutex_unlock ();
+  pthread_mutex_unlock (&signal_pool_m);
 #endif
 
   // Restore the saved context
@@ -140,12 +140,15 @@ int fosa_long_jump_install_handler
   sigset_t sigmask;
 
   // Find the first usable signal
-  //  FIXME: Should be atomical
+  pthread_mutex_lock (&signal_pool_m);
   for (i = 0; i < LONGJMP_NSIG && jmp_used_signals [i]; i++);
-  if (i >= LONGJMP_NSIG)
+  if (i >= LONGJMP_NSIG) {
+    pthread_mutex_unlock (&signal_pool_m);
     return FOSA_ENOMEM;
+  }
 
   jmp_used_signals [i] = 1;
+  pthread_mutex_unlock (&signal_pool_m);
 
   *signal = LONGJMP_FIRSTSIG + i;
   *handler = pthread_self ();