Commit 2d82b46a authored by Thanassis Tsiodras's avatar Thanassis Tsiodras

Switch to a simpler test

parent 648ae48d
......@@ -50,11 +50,11 @@ SUBCOMPONENTS
Taste::FunctionName => "Function4";
};
gr740_partition : PROCESS deploymentview::DV::Node1::gr740_partition.others {
Taste::coordinates => "123654 114138 220066 169734";
Taste::coordinates => "141020 107883 218669 153435";
Deployment::Port_Number => 0;
};
gr740_rtems412_posix : PROCESSOR ocarina_processors_leon::gr740.rtems412_posix {
Taste::coordinates => "111602 98253 232118 177676";
Taste::coordinates => "131314 94868 228375 159942";
};
PROPERTIES
Taste::APLC_Binding => (reference (gr740_partition)) APPLIES TO IV_Function1;
......@@ -70,7 +70,7 @@ END deploymentview;
SYSTEM IMPLEMENTATION deploymentview.others
SUBCOMPONENTS
Node1 : SYSTEM Node1.others {
Taste::coordinates => "96537 75561 247182 189022";
Taste::coordinates => "119181 76276 240508 169238";
};
interfaceview : SYSTEM interfaceview::IV::interfaceview.others;
END deploymentview.others;
......
......@@ -24,20 +24,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_pulse.others;
SUBPROGRAM PI_report
FEATURES
sender_ID : IN PARAMETER DataView::MyInteger {
Taste::encoding => NATIVE;
};
PROPERTIES
Taste::Associated_Queue_Size => 3;
END PI_report;
SUBPROGRAM IMPLEMENTATION PI_report.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_report.others;
SUBPROGRAM RI_op1
END RI_op1;
......@@ -65,13 +51,6 @@ FEATURES
Taste::Deadline => 0 ms;
Taste::InterfaceName => "pulse";
};
PI_report : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Function1::PI_report.others {
Taste::coordinates => "75279 75023";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "report";
};
RI_op1 : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::Function2::PI_op1.others {
Taste::coordinates => "99620 45959";
Taste::RCMoperationKind => any;
......@@ -103,7 +82,6 @@ END interfaceview::IV::Function1;
PACKAGE interfaceview::IV::Function2
PUBLIC
WITH interfaceview::IV::Function1;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
......@@ -117,16 +95,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_op1.others;
SUBPROGRAM RI_report
FEATURES
sender_ID : IN PARAMETER DataView::MyInteger {
Taste::encoding => NATIVE;
};
END RI_report;
SUBPROGRAM IMPLEMENTATION RI_report.others
END RI_report.others;
SYSTEM Function2
FEATURES
PI_op1 : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Function2::PI_op1.others {
......@@ -136,12 +104,6 @@ FEATURES
Taste::Deadline => 0 ms;
Taste::InterfaceName => "op1";
};
RI_report : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::Function1::PI_report.others {
Taste::coordinates => "165378 39056";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "report";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (C);
Taste::Active_Interfaces => any;
......@@ -155,7 +117,6 @@ END interfaceview::IV::Function2;
PACKAGE interfaceview::IV::Function3
PUBLIC
WITH interfaceview::IV::Function1;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
......@@ -169,16 +130,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_op2.others;
SUBPROGRAM RI_report
FEATURES
sender_ID : IN PARAMETER DataView::MyInteger {
Taste::encoding => NATIVE;
};
END RI_report;
SUBPROGRAM IMPLEMENTATION RI_report.others
END RI_report.others;
SYSTEM Function3
FEATURES
PI_op2 : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Function3::PI_op2.others {
......@@ -188,12 +139,6 @@ FEATURES
Taste::Deadline => 0 ms;
Taste::InterfaceName => "op2";
};
RI_report : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::Function1::PI_report.others {
Taste::coordinates => "164651 99001";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "report";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (C);
Taste::Active_Interfaces => any;
......@@ -207,13 +152,10 @@ END interfaceview::IV::Function3;
PACKAGE interfaceview::IV::Function4
PUBLIC
WITH interfaceview::IV::Function1;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_op3
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_op3;
SUBPROGRAM IMPLEMENTATION PI_op3.others
......@@ -221,31 +163,13 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_op3.others;
SUBPROGRAM RI_report
FEATURES
sender_ID : IN PARAMETER DataView::MyInteger {
Taste::encoding => NATIVE;
};
END RI_report;
SUBPROGRAM IMPLEMENTATION RI_report.others
END RI_report.others;
SYSTEM Function4
FEATURES
PI_op3 : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Function4::PI_op3.others {
Taste::coordinates => "165377 141871";
Taste::coordinates => "163075 158013";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "op3";
};
RI_report : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::Function1::PI_report.others {
Taste::coordinates => "165377 161489";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "report";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (C);
Taste::Active_Interfaces => any;
......@@ -281,18 +205,9 @@ SUBCOMPONENTS
Taste::coordinates => "164651 77203 246394 120073";
};
Function4 : SYSTEM interfaceview::IV::Function4::Function4.others {
Taste::coordinates => "165377 132425 244940 188373";
Taste::coordinates => "163075 136941 254264 180538";
};
CONNECTIONS
Function1_PI_report_Function2_RI_report : SUBPROGRAM ACCESS Function1.PI_report -> Function2.RI_report {
Taste::coordinates => "165378 39056 146232 39056 146232 90578 75279 90578 75279 75023";
};
Function1_PI_report_Function3_RI_report : SUBPROGRAM ACCESS Function1.PI_report -> Function3.RI_report {
Taste::coordinates => "164651 99001 75279 99001 75279 75023";
};
Function1_PI_report_Function4_RI_report : SUBPROGRAM ACCESS Function1.PI_report -> Function4.RI_report {
Taste::coordinates => "165377 161489 75279 161489 75279 75023";
};
Function2_PI_op1_Function1_RI_op1 : SUBPROGRAM ACCESS Function2.PI_op1 -> Function1.RI_op1 {
Taste::coordinates => "99620 45959 132499 45959 132499 30337 165378 30337";
};
......@@ -300,7 +215,7 @@ CONNECTIONS
Taste::coordinates => "99620 53225 132135 53225 132135 80836 164651 80836";
};
Function4_PI_op3_Function1_RI_op3 : SUBPROGRAM ACCESS Function4.PI_op3 -> Function1.RI_op3 {
Taste::coordinates => "99620 60491 121327 60491 121327 141871 165377 141871";
Taste::coordinates => "99620 60491 121659 60491 121659 158013 163075 158013";
};
END interfaceview.others;
......
5bdf50dd31ae1035191fd07f9753151c InterfaceView.aadl
c3ca11352c6955c1a7d431534d9fd5b6 InterfaceView.aadl
......@@ -47,11 +47,11 @@ SUBCOMPONENTS
Taste::FunctionName => "Function4";
};
gr740_partition : PROCESS deploymentview::DV::Node1::gr740_partition.others {
Taste::coordinates => "123654 114138 220066 169734";
Taste::coordinates => "141020 107883 218669 153435";
Deployment::Port_Number => 0;
};
gr740_rtems412_posix : PROCESSOR ocarina_processors_leon::gr740.rtems412_posix {
Taste::coordinates => "111602 98253 232118 177676";
Taste::coordinates => "131314 94868 228375 159942";
};
PROPERTIES
Taste::APLC_Binding => (reference (gr740_partition)) APPLIES TO IV_Function1;
......@@ -67,7 +67,7 @@ END deploymentview;
SYSTEM IMPLEMENTATION deploymentview.others
SUBCOMPONENTS
Node1 : SYSTEM Node1.others {
Taste::coordinates => "96537 75561 247182 189022";
Taste::coordinates => "119181 76276 240508 169238";
};
interfaceview : SYSTEM interfaceview::IV::interfaceview.others;
END deploymentview.others;
......
......@@ -21,20 +21,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_pulse.others;
SUBPROGRAM PI_report
FEATURES
sender_ID : IN PARAMETER DataView::MyInteger {
Taste::encoding => NATIVE;
};
PROPERTIES
Taste::Associated_Queue_Size => 3;
END PI_report;
SUBPROGRAM IMPLEMENTATION PI_report.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_report.others;
SUBPROGRAM RI_op1
END RI_op1;
......@@ -71,16 +57,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_op1.others;
SUBPROGRAM RI_report
FEATURES
sender_ID : IN PARAMETER DataView::MyInteger {
Taste::encoding => NATIVE;
};
END RI_report;
SUBPROGRAM IMPLEMENTATION RI_report.others
END RI_report.others;
END interfaceview::FV::Function2;
PACKAGE interfaceview::FV::Function3
......@@ -99,16 +75,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_op2.others;
SUBPROGRAM RI_report
FEATURES
sender_ID : IN PARAMETER DataView::MyInteger {
Taste::encoding => NATIVE;
};
END RI_report;
SUBPROGRAM IMPLEMENTATION RI_report.others
END RI_report.others;
END interfaceview::FV::Function3;
PACKAGE interfaceview::FV::Function4
......@@ -127,16 +93,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_op3.others;
SUBPROGRAM RI_report
FEATURES
sender_ID : IN PARAMETER DataView::MyInteger {
Taste::encoding => NATIVE;
};
END RI_report;
SUBPROGRAM IMPLEMENTATION RI_report.others
END RI_report.others;
END interfaceview::FV::Function4;
PACKAGE interfaceview::IV
......@@ -158,13 +114,6 @@ FEATURES
Taste::Deadline => 0 ms;
Taste::InterfaceName => "pulse";
};
PI_report : PROVIDES SUBPROGRAM ACCESS interfaceview::FV::Function1::PI_report.others {
Taste::coordinates => "75279 75023";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "report";
};
RI_op1 : REQUIRES SUBPROGRAM ACCESS interfaceview::FV::Function2::PI_op1.others {
Taste::coordinates => "99620 45959";
Taste::RCMoperationKind => any;
......@@ -191,10 +140,8 @@ END Function1;
SYSTEM IMPLEMENTATION Function1.others
SUBCOMPONENTS
pulse_impl : SUBPROGRAM interfaceview::FV::Function1::PI_pulse.others;
report_impl : SUBPROGRAM interfaceview::FV::Function1::PI_report.others;
CONNECTIONS
OpToPICnx_pulse_impl : SUBPROGRAM ACCESS pulse_impl -> PI_pulse;
OpToPICnx_report_impl : SUBPROGRAM ACCESS report_impl -> PI_report;
END Function1.others;
SYSTEM Function2
......@@ -206,12 +153,6 @@ FEATURES
Taste::Deadline => 0 ms;
Taste::InterfaceName => "op1";
};
RI_report : REQUIRES SUBPROGRAM ACCESS interfaceview::FV::Function1::PI_report.others {
Taste::coordinates => "165378 39056";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "report";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (C);
Taste::Active_Interfaces => any;
......@@ -233,12 +174,6 @@ FEATURES
Taste::Deadline => 0 ms;
Taste::InterfaceName => "op2";
};
RI_report : REQUIRES SUBPROGRAM ACCESS interfaceview::FV::Function1::PI_report.others {
Taste::coordinates => "164651 99001";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "report";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (C);
Taste::Active_Interfaces => any;
......@@ -254,18 +189,12 @@ END Function3.others;
SYSTEM Function4
FEATURES
PI_op3 : PROVIDES SUBPROGRAM ACCESS interfaceview::FV::Function4::PI_op3.others {
Taste::coordinates => "165377 141871";
Taste::coordinates => "163075 158013";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "op3";
};
RI_report : REQUIRES SUBPROGRAM ACCESS interfaceview::FV::Function1::PI_report.others {
Taste::coordinates => "165377 161489";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "report";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (C);
Taste::Active_Interfaces => any;
......@@ -293,18 +222,9 @@ SUBCOMPONENTS
Taste::coordinates => "164651 77203 246394 120073";
};
Function4 : SYSTEM interfaceview::IV::Function4.others {
Taste::coordinates => "165377 132425 244940 188373";
Taste::coordinates => "163075 136941 254264 180538";
};
CONNECTIONS
Function1_PI_report_Function2_RI_report : SUBPROGRAM ACCESS Function1.PI_report -> Function2.RI_report {
Taste::coordinates => "165378 39056 146232 39056 146232 80800 75279 80800 75279 75023";
};
Function1_PI_report_Function3_RI_report : SUBPROGRAM ACCESS Function1.PI_report -> Function3.RI_report {
Taste::coordinates => "164651 99001 75279 99001 75279 75023";
};
Function1_PI_report_Function4_RI_report : SUBPROGRAM ACCESS Function1.PI_report -> Function4.RI_report {
Taste::coordinates => "165377 161489 75279 161489 75279 75023";
};
Function2_PI_op1_Function1_RI_op1 : SUBPROGRAM ACCESS Function2.PI_op1 -> Function1.RI_op1 {
Taste::coordinates => "99620 45959 132499 45959 132499 30337 165378 30337";
};
......@@ -312,7 +232,7 @@ CONNECTIONS
Taste::coordinates => "99620 53225 132135 53225 132135 80836 164651 80836";
};
Function4_PI_op3_Function1_RI_op3 : SUBPROGRAM ACCESS Function4.PI_op3 -> Function1.RI_op3 {
Taste::coordinates => "99620 60491 132498 60491 132498 141871 165377 141871";
Taste::coordinates => "99620 60491 131347 60491 131347 158013 163075 158013";
};
END interfaceview.others;
......
......@@ -31,7 +31,7 @@ then
fi
# Use PolyORB-HI-C runtime
# USE_POHIC=1
USE_POHIC=1
# Detect models from Ellidiss tools v2, and convert them to 1.3
INTERFACEVIEW=InterfaceView.aadl
......
......@@ -15,16 +15,16 @@ isComponentType('deploymentview::DV::Node1','PUBLIC','gr740_partition','PROCESS'
isComponentImplementation('deploymentview::DV::Node1','PUBLIC','gr740_partition','others','PROCESS','NIL','others','').
isProperty('NIL','APPLIES TO','deploymentview::DV','Node1','others','gr740_partition','Actual_Processor_Binding','(reference (gr740_rtems412_posix))','').
isSubcomponent('deploymentview::DV','Node1','others','gr740_partition','PROCESS','deploymentview::DV::Node1::gr740_partition.others','NIL','NIL','').
isProperty('NIL','=>','deploymentview::DV','Node1','others','gr740_partition','Taste::coordinates','"123654 114138 220066 169734"','').
isProperty('NIL','=>','deploymentview::DV','Node1','others','gr740_partition','Taste::coordinates','"141020 107883 218669 153435"','').
isProperty('NIL','=>','deploymentview::DV','Node1','others','gr740_partition','Deployment::Port_Number','0','').
isImportDeclaration('deploymentview::DV','PUBLIC','ocarina_processors_leon','').
isProperty('NIL','=>','deploymentview::DV','gr740','NIL','NIL','Scheduling_Protocol','Posix_1003_Highest_Priority_First_Protocol','').
isSubcomponent('deploymentview::DV','Node1','others','gr740_rtems412_posix','PROCESSOR','ocarina_processors_leon::gr740.rtems412_posix','NIL','NIL','').
isProperty('NIL','=>','deploymentview::DV','Node1','others','gr740_rtems412_posix','Taste::coordinates','"111602 98253 232118 177676"','').
isProperty('NIL','=>','deploymentview::DV','Node1','others','gr740_rtems412_posix','Taste::coordinates','"131314 94868 228375 159942"','').
isComponentType('deploymentview::DV','PUBLIC','Node1','SYSTEM','NIL','').
isComponentImplementation('deploymentview::DV','PUBLIC','Node1','others','SYSTEM','NIL','others','').
isSubcomponent('deploymentview::DV','deploymentview','others','Node1','SYSTEM','Node1.others','NIL','NIL','').
isProperty('NIL','=>','deploymentview::DV','deploymentview','others','Node1','Taste::coordinates','"96537 75561 247182 189022"','').
isProperty('NIL','=>','deploymentview::DV','deploymentview','others','Node1','Taste::coordinates','"119181 76276 240508 169238"','').
isPackage('deploymentview::DV::Node1','PUBLIC','').
isImportDeclaration('deploymentview::DV::Node1','PUBLIC','Taste','').
isImportDeclaration('deploymentview::DV::Node1','PUBLIC','Deployment','').
......
......@@ -22,11 +22,3 @@ void function1_PI_pulse()
}
}
void function1_PI_report(const asn1SccMyInteger *IN_sender_ID)
{
/* Write your code here! */
printf("Received notification from blocked Function%lld\n",
*IN_sender_ID);
fflush(stdout);
}
......@@ -5,8 +5,6 @@
#ifndef __USER_CODE_H_function1__
#define __USER_CODE_H_function1__
#include "C_ASN1_Types.h"
#ifdef __cplusplus
extern "C" {
#endif
......@@ -15,8 +13,6 @@ void function1_startup();
void function1_PI_pulse();
void function1_PI_report(const asn1SccMyInteger *);
extern void function1_RI_op1();
extern void function1_RI_op2();
......
/* User code: This file will not be overwritten by TASTE. */
#include "function2.h"
#include <stdio.h>
void function2_startup()
{
......@@ -10,9 +11,12 @@ void function2_startup()
void function2_PI_op1()
{
/* Write your code here! */
asn1SccMyInteger foo = 2;
function2_RI_report(&foo);
while(1);
unsigned long long ll = 0LL;
for(ll=0LL; ll<1048576LL*1048576LL; ll++) {
if ((ll % 1048576) == 1) {
puts("op1 is still working");
fflush(stdout);
}
}
}
......@@ -5,8 +5,6 @@
#ifndef __USER_CODE_H_function2__
#define __USER_CODE_H_function2__
#include "C_ASN1_Types.h"
#ifdef __cplusplus
extern "C" {
#endif
......@@ -15,8 +13,6 @@ void function2_startup();
void function2_PI_op1();
extern void function2_RI_report(const asn1SccMyInteger *);
#ifdef __cplusplus
}
#endif
......
/* User code: This file will not be overwritten by TASTE. */
#include "function3.h"
#include <stdio.h>
void function3_startup()
{
......@@ -9,10 +10,13 @@ void function3_startup()
}
void function3_PI_op2()
{
/* Write your code here! */
asn1SccMyInteger foo = 3;
function3_RI_report(&foo);
while(1);
{
unsigned long long ll = 0LL;
for(ll=0LL; ll<1048576LL*1048576LL; ll++) {
if ((ll % 1048576) == 1) {
puts("op2 is still working");
fflush(stdout);
}
}
}
......@@ -5,8 +5,6 @@
#ifndef __USER_CODE_H_function3__
#define __USER_CODE_H_function3__
#include "C_ASN1_Types.h"
#ifdef __cplusplus
extern "C" {
#endif
......@@ -15,8 +13,6 @@ void function3_startup();
void function3_PI_op2();
extern void function3_RI_report(const asn1SccMyInteger *);
#ifdef __cplusplus
}
#endif
......
/* User code: This file will not be overwritten by TASTE. */
#include "function4.h"
#include <stdio.h>
void function4_startup()
{
......@@ -10,9 +11,13 @@ void function4_startup()
void function4_PI_op3()
{
/* Write your code here! */
asn1SccMyInteger foo = 4;
function2_RI_report(&foo);
while(1);
unsigned long long ll = 0LL;
for(ll=0LL; ll<1048576LL*1048576LL; ll++) {
if ((ll % 1048576) == 1) {
puts("op3 is still working");
fflush(stdout);
}
}
}
......@@ -5,8 +5,6 @@
#ifndef __USER_CODE_H_function4__
#define __USER_CODE_H_function4__
#include "C_ASN1_Types.h"
#ifdef __cplusplus
extern "C" {
#endif
......@@ -15,8 +13,6 @@ void function4_startup();
void function4_PI_op3();
extern void function4_RI_report(const asn1SccMyInteger *);
#ifdef __cplusplus
}
#endif
......
This diff is collapsed.
......@@ -2,7 +2,3 @@
/* Configuration file used by C_ASN1_Types.h */
#define __NEED_MyInteger_NATIVE
#define __NEED_MyInteger_NATIVE
#define __NEED_MyInteger_NATIVE
#define __NEED_MyInteger_NATIVE
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment