// -----------------------------------------------------------------------
-// Copyright (C) 2006 - 2007 FRESCOR consortium partners:
+// Copyright (C) 2006 - 2009 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
// 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.
// -----------------------------------------------------------------------
//==============================================
// ******** ****** ******** **********
#include <unistd.h>
#include <signal.h>
+#define TRACE(str, args...) printf ("%d: %s: " str, __LINE__, __func__, ##args)
+
/*************************
* Thread identification
*************************/
sigset_t accept_set;
struct sigaction act;
+// printf ("%d: %s: limits=[%d, %d]\n", __LINE__, __FUNCTION__,
+// FOSA_SIGNAL_MIN, FOSA_SIGNAL_MAX);
+
if (size < 0)
return EINVAL;
act.sa_flags = SA_SIGINFO;
act.sa_handler = SIG_DFL;
+// printf ("%d: %s: add signals\n", __LINE__, __FUNCTION__);
for (i = 0; i < size; i ++) {
- if (FOSA_SIGNAL_MIN > set [i] || set [i] > FOSA_SIGNAL_MAX)
+// printf ("%d: %s: signal=%d \n", __LINE__, __FUNCTION__, set[i]);
+
+ if (FOSA_SIGNAL_MIN > set [i] || set [i] > FOSA_SIGNAL_MAX)
return EINVAL;
- sigaction (set [i], &act, NULL);
+// printf ("%d: %s: sigaction\n", __LINE__, __FUNCTION__);
+ sigaction (set [i], &act, NULL);
sigaddset (&accept_set, set [i]);
}
-
- return pthread_sigmask (SIG_BLOCK, &accept_set, NULL);
+
+// printf ("%d: %s: pthread_sigmask\n", __LINE__, __FUNCTION__);
+ assert (!pthread_sigmask (SIG_BLOCK, &accept_set, NULL));
+ return 0;
}
(fosa_signal_t set[], int size, fosa_signal_t *signal_received,
fosa_signal_info_t *info)
{
- return fosa_signal_timedwait (set, size, signal_received, info, NULL);
+ return fosa_signal_timedwait (set, size, signal_received, info, NULL);
}
+
int fosa_signal_timedwait
(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;
sigaddset (&wset, set [i]);
}
- sig = sigtimedwait (&wset, &nfo, &tout);
+ sig = sigtimedwait (&wset, &nfo, timeout);
if (sig == -1)
return errno;
projects / frescor / fosa.git / blobdiff