surfCpuModel add execute on host

[simgrid.git] / examples / java / surfCpuModel / CpuConstantModel.java

diff --git a/examples/java/surfCpuModel/CpuConstantModel.java b/examples/java/surfCpuModel/CpuConstantModel.java
index 7325355..7f7d418 100644 (file)
--- a/examples/java/surfCpuModel/CpuConstantModel.java
+++ b/examples/java/surfCpuModel/CpuConstantModel.java
@@ -8,7 +8,6 @@ import java.util.ArrayList;
 public class CpuConstantModel extends CpuModel {
 
   private List<CpuConstant> cpus = new ArrayList<CpuConstant>();
-  private List<CpuConstantAction> actions = new ArrayList<CpuConstantAction>();
 
   public CpuConstantModel() {
     super("Cpu Constant");
@@ -16,50 +15,77 @@ public class CpuConstantModel extends CpuModel {
   }
 
   public Cpu createResource(String name, double[] power_peak, int pstate, double power_scale, TmgrTrace power_trace, int core, ResourceState state_initial, TmgrTrace state_trace, XbtDict cpu_properties) {
-    Msg.info("Create Resource Name: "+name);
-    CpuConstant res = new CpuConstant(this, name, cpu_properties, actions, 1, 1000, 1000);
+    Msg.info("New Cpu("+name+", "+power_peak[pstate]+", "+power_scale+")");
+
+    CpuConstant res = new CpuConstant(this, name, cpu_properties, core, power_peak[pstate], power_scale);
     cpus.add(res);
     Surf.setCpu(name, res);
     return res;
   }
 
-  public void setState(ResourceState state) {
-    Msg.info("setState");
-  }
-
   public double shareResources(double now) {
-    Msg.info("shareResource of "+cpus.size()+" cpu and "+actions.size()+" actions");
-    return now+1;
+    double res = -1;
+    for (int i=0; i<cpus.size();i++){
+      double tmp = cpus.get(i).share(now);
+      if (tmp!=-1 && (res==-1 || tmp<res))
+        res = tmp;
+    }
+    Msg.info("ShareResources at time "+res);
+    return res;
   }
 
   public void updateActionsState(double now, double delta) {
-    Msg.info("updateActionState of "+cpus.size()+" cpu and "+actions.size()+" actions");
+    Action[] actions = getRunningActionSet().getArray();
+    Msg.info("UpdateActionState of "+actions.length+" actions");
+    for (int i=0; i<actions.length; i++) {
+      CpuConstantAction action = (CpuConstantAction)actions[i];
+      action.update(delta);
+      if (!action.sleeping()) {
+        Msg.info("action remains "+action.getRemains()+" after delta of "+delta);
+        if (action.getRemains()==0.0){
+          action.setState(ActionState.SURF_ACTION_DONE);
+          Msg.info("action DONE");
+        }
+      }
+    }
   }
 
   public void addTraces() {
   }
 
 public class CpuConstant extends Cpu {
-  private List<CpuConstantAction> actions;
+  private List<CpuConstantAction> actions = new ArrayList<CpuConstantAction>();
 
   public CpuConstant(CpuConstantModel model, String name, XbtDict props,
-                     List<CpuConstantAction> actions,
                      int core, double powerPeak, double powerScale) {
     super(model, name, props, core, powerPeak, powerScale);
-    this.actions = actions;
+  }
+
+  public void remove(CpuConstantAction action){
+    actions.remove(action);
   }
 
   public CpuAction execute(double size) {
-    CpuConstantAction res = new CpuConstantAction(getModel(), size, false);
-    Msg.info("Execute action of size "+size);
+    CpuConstantAction res = new CpuConstantAction(getModel(), size, false, false, this);
+    Msg.info("Execute action of size "+size+" sleeping "+res.sleeping());
     actions.add(res);
     return res;
   }
 
   public CpuAction sleep(double duration) {
-    CpuConstantAction res = new CpuConstantAction(getModel(), duration, false);
-    Msg.info("Sleep action of duration "+duration);
-    actions.add(res);
+    CpuConstantAction res = new CpuConstantAction(getModel(), duration, false, true, this);
+    Msg.info("Sleep action of duration "+duration+" sleeping "+res.sleeping());
+    return res;
+  }
+
+  public double share(double now){
+    double res = -1;
+    for (int i=0; i<actions.size();i++){
+      double tmp = actions.get(i).getRemains()/getCurrentPowerPeak();
+      Msg.info("Share action with new time "+tmp);
+      if (res==-1 || tmp<res)
+        res = tmp;
+    }
     return res;
   }
 
@@ -69,9 +95,23 @@ public class CpuConstant extends Cpu {
 }
 
 public class CpuConstantAction extends CpuAction {
-  public CpuConstantAction(Model model, double cost, boolean failed) {
+  boolean sleep;
+  CpuConstant cpu;
+  public CpuConstantAction(Model model, double cost, boolean failed, boolean sleep, CpuConstant cpu) {
     super(model, cost, failed);
+    this.sleep = sleep;
+    this.cpu = cpu;
+  }
+
+  public void update(double delta){
+    updateRemains(delta*cpu.getCurrentPowerPeak());
+  }
+  public synchronized void delete() {
+    cpu.remove(this);
+    super.delete();
   }
+
+  public boolean sleeping() {return sleep;}
+  public void setPriority(double priority) {}
 }
 }
-