X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/539916de848562683cf2e5425d5160c2a43f135a..c2f951e38bdf2b8639bf42b78b69c1530510b6f0:/examples/java/cloud/migration/XVM.java

diff --git a/examples/java/cloud/migration/XVM.java b/examples/java/cloud/migration/XVM.java
index 6e3671e866..414c98096e 100644
--- a/examples/java/cloud/migration/XVM.java
+++ b/examples/java/cloud/migration/XVM.java
@@ -1,82 +1,68 @@
-/* Copyright (c) 2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2017. 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.migration;
 
-import org.simgrid.msg.Host;
-import org.simgrid.msg.HostNotFoundException;
-import org.simgrid.msg.HostFailureException;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.VM;
+import org.simgrid.msg.Host;
+import org.simgrid.msg.HostFailureException;
 
-/**
- * A stupid VM extension to associate a daemon to the VM
- */
 public class XVM extends VM {
+  private int dpIntensity;
+  private int ramsize;
+  private int currentLoad;
 
+  private Daemon daemon;
 
-    private int dpIntensity;
-    private int netBW;
-    private int ramsize;
-    private int currentLoad;
-
-    private Daemon daemon;
-
-    public XVM(Host host, String name,
-               int nbCores, int ramsize, int netBW, String diskPath, int diskSize, int migNetBW, int dpIntensity){
-        super(host, name, nbCores, ramsize, netBW, diskPath, diskSize, (int)(migNetBW*0.9), dpIntensity);
-        this.currentLoad = 0;
-        this.netBW = netBW ;
-        this. dpIntensity = dpIntensity ;
-        this.ramsize= ramsize;
-        this.daemon = new Daemon(this, 100);
+  public XVM(Host host, String name, int ramsize, int migNetBW, int dpIntensity){
+    super(host, name, ramsize, (int)(migNetBW*0.9), dpIntensity);
+    this.currentLoad = 0;
+    this.dpIntensity = dpIntensity ;
+    this.ramsize= ramsize;
+    this.daemon = new Daemon(this);
+  }
 
+  public void setLoad(int load){  
+    if (load >0) {
+      this.setBound(this.getSpeed()*load/100);
+      daemon.resume();
+    } else{
+      daemon.suspend();
     }
+    currentLoad = load ;
+  }
 
-    public void setLoad(int load){  
-        if (load >0) {
-            this.setBound(load);
-        //    this.getDaemon().setLoad(load);
-            daemon.resume();
-        }
-        else{
-            daemon.suspend();
-        }
-        currentLoad = load ;
-    }
+  @Override
+  public void start() {
+    super.start();
+    daemon.start();
+    this.setLoad(0);
+  }
 
-    public void start(){
-        super.start();
-         try {
-            daemon.start();
-        } catch (HostNotFoundException e) {
-            e.printStackTrace();
-        }
-        this.setLoad(0);
+  public Daemon getDaemon(){
+    return this.daemon;
+  }
 
-    }
-    public Daemon getDaemon(){
-        return this.daemon;
-    }
-    public int getLoad(){
-       System.out.println("Remaining comp:" + this.daemon.getRemaining());
-        return this.currentLoad;
-    }
+  public int getLoad(){
+    System.out.println("Remaining comp:" + this.daemon.getRemaining());
+    return this.currentLoad;
+  }
 
-    public void migrate(Host host) throws HostFailureException {
-        Msg.info("Start migration of VM " + this.getName() + " to " + host.getName());
-        Msg.info("    currentLoad:" + this.currentLoad + "/ramSize:" + this.ramsize + "/dpIntensity:" + this.dpIntensity 
-        		+ "/remaining:" + String.format(java.util.Locale.US, "%.2E",this.daemon.getRemaining()));
-        try{
-        	super.migrate(host);
-	} catch (Exception e){
-		Msg.info("Something wrong during the live migration of VM "+this.getName());
-		throw new HostFailureException(); 
-        }
-        this.setLoad(this.currentLoad); //Fixed the fact that setBound is not propagated to the new node.
-        Msg.info("End of migration of VM " + this.getName() + " to node " + host.getName());
+  @Override
+  public void migrate(Host host) throws HostFailureException {
+    Msg.info("Start migration of VM " + this.getName() + " to " + host.getName());
+    Msg.info("    currentLoad:" + this.currentLoad + "/ramSize:" + this.ramsize + "/dpIntensity:" + this.dpIntensity 
+        + "/remaining:" + String.format(java.util.Locale.US, "%.2E",this.daemon.getRemaining()));
+    try{
+      super.migrate(host);
+    } catch (Exception e){
+      Msg.info("Something wrong during the live migration of VM "+this.getName());
+      throw new HostFailureException(); 
     }
+    this.setLoad(this.currentLoad); //Fixed the fact that setBound is not propagated to the new node.
+    Msg.info("End of migration of VM " + this.getName() + " to node " + host.getName());
+  }
 }