Merge branch 'master' of https://github.com/OpenAADL/polyorb-hi-c

configure.ac

@@ -218,6 +218,7 @@ AC_OUTPUT([
         examples/aadlv2/monitor/Makefile
         examples/aadlv2/packet-store/Makefile
         examples/aadlv2/file-store/Makefile
+        examples/aadlv2/latency/Makefile
         examples/aadlv2/rma/Makefile
         examples/aadlv2/some-types/Makefile
         examples/aadlv2/some-types-stdint/Makefile

examples/aadlv2/Makefile.am

 SUBDIRS = d3.1.3-1 ping rma sunseeker producer-consumer some-types	\
 	some-types-stdint flight-mgmt import monitor lua cpp		\
-	packet-store file-store
+	packet-store file-store latency
 
 SAMPLE_DIR = ${shell $(CYGPATH_U) '$(OCARINA_PREFIX)/examples/ocarina/polyorb-hi-c/aadlv2'}
 
@@ -20,4 +20,3 @@ check-all:
 	for dir in $(SUBDIRS); do \
                 ($(MAKE) -C $${dir} check-all) || exit 1;  \
         done
-

examples/aadlv2/latency/Makefile.am

+C_FILES = $(srcdir)/functions.c
+AADL_FILES = $(srcdir)/latency.aadl $(srcdir)/latencyevent.aadl	\
+	$(srcdir)/latencyevent-original.aadl			\
+	$(srcdir)/latency-original.aadl
+
+SCENARIO_FILES = \
+                  $(srcdir)/scenario_local.aadl	\
+                  $(srcdir)/scenario_rtems.aadl
+
+include $(srcdir)/../../Makefile.common
+
+EXTRA_DIST = $(AADL_FILES) $(SCENARIO_FILES) $(C_FILES)
+
+CLEANDIRS =

examples/aadlv2/latency/scenario.aadl

-system topsystem
-properties
-  Ocarina_Config::AADL_Files           =>
-    ("latency.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Needed_Property_Sets =>
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-  Ocarina_Config::Use_Components_Library => true;
-  Ocarina_Config::Root_System_Name
+package scenario
+public
+  with Ocarina_Config;
+  with Ocarina_Library;
+
+  system topsystem extends Ocarina_Library::Default_PolyORB_HI_C_Config
+  properties
+    Ocarina_Config::AADL_Files           =>
+      ("latency.aadl");
+
+    Ocarina_Config::Root_System_Name
           => "topsystem.distributedallperiodicdelayed";
-end topsystem;
+  end topsystem;
+
+  system implementation topsystem.distributedallperiodicdelayed
+  end topsystem.distributedallperiodicdelayed;
 
-system implementation topsystem.distributedallperiodicdelayed
-end topsystem.distributedallperiodicdelayed;
+end scenario;
\ No newline at end of file

examples/aadlv2/latency/scenario_local.aadl

-system topsystem
-properties
-  Ocarina_Config::Timeout_Property     => 1000ms;
-  Ocarina_Config::Use_Components_Library => true;
-  Ocarina_Config::AADL_Files           => 
-    ("latency.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
+package scenario
+public
+  with Ocarina_Config;
+  with Ocarina_Library;
+
+  system topsystem extends Ocarina_Library::Default_PolyORB_HI_C_Config
+  properties
+    Ocarina_Config::AADL_Files           =>
+      ("latency.aadl");
     Ocarina_Config::Root_System_Name => "topsystem.local";
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end topsystem;
+  end topsystem;
 
-system implementation topsystem.distributedallperiodicdelayed
-end topsystem.distributedallperiodicdelayed;
+  system implementation topsystem.distributedallperiodicdelayed
+  end topsystem.distributedallperiodicdelayed;
 
+end scenario;

examples/aadlv2/latency/scenario_rtems.aadl

-system topsystem
-properties
-  Ocarina_Config::Timeout_Property     => 1000ms;
-  Ocarina_Config::Use_Components_Library => true;
-  Ocarina_Config::AADL_Files           => 
-    ("latency.aadl");
-  Ocarina_Config::Generator            => polyorb_hi_c;
-  Ocarina_Config::Root_System_Name => "topsystem.RTEMS";
-  Ocarina_Config::Needed_Property_Sets => 
-    (value (Ocarina_Config::Data_Model),
-     value (Ocarina_Config::Deployment),
-     value (Ocarina_Config::Cheddar_Properties));
-  Ocarina_Config::AADL_Version         => AADLv2;
-end topsystem;
+package scenario
+public
+  with Ocarina_Config;
 
-system implementation topsystem.distributedallperiodicdelayed
-end topsystem.distributedallperiodicdelayed;
+  system topsystem extends Ocarina_Library::Default_PolyORB_HI_C_Config
+  properties
+    Ocarina_Config::AADL_Files           =>
+      ("latency.aadl");
+    Ocarina_Config::Root_System_Name => "topsystem.RTEMS";
+  end topsystem;
 
+  system implementation topsystem.distributedallperiodicdelayed
+  end topsystem.distributedallperiodicdelayed;
+
+end scenario;

share/make/Makefile.am

@@ -5,9 +5,11 @@ EXTRA_DIST=$(builddir)/Makefile.common $(srcdir)/Makefile.leon3-xm3	\
 	     $(srcdir)/Makefile.leon.rtems_posix			\
 	     $(srcdir)/Makefile.compcert $(srcdir)/Makefile.bench	\
 	     $(srcdir)/Makefile.linux32					\
+	     $(srcdir)/Makefile.linux32_dll				\
 	     $(srcdir)/Makefile.linux32-xenomai-native			\
 	     $(srcdir)/Makefile.linux32-xenomai-posix			\
-	     $(srcdir)/Makefile.linux64 $(srcdir)/Makefile.win32	\
+	     $(srcdir)/Makefile.linux64					\
+	     $(srcdir)/Makefile.linux64_dll $(srcdir)/Makefile.win32	\
 	     $(srcdir)/Makefile.x86.linuxtaste				\
 	     $(srcdir)/Makefile.template $(srcdir)/Makefile.freertos	\
 	     $(srcdir)/Makefile.air

share/make/Makefile.common.in

@@ -117,7 +117,7 @@ else
 endif
 
 
-ifeq ($(TARGET), $(filter $(TARGET), linux32 linux64 linux32-xenomai-posix linux32-xenomai-native))
+ifeq ($(TARGET), $(filter $(TARGET), linux32 linux64 linux32-xenomai-posix linux32-xenomai-native linux32_dll linux64_dll))
 PO_HI_OBJS += po_hi_lua.o
 endif
 
@@ -327,8 +327,8 @@ $(BINARY):
 	fi
 endif
 
-ifeq ($(TARGET), $(filter $(TARGET), native bench linux32 linux64))
-EXE=$(BINARY)
+ifeq ($(TARGET), $(filter $(TARGET), native bench linux32 linux64 linux32_dll linux64_dll))
+EXE=$(BINARY)$(EXEEXT)
 $(BINARY):
 	$(MAKE) generate-asn1-deployment target-objects compile-c-files compile-cpp-files compile-ada-files compile-po-hi $(USER_OBJS) $(GENERATED_OBJS) $(TARGET_OBJECTS)
 	$(LD) -o $(EXE) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(PO_HI_CPPOBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS)

share/make/Makefile.linux32_dll

+# The goal of this target is to generate a DLL from a PolyORB-HI/C
+# instead of a regular binary
+
+POHI_CFLAGS = -DDLL -fPIC \
+	-DPOSIX -m32 -D_POSIX_SOURCE -D_GNU_SOURCE	\
+	$(GCC_GENERIC_FLAGS)
+
+TARGET_LDFLAGS = -fPIC -pie -shared \
+	-lpthread -lrt -m32 -L$(RUNTIME_PATH)/libs/linux32/	\
+	-lm
+
+EXEEXT=.so
+
+SIMULINK_LDFLAGS  = -lm
+CC                = gcc
+LD                = gcc
+GPROF             = gprof
+
+USE_USB_BRICK=$(shell grep __PO_HI_NEED_DRIVER_SPACEWIRE_USB_BRICK deployment.h 2>/dev/null|wc -l)
+
+ifdef USE_GPROF
+TARGET_LDFLAGS+=-pg
+endif
+
+ifeq ($(USE_USB_BRICK),1)
+TARGET_LDFLAGS+=-lSpaceWireUSBAPI -lConfigLibraryUSB
+endif
+
+target-clean:
+
+target-objects:

share/make/Makefile.linux64_dll

+# The goal of this target is to generate a DLL from a PolyORB-HI/C
+# instead of a regular binary
+
+POHI_CFLAGS = -DDLL -fPIC \
+	-DPOSIX -m64 -D_POSIX_SOURCE -D_GNU_SOURCE	\
+	$(GCC_GENERIC_FLAGS)
+
+TARGET_LDFLAGS = -fPIC -pie -shared \
+	-lpthread -lrt -m64 -L$(RUNTIME_PATH)/libs/linux64/	\
+	-lm
+
+EXEEXT=.so
+
+SIMULINK_LDFLAGS  = -lm
+CC                = gcc
+LD                = gcc
+GPROF             = gprof
+
+USE_USB_BRICK=$(shell grep __PO_HI_NEED_DRIVER_SPACEWIRE_USB_BRICK deployment.h 2>/dev/null|wc -l)
+
+ifdef USE_GPROF
+TARGET_LDFLAGS+=-pg
+endif
+
+ifeq ($(USE_USB_BRICK),1)
+TARGET_LDFLAGS+=-lSpaceWireUSBAPI -lConfigLibraryUSB
+endif
+
+target-clean:
+
+target-objects: