Merge branch 'master' of http://build.se.informatik.uni-kiel.de/gitlab/chw/integration-project

NeoSuit/src/examples/mzl/ForEachLoop.java

@@ -21,11 +21,6 @@ public class ForEachLoop {
 
 		list.add(5.0);
 
-		// do long computation
-		for (Double d : list) {
-			writeResultInDatabase(d);
-		}
-
 	}
 
 	private static void writeResultInDatabase(final double result) {

NeoSuit/src/main/resources/patterns_mzl/For_Each_Loop_Pattern_Splitted.xml

@@ -4,6 +4,8 @@
  
  Theoretisch sind auch welche erlaubt, die nur lesende Zugriffe haben. Dann müssen die Assignments, zu denen Abhängigkeiten bestehen, noch als "final" markiert werden.
 
+ 
+ Replace "AND (totalruntime>150 OR totalruntime = 0)" with ...totalruntime>{minExecutionTime}... to enable execution time filtering
 -->
   <pattern display="true">
 	<name>Foreach-Loop Parallelisation</name>
@@ -75,6 +77,7 @@
       <pp  java="1.7" name="Java 1.7 mzl">
         <!-- find last CF before the loop -->
         <query><![CDATA[
+          //1: Mark place to insert thread pool
           MATCH (loopInit)
             WHERE id(loopInit)={loopInitID}
             WITH loopInit
@@ -86,6 +89,7 @@
         <query src="subpatterns/create_threadpool.xml"/>
         <!-- mark init assignment-->
         <query><![CDATA[
+          //3: Mark init Assignments
           MATCH (loopInit)
             WHERE id(loopInit)={loopInitID}
             WITH loopInit
@@ -106,6 +110,7 @@
         <query src="subpatterns/create_anonymous_class_constructor.xml"/>
         <!-- find first cf after loop -->
         <query><![CDATA[
+          //5: Mark place to insert joinloop
           MATCH (loopInit)
             WHERE id(loopInit)={loopInitID}
             WITH loopInit
@@ -121,6 +126,7 @@
         <query src="subpatterns/create_forkjoinpool_joinloop.xml"/>
         <!-- mark loop body nodes-->
         <query><![CDATA[
+          //7: mark body begin and end
           MATCH (loopInit)
             WHERE id(loopInit)={loopInitID}
             WITH loopInit
@@ -145,6 +151,7 @@
         <!-- insert thread init nodes into loop body-->
         <query src="subpatterns/create_thread_init.xml"/>
         <query><![CDATA[
+          //10: return
           MATCH (class)
             WHERE id(class) = {classID}
             return class as display

NeoSuit/src/main/resources/patterns_mzl/subpatterns/create_anonymous_class_constructor.xml

@@ -9,6 +9,7 @@ in first node to get the replacements in other subqueries.
 Requires the loop var assigment node with attribute "isLoopAssignment = true" 
 -->
 <query><![CDATA[
+  //4: create anonymous class
   MATCH (initAssignment)
     WHERE initAssignment.isLoopAssignment = true
     WITH initAssignment

NeoSuit/src/main/resources/patterns_mzl/subpatterns/create_forkjoinpool_joinloop.xml

@@ -10,6 +10,7 @@
   //TODO: sdg2java has a problem with consecutive for loops, so we insert a print statemant between them. This has to be removed once the bug in sdg2java is fixed.
  -->
 <query><![CDATA[
+  //6: create join loop
   MATCH (start)-[replacedCF]->(end)
     WHERE exists(replacedCF.replaceWithThreadPoolJoinLoop)
     AND replacedCF.replaceWithThreadPoolJoinLoop = true

NeoSuit/src/main/resources/patterns_mzl/subpatterns/create_thread_init.xml

@@ -13,6 +13,7 @@
   some node with the attribute tasklistvar
  -->
 <query><![CDATA[
+  //9: insert thread initialisation
   MATCH (start)
     WHERE start.insertThreadInit = "begin"
     WITH start
@@ -44,7 +45,7 @@
   CREATE (anonymousConstructorCall)-[:CONTROL_FLOW]->(forkJoinTaskRunnableAssignment)
   CREATE (taskAssignment:Assignment {operation:"value", var:"%{task}", displayname:"%{task} = %{taskTemp}", vartype:"java.util.concurrent.ForkJoinTask", isdeclaration:true, type:"Assignment", rightValue:"%{taskTemp}", lefttypearguments: ["?"]})
   CREATE (forkJoinTaskRunnableAssignment)-[:CONTROL_FLOW]->(taskAssignment)
-  CREATE (addTaskToFJPool:MethodCall {caller:tasklistVar, args:[%{task}], var:"addResultTemp", type:"MethodCall", returntype:"boolean", fqn:"java.util.List.add(java.lang.Object)", operation:"MethodCall", name:"add", vartype:"boolean", argumentscount:1, returntype:"boolean", displayname:"add(%{task})"})
+  CREATE (addTaskToFJPool:MethodCall {caller:tasklistVar, args:["%{task}"], var:"addResultTemp", type:"MethodCall", returntype:"boolean", fqn:"java.util.List.add(java.lang.Object)", operation:"MethodCall", name:"add", vartype:"boolean", argumentscount:1, returntype:"boolean", displayname:"add(%{task})"})
   CREATE (taskAssignment)-[:CONTROL_FLOW]->(addTaskToFJPool)
   CREATE (nop:NopStmt {type:"NopStmt", displayname:"nop"})
   CREATE (addTaskToFJPool)-[:CONTROL_FLOW]->(nop)

NeoSuit/src/main/resources/patterns_mzl/subpatterns/create_thread_run.xml

@@ -9,6 +9,7 @@
   some node with the attribute newanonymousclassname
  -->
 <query><![CDATA[
+  //8: create run method for anonymous method
   MATCH (a)-[del1:CONTROL_FLOW]->(start)
     WHERE start.moveToRun = "begin"
     WITH start,del1

NeoSuit/src/main/resources/patterns_mzl/subpatterns/create_threadpool.xml

@@ -7,6 +7,7 @@
  -->
 <query>
 <![CDATA[
+  //2: create threadpool
   MATCH (start)-[beforeLoopControlFlow]->(end)
     WHERE exists(beforeLoopControlFlow.replaceWithThreadPoolInit)
     AND beforeLoopControlFlow.replaceWithThreadPoolInit = true

NeoSuit/src/main/resources/patterns_puff/TinkerPop-Subpattern/FilterFunctionPipe2AbstractFilter-PPQuery.xml

@@ -43,16 +43,14 @@
         DELETE cfReturn
         
         // Create Configuration nodes								
-        MERGE (assignTemp:Assignment {
-                    operation: "new", 
-				   	var: "%{temp$0}", 
+         MERGE (assignTemp:Assignment {operation: "new", 
+				   	var: "%{temp$}" + id(function), 
 				   	vartype: function.vartype, 
 				   	type: "Assignment", 
 				   	rightValue: function.rightValue, 
-				   	displayname: "%{temp$0} = " + function.rightValue})	
+				   	displayname: "%{temp$}"+ id(function) + " = " + function.rightValue})	
    		-[:CONTROL_FLOW]->					   			
-       		(initNode:MethodCall:ConstructorCall {
-                    caller: "%{temp$0}", 
+       		(initNode:MethodCall:ConstructorCall {caller: assignTemp.var, 
 					fqn: function.vartype + ".<init>()", 
 					name:"<init>", 
 					type:"MethodCall", 
@@ -61,17 +59,16 @@
 					returntype: "void", 
 					displayname: "<init>()"}) 
    		-[:CONTROL_FLOW]->					  				
-       		(assignValue:Assignment {
-                    operation: "value", 
-					var: "%{stage$0}", 
+       		(assignValue:Assignment {operation: "value", 
+					var: "%{stage$}" + id(function), 
 					vartype: function.vartype, 
 					isdeclaration: true,
 					type: "Assignment", 
-					rightValue: "%{temp$0}", 
-					displayname: "%{stage$0} = %{temp$0}"})
+					rightValue: assignTemp.var, 
+					displayname: "%{stage$}"+ id(function) +" = " + assignTemp.var})
 
   		// Create InputPort
-        MERGE (inputPort:Assignment:MethodCall {
+        CREATE (inputPort:Assignment:MethodCall {
                     caller: assignValue.var,
 					fqn: "teetime.framework.AbstractConsumerStage.getInputPort()",
 					operation: "MethodCall",
@@ -94,7 +91,7 @@
 					displayname: "%{temp$6} = (teetime.framework.InputPort) %{temp$5}" })
   		
         // Create OutputPort        
-        MERGE (outputPort:Assignment:MethodCall {
+        CREATE (outputPort:Assignment:MethodCall {
                     caller: assignValue.var,    
 					fqn: functionClass.fqn + ".getOutputPort()",
 					operation: "MethodCall", 
@@ -116,6 +113,9 @@
 				   	nopkind:"Pipe"})
 		-[:CONTROL_FLOW]->
 			(successor)		
+		MERGE (functionPipe)-[:IS_TRANSFORMED_THROUGH_START]->(nopCS)
+		MERGE (endPipe)-[:IS_TRANSFORMED_THROUGH_END]->(nopCS)
+					   	
         MERGE (nopCS)-[:HAS_CONFIGURATION]->(assignTemp)
 		MERGE (nopCS)-[:INPUTPORT_START]->(inputPort)
 		MERGE (nopCS)-[:INPUTPORT_END]->(inputPortCast)
@@ -313,8 +313,10 @@
 			        displayname: "return" }
                                     
         // Delete pipe		
-        WITH functionPipe, endPipe                               
+        WITH functionPipe, endPipe, nopCS, predecessor                                              
         MATCH pipe = (functionPipe)-[*]->(endPipe)
+        OPTIONAL MATCH (predecessor)-[:IS_TRANSFORMED_THROUGH_END]->(preNop)
+        MERGE (preNop)-[:CONTROL_FLOW]->(nopCS)	
         FOREACH (n IN nodes(pipe) | DETACH DELETE n)
     ]]>
 </query>
\ No newline at end of file

NeoSuit/src/main/resources/patterns_puff/TinkerPop-Subpattern/TransformFunctionPipe2ConsumerStage-PPQuery.xml

@@ -44,13 +44,13 @@
         
         // Create Configuration nodes								
         MERGE (assignTemp:Assignment {operation: "new", 
-				   	var: "%{temp$0}", 
+				   	var: "%{temp$}" + id(function), 
 				   	vartype: function.vartype, 
 				   	type: "Assignment", 
 				   	rightValue: function.rightValue, 
-				   	displayname: "%{temp$0} = " + function.rightValue})	
+				   	displayname: "%{temp$}"+ id(function) + " = " + function.rightValue})	
    		-[:CONTROL_FLOW]->					   			
-       		(initNode:MethodCall:ConstructorCall {caller: "%{temp$0}", 
+       		(initNode:MethodCall:ConstructorCall {caller: assignTemp.var, 
 					fqn: function.vartype + ".<init>()", 
 					name:"<init>", 
 					type:"MethodCall", 
@@ -60,22 +60,22 @@
 					displayname: "<init>()"}) 
    		-[:CONTROL_FLOW]->					  				
        		(assignValue:Assignment {operation: "value", 
-					var: "%{stage$0}", 
+					var: "%{stage$}" + id(function), 
 					vartype: function.vartype, 
 					isdeclaration: true,
 					type: "Assignment", 
-					rightValue: "%{temp$0}", 
-					displayname: "%{stage$0} = %{temp$0}"})
+					rightValue: assignTemp.var, 
+					displayname: "%{stage$}"+ id(function) +" = " + assignTemp.var})
         
   		// Create InputPort
-  		MERGE (inputPort:Assignment:MethodCall {caller: assignValue.var,
+  		CREATE (inputPort:Assignment:MethodCall {caller: assignValue.var,
 					fqn: "teetime.framework.AbstractConsumerStage.getInputPort()",
 					operation: "MethodCall",
 					var: "%{temp$5}",
 					name: "getInputPort",
 					vartype: "teetime.framework.InputPort", 
 					type: "Assignment",
-					rightValue: "virtualinvoke %{stage$0}.<" + functionClass.fqn + ": teetime.framework.InputPort getInputPort()>()",
+					rightValue: "virtualinvoke "+ assignValue.var + ".<" + functionClass.fqn + ": teetime.framework.InputPort getInputPort()>()",
 					args: [],
 					argumentscount: "0",
 					displayname: "%{temp$5} = getInputPort()",
@@ -89,7 +89,7 @@
 					displayname: "%{temp$6} = (teetime.framework.InputPort) %{temp$5}" })
   		
         // Create OutputPort        
-        MERGE (outputPort:Assignment:MethodCall {caller: assignValue.var,    
+        CREATE (outputPort:Assignment:MethodCall {caller: assignValue.var,    
 					fqn: functionClass.fqn + ".getOutputPort()",
 					operation: "MethodCall", 
 					var: "%{temp$7}",
@@ -110,6 +110,9 @@
 				   	nopkind:"Pipe"})
 		-[:CONTROL_FLOW]->
 			(successor)
+        MERGE (functionPipe)-[:IS_TRANSFORMED_THROUGH_START]->(nopCS)
+		MERGE (endPipe)-[:IS_TRANSFORMED_THROUGH_END]->(nopCS)
+					   	
         MERGE (nopCS)-[:HAS_CONFIGURATION]->(assignTemp)
 		MERGE (nopCS)-[:INPUTPORT_START]->(inputPort)
 		MERGE (nopCS)-[:INPUTPORT_END]->(inputPortCast)
@@ -267,8 +270,10 @@
 			displayname: "return" }
                                         
         // Delete pipe		
-        WITH functionPipe, endPipe                               
+        WITH functionPipe, endPipe, nopCS, predecessor                                              
         MATCH pipe = (functionPipe)-[*]->(endPipe)
+        OPTIONAL MATCH (predecessor)-[:IS_TRANSFORMED_THROUGH_END]->(preNop)
+        MERGE (preNop)-[:CONTROL_FLOW]->(nopCS)	
         FOREACH (n IN nodes(pipe) | DETACH DELETE n)
     ]]>
 </query>