Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2017-11-06 10:37:41 +0000
committerHenrik Rentz-Reichert2017-11-07 06:58:06 +0000
commit48d51b2b32f759e255f0cca154d2757c95d15e19 (patch)
treef1455e17e092e88c01feac4b6cf7f5ec2d2896ff /runtime
parentb09856b29bfcaea08e9e57b14da3744c0a201867 (diff)
downloadorg.eclipse.etrice-48d51b2b32f759e255f0cca154d2757c95d15e19.tar.gz
org.eclipse.etrice-48d51b2b32f759e255f0cca154d2757c95d15e19.tar.xz
org.eclipse.etrice-48d51b2b32f759e255f0cca154d2757c95d15e19.zip
Bug 511330 - [core.genmodel.fsm] introduce simplified generator model
for state machines * manually merged newfsmgen to newfsmgen_finalize because no rebase was possible due to structural changes * rebased on master * switch to Oxygen and Xtend 2.12 Change-Id: If9a8c7421f07fb8e8fa824b7bc6761b9142b7eaf
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.modellib.c/model/TimingService.room8
-rw-r--r--runtime/org.eclipse.etrice.modellib.cpp/model/TimingService.room8
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/jgen_modellib_java.launch1
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/model/TcpService.room8
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/model/TimingService.room4
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/jgen_java_runtime.launch1
6 files changed, 14 insertions, 16 deletions
diff --git a/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room b/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room
index f71a0a16f..95863bd08 100644
--- a/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room
+++ b/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room
@@ -149,8 +149,8 @@ RoomModel room.basic.service.timing {
"etTimerControlBlock* timer = getTcb();"
"etTime t;"
"if (timer!= 0){"
- "\tt.sec=time/1000;"
- "\tt.nSec=(time%1000)*1000000L;"
+ "\tt.sec=transitionData/1000;"
+ "\tt.nSec=(transitionData%1000)*1000000L;"
"\ttimer->pTime.sec = 0;"
"\ttimer->pTime.nSec = 0;"
"\ttimer->portIdx=((etReplSubPort*)ifitem)->index;"
@@ -168,8 +168,8 @@ RoomModel room.basic.service.timing {
"etTimerControlBlock* timer = getTcb();"
"etTime t;"
"if (timer!= 0){"
- "\tt.sec=time/1000;"
- "\tt.nSec=(time%1000)*1000000L;"
+ "\tt.sec=transitionData/1000;"
+ "\tt.nSec=(transitionData%1000)*1000000L;"
"\ttimer->pTime = t;"
"\ttimer->portIdx=((etReplSubPort*)ifitem)->index;"
"\tgetTimeFromTarget(&(timer->expTime));"
diff --git a/runtime/org.eclipse.etrice.modellib.cpp/model/TimingService.room b/runtime/org.eclipse.etrice.modellib.cpp/model/TimingService.room
index c1e56cd71..a8f0248ef 100644
--- a/runtime/org.eclipse.etrice.modellib.cpp/model/TimingService.room
+++ b/runtime/org.eclipse.etrice.modellib.cpp/model/TimingService.room
@@ -156,8 +156,8 @@ RoomModel room.basic.service.timing {
"etTimerControlBlock* timer = getTcb();"
"etTime t;"
"if (timer != 0) {"
- "\tt.sec = time / 1000;"
- "\tt.nSec = (time % 1000) * 1000000L;"
+ "\tt.sec = transitionData / 1000;"
+ "\tt.nSec = (transitionData % 1000) * 1000000L;"
"\ttimer->pTime.sec = 0;"
"\ttimer->pTime.nSec = 0;"
"\ttimer->portIdx = ifitem->getIdx();"
@@ -175,8 +175,8 @@ RoomModel room.basic.service.timing {
"etTimerControlBlock* timer = getTcb();"
"etTime t;"
"if (timer != 0) {"
- "\tt.sec = time / 1000;"
- "\tt.nSec = (time % 1000) * 1000000L;"
+ "\tt.sec = transitionData / 1000;"
+ "\tt.nSec = (transitionData % 1000) * 1000000L;"
"\ttimer->pTime = t;"
"\ttimer->portIdx = ifitem->getIdx();"
"\tgetTimeFromTarget(&(timer->expTime));"
diff --git a/runtime/org.eclipse.etrice.modellib.java/jgen_modellib_java.launch b/runtime/org.eclipse.etrice.modellib.java/jgen_modellib_java.launch
index f0eb39db5..a54119cbb 100644
--- a/runtime/org.eclipse.etrice.modellib.java/jgen_modellib_java.launch
+++ b/runtime/org.eclipse.etrice.modellib.java/jgen_modellib_java.launch
@@ -18,5 +18,4 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.etrice.generator.java.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${workspace_loc:org.eclipse.etrice.modellib.java}/model/ALogService.room&#13;&#10;${workspace_loc:org.eclipse.etrice.modellib.java}/model/TimingService.room&#13;&#10;${workspace_loc:org.eclipse.etrice.modellib.java}/model/TcpService.room&#13;&#10;-lib&#13;&#10;-msc_instr"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.java"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/TcpService.room b/runtime/org.eclipse.etrice.modellib.java/model/TcpService.room
index 5af3819d6..152035ec0 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/TcpService.room
+++ b/runtime/org.eclipse.etrice.modellib.java/model/TcpService.room
@@ -102,7 +102,7 @@ RoomModel room.basic.service.tcp {
action {
"lastError=0;"
"try{"
- "socket = new ServerSocket(data.TcpPort);"
+ "socket = new ServerSocket(transitionData.TcpPort);"
"(new ServerAcceptThread(PayloadPort, socket, this)).start();"
"}catch(IOException e){"
"System.err.println(e.toString());"
@@ -148,7 +148,7 @@ RoomModel room.basic.service.tcp {
}
action {
"try{"
- "outStreams.get(data.getConnectionId()).write(data.getData(),0,data.length);"
+ "outStreams.get(transitionData.getConnectionId()).write(transitionData.getData(),0,transitionData.length);"
"}catch(IOException e){"
"System.err.println(e.toString());"
"}"
@@ -229,7 +229,7 @@ RoomModel room.basic.service.tcp {
action {
"lastError=0;"
"try{"
- "socket = new Socket(data.IPAddr,data.TcpPort);"
+ "socket = new Socket(transitionData.IPAddr,transitionData.TcpPort);"
"(new ClientRxThread(PayloadPort, socket)).start();"
"out = socket.getOutputStream();"
"}catch(IOException e){"
@@ -276,7 +276,7 @@ RoomModel room.basic.service.tcp {
}
action {
"try{"
- "\tout.write(data.getData(),0,data.length);"
+ "\tout.write(transitionData.getData(),0,transitionData.length);"
"\t}catch(IOException e){"
"\t\tSystem.err.println(e.toString());"
"\t}"
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room b/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room
index ed6dad1ae..588654646 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room
+++ b/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room
@@ -37,7 +37,7 @@ RoomModel room.basic.service.timing {
"// start timer"
"taskCount++;"
"if (taskCount>PURGE_LIMIT) timerService.purge();"
- "int t = td.getTime();"
+ "int t = transitionData.getTime();"
"timerService.scheduleAtFixedRate(((PTimerPort)ifitem).getTask(),t,t);"
}
}
@@ -49,7 +49,7 @@ RoomModel room.basic.service.timing {
"// start timeout"
"taskCount++;"
"if (taskCount>PURGE_LIMIT) timerService.purge();"
- "timerService.schedule(((PTimerPort)ifitem).getTask(), ((TimerData)td).getTime());"
+ "timerService.schedule(((PTimerPort)ifitem).getTask(), transitionData.getTime());"
}
}
Transition tr4: Operational -> Operational {
diff --git a/runtime/org.eclipse.etrice.runtime.java/jgen_java_runtime.launch b/runtime/org.eclipse.etrice.runtime.java/jgen_java_runtime.launch
index e554de86f..037e2ffa0 100644
--- a/runtime/org.eclipse.etrice.runtime.java/jgen_java_runtime.launch
+++ b/runtime/org.eclipse.etrice.runtime.java/jgen_java_runtime.launch
@@ -10,5 +10,4 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.etrice.generator.java.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${workspace_loc:org.eclipse.etrice.runtime.java}/models/SystemServices.room&#13;&#10;-lib"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.java"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>

Back to the top