update grid5000.sh

grid5000.sh

@@ -4,5 +4,4 @@ git pull
 mvn clean package
 java -jar target/Diversify-statements-1.0-SNAPSHOT-jar-with-dependencies.jar git $2
 
-sh runFromGit.sh 100 &
-sh runFromGit.sh 100 &
+sh runFromGit.sh 100 repo &

runFromGit.sh

@@ -1,7 +1,12 @@
 #!/bin/sh
 
-
+java -jar target/Diversify-statements-1.0-SNAPSHOT-jar-with-dependencies.jar git $2
+cpu=$(cat nbCPU)
 for i in `seq 1 $1`
 do
-    java -Xmx2000m -XX:MaxPermSize=256m -jar target/Diversify-statements-1.0-SNAPSHOT-jar-with-dependencies.jar $(cat propertiesFile)
+    for j in `seq 1 $cpu`
+    do
+        java -Xmx2000m -XX:MaxPermSize=256m -jar target/Diversify-statements-1.0-SNAPSHOT-jar-with-dependencies.jar $(cat propertiesFile) $
+    done
+    wait
 done

src/main/java/fr/inria/diversify/Builder.java

@@ -6,7 +6,6 @@
 import fr.inria.diversify.transformation.query.AbstractTransformationQuery;
 import fr.inria.diversify.util.GitUtil;
 import fr.inria.diversify.util.Log;
-import org.apache.commons.io.FileUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 
@@ -107,7 +106,7 @@ public void initTimeOut() throws InterruptedException {
         RunMaven rt = new RunMaven(projectDir, "test", 0, clojureTest);
         rt.start();
         timeOut = 0;
-        int factor = 4;
+        int factor = 2;
         while (rt.getFailures() == null) {
             timeOut = timeOut + factor;
             Thread.sleep(1000);

src/main/java/fr/inria/diversify/Main.java

@@ -29,10 +29,7 @@
 import spoon.support.StandardEnvironment;
 import spoon.support.builder.SpoonBuildingManager;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
@@ -53,6 +50,10 @@ public static void main(String[] args) throws Exception {
                 BufferedWriter out = new BufferedWriter(new FileWriter("propertiesFile"));
                 out.write(propertiesFile);
                 out.close();
+                out = new BufferedWriter(new FileWriter("nbCPU"));
+                out.write(numberOfCpu());
+                out.write(numberOfCpu());
+                out.close();
 //                r.exec("echo "+propertiesFile+" > propertiesFile" +propertiesFile);
 //                Log.info("execute: sh run.sh {}",propertiesFile);
             } catch (Exception e) {
@@ -68,7 +69,7 @@ public Main(String propertiesFile) throws Exception {
 
         initLogLevel();
         initSpoon();
-
+        Log.info("number of cpu: "+numberOfCpu());
         Log.info("number of statement: " + statements.size());
 
         if(DiversifyProperties.getProperty("sosie").equals("true"))
@@ -289,7 +290,6 @@ protected void writeTransformation(String FileName, List<Transformation> transfo
         out.write(obj.toString());
         out.newLine();
         out.close();
-
     }
 
     protected void suicide() {
@@ -307,4 +307,20 @@ protected void initLogLevel() {
         int level = Integer.parseInt(DiversifyProperties.getProperty("logLevel"));
         Log.set(level);
     }
+
+    protected static int numberOfCpu() throws InterruptedException, IOException {
+        Runtime r = Runtime.getRuntime();
+
+            Process p = r.exec("cat /proc/cpuinfo");
+            p.waitFor();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String line;
+            int i = 0;
+            while ((line = reader.readLine()) != null) {
+                if(line.startsWith("processor"))
+                    i++;
+            }
+            reader.close();
+        return  i;
+    }
 }

src/main/java/fr/inria/diversify/transformation/RunMaven.java

@@ -2,6 +2,7 @@
 
 
 import fr.inria.diversify.util.Log;
+import fr.inria.diversify.util.maven.MavenInvoker;
 import org.apache.maven.shared.invoker.*;
 
 import java.io.*;
@@ -22,7 +23,7 @@ public class RunMaven extends  Thread {
     protected String lifeCycle;
     protected Integer failure = null;
     protected Boolean clojureTest = false;
-    private int timeOut;
+    protected int timeOut;
 
 
     public RunMaven(String directory, String lifeCycle, int timeOut) {