-//----------------------------------------------------------------------
-// Copyright (C) 2006 - 2007 by the FRESCOR consortium:
+// -----------------------------------------------------------------------
+// Copyright (C) 2006 - 2008 FRESCOR consortium partners:
//
// Universidad de Cantabria, SPAIN
// University of York, UK
// Scuola Superiore Sant'Anna, ITALY
// Kaiserslautern University, GERMANY
-// Univ. Politecnica Valencia, SPAIN
+// Univ. Politécnica Valencia, SPAIN
// Czech Technical University in Prague, CZECH REPUBLIC
// ENEA SWEDEN
// Thales Communication S.A. FRANCE
// Rapita Systems Ltd UK
// Evidence ITALY
//
-// See http://www.frescor.org
+// See http://www.frescor.org for a link to partners' websites
//
-// The FRESCOR project (FP6/2005/IST/5-034026) is funded
+// FRESCOR project (FP6/2005/IST/5-034026) is funded
// in part by the European Union Sixth Framework Programme
// The European Union is not liable of any use that may be
// made of this code.
// Universidad de Cantabria, SPAIN
// University of York, UK
//
-// This file is part of FOSA (Frsh Operating System Abstraction)
+// FSF API web pages: http://marte.unican.es/fsf/docs
+// http://shark.sssup.it/contrib/first/docs/
+//
+// This file is part of FOSA (Frsh Operating System Adaption)
//
-// FOSA is free software; you can redistribute it and/or modify it
-// under terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option) any
-// later version. FOSA 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 GNU
-// General Public License for more details. You should have received a
-// copy of the GNU General Public License along with FOSA; see file
-// COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,
-// Cambridge, MA 02139, USA.
+// FOSA is free software; you can redistribute it and/or modify it
+// under terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option) any
+// later version. FOSA 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 GNU
+// General Public License for more details. You should have received a
+// copy of the GNU General Public License along with FOSA; see file
+// COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,
+// Cambridge, MA 02139, USA.
//
-// As a special exception, including FOSA header files in a file,
-// instantiating FOSA generics or templates, or linking other files
-// with FOSA objects to produce an executable application, does not
-// by itself cause the resulting executable application to be covered
-// by the GNU General Public License. This exception does not
-// however invalidate any other reasons why the executable file might be
-// covered by the GNU Public License.
+// As a special exception, including FOSA header files in a file,
+// instantiating FOSA generics or templates, or linking other files
+// with FOSA objects to produce an executable application, does not
+// by itself cause the resulting executable application to be covered
+// by the GNU General Public License. This exception does not
+// 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
//==============================================
// ******** ****** ******** **********
// **///// /** ** **////// /** /**
#ifdef CONFIG_LONGJUMP
#include <fosa_long_jump.h>
+#include <stdio.h>
-enum {
- LONGJMP_MAGIC = 0x01234567,
- LONGJMP_NSIG = 3,
- LONGJMP_FIRSTSIG = SIGRTMIN + 1,
-};
-
-int jmp_used_signals [LONGJMP_NSIG] = {[0 ... (LONGJMP_NSIG - 1)] = 0};
-
-
-int fosa_long_jump_save_context
- (fosa_long_jump_context_t * context)
-{
- if (!context)
- return FOSA_EINVAL;
-
- // Save the actual signal mask & mark the jump as still not performed
- pthread_sigmask (SIG_SETMASK, NULL, &(context -> jmp_sigmask));
- context -> jmp_hasexecuted = false;
-
- if (setjmp (context -> jmp_context) == LONGJMP_MAGIC) {
-#ifndef CONFIG_LONGJUMP_FREE_SIGNALS
- pthread_sigmask (SIG_SETMASK, &(context -> jmp_sigmask), NULL);
-#endif
- context -> jmp_hasexecuted = true;
- }
- return 0;
-}
+#define LONGJMP_MAGIC 0x01234567
+pthread_t jmp_used_signals [LONGJMP_NSIG] = {[0 ... (LONGJMP_NSIG - 1)] = NULL};
+pthread_mutex_t signal_pool_m = PTHREAD_MUTEX_INITIALIZER;
+extern void fosa_longjmp (fosa_long_jump_context_t ctx, unsigned long magic);
int fosa_long_jump_was_performed
(const fosa_long_jump_context_t * context, int * jumped)
if (!context && !jumped)
return FOSA_EINVAL;
- *jumped = context -> jmp_hasexecuted? 1:0;
+ *jumped = ((*(context))[6] == LONGJMP_MAGIC);
return 0;
}
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
- pthread_sigmask (SIG_SETMASK, &(context -> jmp_sigmask), NULL);
+ sigset_t s;
+
+ // Restore the signal mask
+ s.sig = (*jmp_info)[7];
+ pthread_sigmask (SIG_SETMASK, &s, NULL);
+
+#ifdef CONFIG_LONGJUMP_FREE_SIGNAL
+ sigset_t set;
// Free this signal
sigemptyset (&set);
sigaddset (&set, signo);
pthread_sigmask (SIG_BLOCK, &sigmask, NULL);
- pthread_mutex_lock ();
- jmp_used_signals [signo] = 0;
- pthread_mutex_unlock ();
+ pthread_mutex_lock (&signal_pool_m);
+ jmp_used_signals [signo] = NULL;
+ pthread_mutex_unlock (&signal_pool_m);
#endif
// Restore the saved context
- longjmp (jmp_info -> jmp_context, LONGJMP_MAGIC);
+ fosa_longjmp (*jmp_info, LONGJMP_MAGIC);
return;
}
struct sigaction sa;
sigset_t sigmask;
+ // Check if current thread has a handler associated
+ for (i = 0; i < LONGJMP_NSIG; i ++)
+ if (jmp_used_signals [i] == pthread_self ()) {
+ sigemptyset (&sigmask);
+ sigaddset (&sigmask, LONGJMP_FIRSTSIG + i);
+ pthread_sigmask (SIG_UNBLOCK, &sigmask, NULL);
+ return 0;
+ }
+
// 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;
+ jmp_used_signals [i] = pthread_self ();
+ pthread_mutex_unlock (&signal_pool_m);
*signal = LONGJMP_FIRSTSIG + i;
*handler = pthread_self ();
projects / frescor / fosa.git / blobdiff