SLG: ROS2/MicroROS handled spaces between function arguments
diff --git a/load_generator/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/customization/CustomRunnableTransformer.java b/load_generator/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/customization/CustomRunnableTransformer.java index d34d2de..1ea37cd 100644 --- a/load_generator/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/customization/CustomRunnableTransformer.java +++ b/load_generator/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/customization/CustomRunnableTransformer.java
@@ -428,7 +428,7 @@ Object data = customObjsStore.getData(tu.getCall()); EList<LocalModeLabel> localLabels = ((Runnable)data).getLocalLabels(); if(localLabels.size()>0) - incAppend(tu, "void " + tu.getCall()+"_Context" + "(char* coreName"+","+getParamNames(localLabels)+" );\n"); + incAppend(tu, "void " + tu.getCall()+"_Context" + "(char* coreName"+" , "+getParamNames(localLabels)+" );\n"); }
diff --git a/load_generator/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTaskTransformer.java b/load_generator/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTaskTransformer.java index 94a85a0..7ad57aa 100644 --- a/load_generator/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTaskTransformer.java +++ b/load_generator/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTaskTransformer.java
@@ -206,7 +206,7 @@ statements.add("instr_start();"); if(contextParameters.size()>0) { - statements.add("run_" + runnable.getName()+"_Context" + "(\"" + puDefinition.toString() + "\","+String.join(",", contextParameters)+");"); + statements.add("run_" + runnable.getName()+"_Context" + "(\"" + puDefinition.toString() + "\" , "+String.join(",", contextParameters)+");"); }else { statements.add("run_" + runnable.getName() + "(\"" + puDefinition.toString() + "\");"); @@ -216,7 +216,7 @@ if(contextParameters.size()>0) { - statements.add("run_" + runnable.getName()+"_Context" + "(\"" + puDefinition.toString() + "\","+String.join(",", contextParameters)+");"); + statements.add("run_" + runnable.getName()+"_Context" + "(\"" + puDefinition.toString() + "\" , "+String.join(",", contextParameters)+");"); }else { statements.add("run_" + runnable.getName() + "(\"" + puDefinition.toString() + "\");");
diff --git a/load_generator/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosRunnableTransformer.java b/load_generator/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosRunnableTransformer.java index 9bcc841..6fb0a74 100644 --- a/load_generator/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosRunnableTransformer.java +++ b/load_generator/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosRunnableTransformer.java
@@ -200,7 +200,7 @@ String fullCall = "run_" + runnable.getName() + "(" + param + ")"; - String fullCall_with_context = "run_" + runnable.getName()+"_Context" + "(" + (param.length()>0?(param + ","):param )+getParamNames(runnable.getLocalLabels())+" )"; + String fullCall_with_context = "run_" + runnable.getName()+"_Context" + "(" + (param.length()>0?(param + ", "):param )+getParamNames(runnable.getLocalLabels())+" )"; // write header @@ -224,7 +224,7 @@ if(runnable.getLocalLabels().size()>0) { //additional method for switch - srcAppend(tu, "void " + call_overwrite+"_Context"+ "("+ param+ ","+getParamNames(runnable.getLocalLabels())+" ){\n" + "\n"); + srcAppend(tu, "void " + call_overwrite+"_Context"+ "("+ param+ " , "+getParamNames(runnable.getLocalLabels())+" ){\n" + "\n"); for(SwitchEntry switchEntry: switchEntries) { @@ -398,7 +398,7 @@ if(localLabels.size()>0) - incAppend(tu, "void " + "run_" + data.getName() +"_Context" + "("+param+","+getParamNames(localLabels)+" );\n"); + incAppend(tu, "void " + "run_" + data.getName() +"_Context" + "("+(param.length()>0?param+" , ":param)+getParamNames(localLabels)+" );\n"); } private String getParamNames(EList<LocalModeLabel> localLabels) {
diff --git a/load_generator/releng/org.eclipse.app4mc.slg.target/org.eclipse.app4mc.slg.target.target b/load_generator/releng/org.eclipse.app4mc.slg.target/org.eclipse.app4mc.slg.target.target index 7267c7f..e7b135d 100644 --- a/load_generator/releng/org.eclipse.app4mc.slg.target/org.eclipse.app4mc.slg.target.target +++ b/load_generator/releng/org.eclipse.app4mc.slg.target/org.eclipse.app4mc.slg.target.target
@@ -27,11 +27,11 @@ <unit id="org.apache.commons.math3" version="3.5.0.v20190611-1023"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/app4mc/updatesites/releases/1.2.0"/> + <repository location="https://download.eclipse.org/app4mc/updatesites/releases/2.1.0"/> <unit id="org.eclipse.app4mc.amalthea.models.sdk.feature.group" version="0.0.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/app4mc/components/addon/migration/releases/1.2.0/p2repo/"/> + <repository location="https://download.eclipse.org/app4mc/components/addon/migration/releases/2.1.0/p2repo/"/> <unit id="org.eclipse.app4mc.utils.platform.sdk.feature.group" version="0.0.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">