Fixing license header

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

diff --git a/src_partikle/fosa_threads_and_signals.c b/src_partikle/fosa_threads_and_signals.c
index e95df0169aff712ccd94b291f36c7a9016844973..18bcf8e4efb5931006c0888135b1772cffbd1707 100644 (file)
--- a/src_partikle/fosa_threads_and_signals.c
+++ b/src_partikle/fosa_threads_and_signals.c
@@ -1,18 +1,18 @@
 // -----------------------------------------------------------------------
-//  Copyright (C) 2006 - 2007 FRESCOR consortium partners:
+//  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
 //    Visual Tools S.A.                      SPAIN
 //    Rapita Systems Ltd                     UK
 //    Evidence                               ITALY
-//    
+//
 //    See http://www.frescor.org for a link to partners' websites
 //
 //           FRESCOR project (FP6/2005/IST/5-034026) is funded
@@ -20,29 +20,37 @@
 //        The European Union is not liable of any use that may be
 //        made of this code.
 //
-//  This file is part of the FRSH implementation
 //
-//  FRSH 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, or (at  your option)
-//  any later version.
+//  based on previous work (FSF) done in the FIRST project
+//
+//   Copyright (C) 2005  Mälardalen University, SWEDEN
+//                       Scuola Superiore S.Anna, ITALY
+//                       Universidad de Cantabria, SPAIN
+//                       University of York, UK
+//
+//   FSF API web pages: http://marte.unican.es/fsf/docs
+//                      http://shark.sssup.it/contrib/first/docs/
 //
-//  FRSH  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.
+//   This file is part of FOSA (Frsh Operating System Adaption)
 //
-//  You should have  received a  copy of  the  GNU  General Public License
-//  distributed  with  FRSH;  see file COPYING.   If not,  write to the
-//  Free Software  Foundation,  59 Temple Place  -  Suite 330,  Boston, MA
-//  02111-1307, 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, if you include this header file into source
-//  files to be compiled, this header file does not by itself cause
-//  the resulting executable 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 General
-//  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.
 // -----------------------------------------------------------------------
 //==============================================
 //  ********  ******    ********  **********
@@ -59,6 +67,7 @@
 
 #include <fosa_configuration_parameters.h>
 #include <fosa_threads_and_signals.h>
+#include <fosa_time.h>
 #include <unistd.h>
 #include <signal.h>
 
@@ -266,7 +275,7 @@ int fosa_set_accepted_signals(fosa_signal_t set[], int size)
        act.sa_handler = SIG_DFL;
        
        for (i = 0; i < size; i ++) {
-               if (FOSA_SIGNAL_MIN > set [i] || set [i] > FOSA_SIGNAL_MAX)
+         if (FOSA_SIGNAL_MIN > set [i] || set [i] > FOSA_SIGNAL_MAX)
                        return EINVAL;
        
                sigaction (set [i], &act, NULL);
@@ -298,12 +307,13 @@ int fosa_signal_queue
 }
 
  int fosa_signal_timedwait
-     (fosa_signal_t set[], int size, fosa_signal_t *signal_received, 
-      fosa_signal_info_t *info, const struct timespec *timeout)
+       (fosa_signal_t set[], int size, fosa_signal_t *signal_received,
+        fosa_signal_info_t *info, const fosa_rel_time_t *timeout)
 {
        int i, sig;
        sigset_t wset;
        siginfo_t nfo;
+       struct timespec tout = fosa_rel_time_to_timespec (*timeout);
        
        if (size < 0) 
                return EINVAL;
@@ -315,7 +325,7 @@ int fosa_signal_queue
                sigaddset (&wset, set [i]);
        }
        
-       sig = sigtimedwait (&wset, &nfo, timeout);
+       sig = sigtimedwait (&wset, &nfo, &tout);
        if (sig == -1)
                return errno;