Added the support for POSIX98 symbols for priority inheritance in mutexes if AQuoSA...

[frescor/fosa.git] / include / fosa_opaque_types.h

diff --git a/include/fosa_opaque_types.h b/include/fosa_opaque_types.h
index e44b8ce2e8314ae43ee276969f53d55f7577d659..b587c91287cdc83bddbe4cf70db225a1be43c3d0 100644 (file)
--- a/include/fosa_opaque_types.h
+++ b/include/fosa_opaque_types.h
@@ -1,5 +1,5 @@
-// -----------------------------------------------------------------------
-//  Copyright (C) 2006 - 2007 FRESCOR consortium partners:
+//----------------------------------------------------------------------
+//  Copyright (C) 2006 - 2007 by the FRESCOR consortium:
 //
 //    Universidad de Cantabria,              SPAIN
 //    University of York,                    UK
@@ -13,36 +13,41 @@
 //    Rapita Systems Ltd                     UK
 //    Evidence                               ITALY
 //
-//    See http://www.frescor.org for a link to partners' websites
+//    See http://www.frescor.org
 //
-//           FRESCOR project (FP6/2005/IST/5-034026) is funded
+//        The 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.
 //
-//  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
 //
-//  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 Abstraction)
 //
-//  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.
 // -----------------------------------------------------------------------
 //fosa_opaque_types.h
 //==============================================
@@ -69,6 +74,9 @@
 
 #if defined(RT_LINUX) || defined(MARTE_OS) || defined(AQuoSA)
 
+#ifdef AQuoSA
+#define __USE_UNIX98
+#endif // AQuoSA
 #include <pthread.h>
 #include <signal.h>
 #include <time.h>
@@ -76,7 +84,7 @@
 
 #ifdef RT_LINUX
 #include <rtl_timer.h>
-#endif
+#endif // RT_LINUX
 
 #define    FOSA_CLOCK_ID_T_OPAQUE    clockid_t
 #define    FOSA_SYSTEM_CLOCK_OPAQUE  CLOCK_MONOTONIC
@@ -101,19 +109,34 @@ typedef struct {
 
 
 #define FOSA_ADS_ACTIONS_T_OPAQUE fosa_ads_actions_internal_t
-#else
+
+///////////////////
+// Long jumps
+///////////////////
+
+#include "marte_non_local_jmp.h"
+
+#define FOSA_LONG_JUMP_CONTEXT_T_OPAQUE  struct { \
+  marte_nonlocaljmp_context_t marte_context;      \
+  frsh_thread_id_t tid;                            \
+}
+
+#else // MARTE_OS
 
 /* hack to get AQuoSA sources compile without having none
  * of the application level scheduler header files and symbols */
 #ifdef AQuoSA
 #define posix_appsched_actions_t int
-#endif
+#define FOSA_LONG_JUMP_CONTEXT_T_OPAQUE int
+#endif // AQuoSA
 
 #define FOSA_ADS_ACTIONS_T_OPAQUE posix_appsched_actions_t
-#endif
+#endif // MARTE_OS
+
 
 
-#endif
+#endif //  defined(RT_LINUX) || defined(MARTE_OS) || defined(AQuoSA)
+
 
 ////////////////// END OF RT_LINUX, MARTE_OS and AQuoSA //////////////////////
 
@@ -133,6 +156,7 @@ typedef struct {
 
 #define    FOSA_COND_T_OPAQUE        int
 
+
 /*********
  *  ADS
  *********/