integrate Adrien's example for Java VM energy as a tesh test

[simgrid.git] / examples / java / cloud / energy / Main.java

diff --git a/examples/java/cloud/energy/Main.java b/examples/java/cloud/energy/Main.java
index 875777e..931d2fd 100644 (file)
--- a/examples/java/cloud/energy/Main.java
+++ b/examples/java/cloud/energy/Main.java
@@ -1,10 +1,9 @@
-/* Copyright (c) 2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2016. The SimGrid Team. All rights reserved.               */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-//package cloud.energy;
+package cloud.energy;
 
 import org.simgrid.msg.Host;
 import org.simgrid.msg.HostNotFoundException;
@@ -12,31 +11,23 @@ import org.simgrid.msg.Msg;
 import org.simgrid.msg.NativeException;
 
 public class Main {
-    private static boolean endOfTest = false;
 
-    public static void setEndOfTest(){
-        endOfTest=true;
-    }
+       public static void main(String[] args) throws NativeException, HostNotFoundException {
+               /* Init. internal values */
+               Msg.energyInit();
+               Msg.init(args);
 
-    public static boolean isEndOfTest(){
-        return endOfTest;
-    }
+               if (args.length < 1) {
+                       Msg.info("Usage: Main platform_file.xml");
+                       System.exit(1);
+               }
 
-    public static void main(String[] args) throws NativeException {
-       /* Init. internal values */
-        Msg.energyInit();
-        Msg.init(args);
+               /* construct the platform */
+               Msg.createEnvironment(args[0]);
+               
+               /* Create and start a runner for the experiment */
+               new EnergyVMRunner(Host.all()[0],"energy VM runner",null).start();
 
-        if (args.length < 1) {
-            Msg.info("Usage  : Main platform_file.xml deployment_file.xml");
-            System.exit(1);
-        }
-
-       /* construct the platform and deploy the application */
-        Msg.createEnvironment(args[0]);
-        Msg.deployApplication(args[1]);
-
-        Msg.run();
-
-    }
+               Msg.run();
+       }
 }