actually kill models' names

diff --git a/examples/java/surfCpuModel/CpuConstantModel.java b/examples/java/surfCpuModel/CpuConstantModel.java
index fb2925a..7a9e5de 100644 (file)
--- a/examples/java/surfCpuModel/CpuConstantModel.java
+++ b/examples/java/surfCpuModel/CpuConstantModel.java
@@ -10,7 +10,6 @@ public class CpuConstantModel extends CpuModel {
   private List<CpuConstant> cpus = new ArrayList<CpuConstant>();
 
   public CpuConstantModel() {
   private List<CpuConstant> cpus = new ArrayList<CpuConstant>();
 
   public CpuConstantModel() {

-    super("Cpu Constant");

     Msg.info("Initialize Cpu Constant Model");
   }
 
     Msg.info("Initialize Cpu Constant Model");
   }
 

diff --git a/examples/java/surfCpuModel/TestCpuModel.java b/examples/java/surfCpuModel/TestCpuModel.java
index 068cb8f..92dbf93 100644 (file)
--- a/examples/java/surfCpuModel/TestCpuModel.java
+++ b/examples/java/surfCpuModel/TestCpuModel.java
@@ -35,7 +35,7 @@ public class TestCpuModel {
     /* construct the platform and deploy the application */
     Msg.createEnvironment(args[0]);
     Msg.deployApplication(args[1]);
     /* construct the platform and deploy the application */
     Msg.createEnvironment(args[0]);
     Msg.deployApplication(args[1]);

-    Msg.info("Cpu Loaded: "+Surf.getCpuModel().getName());
+    Msg.info("Cpu Loaded: "+Surf.getCpuModel().getClass().getName());

 
     /*  execute the simulation. */
     Msg.run();
 
     /*  execute the simulation. */
     Msg.run();

diff --git a/examples/java/surfCpuModel/surf_cpu_model.tesh b/examples/java/surfCpuModel/surf_cpu_model.tesh
index 4fceb61..990b8c6 100644 (file)
--- a/examples/java/surfCpuModel/surf_cpu_model.tesh
+++ b/examples/java/surfCpuModel/surf_cpu_model.tesh
@@ -10,7 +10,7 @@ $ java -classpath ${classpath:=.} surfCpuModel/TestCpuModel ${srcdir:=.}/../plat
 > [0.000000] [jmsg/INFO] New Cpu(Ginette, 4.8492E7, 1.0)
 > [0.000000] [jmsg/INFO] New Cpu(Bourassa, 4.8492E7, 1.0)
 > [0.000000] [jmsg/INFO] UpdateActionState of 0 actions
 > [0.000000] [jmsg/INFO] New Cpu(Ginette, 4.8492E7, 1.0)
 > [0.000000] [jmsg/INFO] New Cpu(Bourassa, 4.8492E7, 1.0)
 > [0.000000] [jmsg/INFO] UpdateActionState of 0 actions

-> [0.000000] [jmsg/INFO] Cpu Loaded: Cpu Constant
+> [0.000000] [jmsg/INFO] Cpu Loaded: surfCpuModel.CpuConstantModel

 > [Tremblay:surfCpuModel.Sender:(1) 0.000000] [jmsg/INFO] helloo!
 > [Jupiter:surfCpuModel.Receiver:(2) 0.000000] [jmsg/INFO] helloo!
 > [0.000000] [jmsg/INFO] Sleep action of duration -1.0 sleeping true
 > [Tremblay:surfCpuModel.Sender:(1) 0.000000] [jmsg/INFO] helloo!
 > [Jupiter:surfCpuModel.Receiver:(2) 0.000000] [jmsg/INFO] helloo!
 > [0.000000] [jmsg/INFO] Sleep action of duration -1.0 sleeping true

diff --git a/examples/java/surfPlugin/TracePlugin.java b/examples/java/surfPlugin/TracePlugin.java
index ff96518..e2329f5 100644 (file)
--- a/examples/java/surfPlugin/TracePlugin.java
+++ b/examples/java/surfPlugin/TracePlugin.java
@@ -41,7 +41,7 @@ public class TracePlugin extends Plugin {
 
   @Override
   public void cpuActionStateChangedCallback(CpuAction action, ActionState old, ActionState cur){
 
   @Override
   public void cpuActionStateChangedCallback(CpuAction action, ActionState old, ActionState cur){

-    Msg.info("Trace: CpuAction state changed "+action.getModel().getName());
+    Msg.info("Trace: CpuAction state changed");

   }
 
   @Override
   }
 
   @Override


@@ -61,7 +61,7 @@ public class TracePlugin extends Plugin {
 
   @Override
   public void networkActionStateChangedCallback(NetworkAction action, ActionState old, ActionState cur){
 
   @Override
   public void networkActionStateChangedCallback(NetworkAction action, ActionState old, ActionState cur){

-    Msg.info("Trace: NetworkAction state changed "+action.getModel().getName());
+    Msg.info("Trace: NetworkAction state changed");

   }
 
 }
   }
 
 }

diff --git a/examples/java/surfPlugin/surf_plugin.tesh b/examples/java/surfPlugin/surf_plugin.tesh
index b55f738..c28f77a 100644 (file)
--- a/examples/java/surfPlugin/surf_plugin.tesh
+++ b/examples/java/surfPlugin/surf_plugin.tesh
@@ -42,10 +42,10 @@ $ java -classpath ${classpath:=.} surfPlugin/TestPlugin ${srcdir:=.}/../platform
 > [Tremblay:surfPlugin.Sender:(1) 0.000000] [jmsg/INFO] sender time: 0.0
 > [Jupiter:surfPlugin.Receiver:(2) 0.000000] [jmsg/INFO] helloo!
 > [Jupiter:surfPlugin.Receiver:(2) 0.000000] [jmsg/INFO] try to get a task
 > [Tremblay:surfPlugin.Sender:(1) 0.000000] [jmsg/INFO] sender time: 0.0
 > [Jupiter:surfPlugin.Receiver:(2) 0.000000] [jmsg/INFO] helloo!
 > [Jupiter:surfPlugin.Receiver:(2) 0.000000] [jmsg/INFO] try to get a task

-> [0.019014] [jmsg/INFO] Trace: NetworkAction state changed network
+> [0.019014] [jmsg/INFO] Trace: NetworkAction state changed

 > [Jupiter:surfPlugin.Receiver:(2) 0.019014] [jmsg/INFO] Got at time 0.019014486310327584
 > [Tremblay:surfPlugin.Sender:(1) 0.019014] [jmsg/INFO] goodbye!
 > [Jupiter:surfPlugin.Receiver:(2) 0.019014] [jmsg/INFO] Got at time 0.019014486310327584
 > [Tremblay:surfPlugin.Sender:(1) 0.019014] [jmsg/INFO] goodbye!

-> [0.019146] [jmsg/INFO] Trace: CpuAction state changed cpu
+> [0.019146] [jmsg/INFO] Trace: CpuAction state changed

 > [Jupiter:surfPlugin.Receiver:(2) 0.019146] [jmsg/INFO] goodbye!
 > [0.019146] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
 > [0.019146] [jmsg/INFO] Trace: Cpu destructed Fafard
 > [Jupiter:surfPlugin.Receiver:(2) 0.019146] [jmsg/INFO] goodbye!
 > [0.019146] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
 > [0.019146] [jmsg/INFO] Trace: Cpu destructed Fafard

diff --git a/src/bindings/java/org/simgrid/surf/CpuModel.java b/src/bindings/java/org/simgrid/surf/CpuModel.java
index 28c239b..684a1c7 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/CpuModel.java
+++ b/src/bindings/java/org/simgrid/surf/CpuModel.java
@@ -55,13 +55,8 @@ public class CpuModel extends Model {
     SurfJNI.CpuModel_change_ownership(this, swigCPtr, true);
   }
 
     SurfJNI.CpuModel_change_ownership(this, swigCPtr, true);
   }
 

-  
-  /**
-    * CpuModel constructon
-    * @param name The name of the cpumodel
-    */
-  public CpuModel(String name) {
-    this(SurfJNI.new_CpuModel(name), true);
+  public CpuModel() {
+    this(SurfJNI.new_CpuModel(), true);

     SurfJNI.CpuModel_director_connect(this, swigCPtr, swigCMemOwn, true);
   }
 
     SurfJNI.CpuModel_director_connect(this, swigCPtr, swigCMemOwn, true);
   }
 

diff --git a/src/bindings/java/org/simgrid/surf/Model.java b/src/bindings/java/org/simgrid/surf/Model.java
index f0da148..6f4787f 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/Model.java
+++ b/src/bindings/java/org/simgrid/surf/Model.java
@@ -46,14 +46,6 @@ public class Model {
   }
 
   
   }
 
   

-  /**
-    * @return The name of the model
-    */
-  public String getName() {
-    return SurfJNI.Model_getName(swigCPtr, this);
-  }
-
-  

   /**
     * Share the resources between the actions
     * @param now the current time
   /**
     * Share the resources between the actions
     * @param now the current time

diff --git a/src/bindings/java/org/simgrid/surf/SurfJNI.java b/src/bindings/java/org/simgrid/surf/SurfJNI.java
index e4a8afd..aad944c 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/SurfJNI.java
+++ b/src/bindings/java/org/simgrid/surf/SurfJNI.java
@@ -72,7 +72,6 @@ public class SurfJNI {
   public final static native void delete_TmgrTrace(long jarg1);
   public final static native long TmgrTraceEvent_getIdx(long jarg1, TmgrTraceEvent jarg1_);
   public final static native void delete_TmgrTraceEvent(long jarg1);
   public final static native void delete_TmgrTrace(long jarg1);
   public final static native long TmgrTraceEvent_getIdx(long jarg1, TmgrTraceEvent jarg1_);
   public final static native void delete_TmgrTraceEvent(long jarg1);

-  public final static native String Model_getName(long jarg1, Model jarg1_);

   public final static native double Model_shareResources(long jarg1, Model jarg1_, double jarg2);
   public final static native double Model_shareResourcesLazy(long jarg1, Model jarg1_, double jarg2);
   public final static native double Model_shareResourcesFull(long jarg1, Model jarg1_, double jarg2);
   public final static native double Model_shareResources(long jarg1, Model jarg1_, double jarg2);
   public final static native double Model_shareResourcesLazy(long jarg1, Model jarg1_, double jarg2);
   public final static native double Model_shareResourcesFull(long jarg1, Model jarg1_, double jarg2);


@@ -82,7 +81,7 @@ public class SurfJNI {
   public final static native long Model_getRunningActionSet(long jarg1, Model jarg1_);
   public final static native void Model_addTraces(long jarg1, Model jarg1_);
   public final static native void delete_Model(long jarg1);
   public final static native long Model_getRunningActionSet(long jarg1, Model jarg1_);
   public final static native void Model_addTraces(long jarg1, Model jarg1_);
   public final static native void delete_Model(long jarg1);

-  public final static native long new_CpuModel(String jarg1);
+  public final static native long new_CpuModel();

   public final static native void delete_CpuModel(long jarg1);
   public final static native long CpuModel_createCpu(long jarg1, CpuModel jarg1_, String jarg2, double[] jarg3, int jarg4, double jarg5, long jarg6, TmgrTrace jarg6_, int jarg7, int jarg8, long jarg9, TmgrTrace jarg9_, long jarg10, XbtDict jarg10_);
   public final static native void CpuModel_director_connect(CpuModel obj, long cptr, boolean mem_own, boolean weak_global);
   public final static native void delete_CpuModel(long jarg1);
   public final static native long CpuModel_createCpu(long jarg1, CpuModel jarg1_, String jarg2, double[] jarg3, int jarg4, double jarg5, long jarg6, TmgrTrace jarg6_, int jarg7, int jarg8, long jarg9, TmgrTrace jarg9_, long jarg10, XbtDict jarg10_);
   public final static native void CpuModel_director_connect(CpuModel obj, long cptr, boolean mem_own, boolean weak_global);

diff --git a/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx b/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
index 4c0dfa4..c0feca4 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
+++ b/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
@@ -1348,7 +1348,7 @@ void SwigDirector_Plugin::swig_connect_director(JNIEnv *jenv, jobject jself, jcl
 }
 
 
 }
 
 

-SwigDirector_CpuModel::SwigDirector_CpuModel(JNIEnv *jenv, char const *name) : CpuModel(name), Swig::Director(jenv) {
+SwigDirector_CpuModel::SwigDirector_CpuModel(JNIEnv *jenv) : CpuModel(), Swig::Director(jenv) {

 }
 
 double SwigDirector_CpuModel::shareResources(double now) {
 }
 
 double SwigDirector_CpuModel::shareResources(double now) {


@@ -2835,21 +2835,6 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_delete_1TmgrTraceEvent(JNI
 }
 
 
 }
 
 

-SWIGEXPORT jstring JNICALL Java_org_simgrid_surf_SurfJNI_Model_1getName(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  Model *arg1 = (Model *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(Model **)&jarg1; 
-  result = (char *)(arg1)->getName();
-  if (result) jresult = jenv->NewStringUTF((const char *)result);
-  return jresult;
-}
-
-

 SWIGEXPORT jdouble JNICALL Java_org_simgrid_surf_SurfJNI_Model_1shareResources(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2) {
   jdouble jresult = 0 ;
   Model *arg1 = (Model *) 0 ;
 SWIGEXPORT jdouble JNICALL Java_org_simgrid_surf_SurfJNI_Model_1shareResources(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2) {
   jdouble jresult = 0 ;
   Model *arg1 = (Model *) 0 ;


@@ -2982,23 +2967,14 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_delete_1Model(JNIEnv *jenv
 }
 
 
 }
 
 

-SWIGEXPORT jlong JNICALL Java_org_simgrid_surf_SurfJNI_new_1CpuModel(JNIEnv *jenv, jclass jcls, jstring jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_simgrid_surf_SurfJNI_new_1CpuModel(JNIEnv *jenv, jclass jcls) {

   jlong jresult = 0 ;
   jlong jresult = 0 ;

-  char *arg1 = (char *) 0 ;

   CpuModel *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   CpuModel *result = 0 ;
   
   (void)jenv;
   (void)jcls;

-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (CpuModel *)new SwigDirector_CpuModel(jenv,(char const *)arg1);
+  result = (CpuModel *)new SwigDirector_CpuModel(jenv);

   *(CpuModel **)&jresult = result; 
   *(CpuModel **)&jresult = result; 

-  {
-    
-  }

   return jresult;
 }
 
   return jresult;
 }
 

diff --git a/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h b/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h
index a21ce12..53d5d17 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h
+++ b/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h
@@ -38,7 +38,7 @@ class SwigDirector_CpuModel : public CpuModel, public Swig::Director {
 
 public:
     void swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global);
 
 public:
     void swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global);

-    SwigDirector_CpuModel(JNIEnv *jenv, char const *name);
+    SwigDirector_CpuModel(JNIEnv *jenv);

     virtual double shareResources(double now);
     virtual double shareResourcesLazy(double now);
     virtual double shareResourcesFull(double now);
     virtual double shareResources(double now);
     virtual double shareResourcesLazy(double now);
     virtual double shareResourcesFull(double now);

diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i
index 68fc94d..7e0c774 100644 (file)
--- a/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@ -236,8 +236,8 @@ struct tmgr_trace_event {
 %nodefaultctor Model;
 class Model {
 public:
 %nodefaultctor Model;
 class Model {
 public:

-  Model(const char *name);
-  const char *getName();
+  Model();
+  

   virtual double shareResources(double now);
   virtual double shareResourcesLazy(double now);
   virtual double shareResourcesFull(double now);
   virtual double shareResources(double now);
   virtual double shareResourcesLazy(double now);
   virtual double shareResourcesFull(double now);


@@ -254,7 +254,7 @@ public:
 %feature("director") CpuModel;
 class CpuModel : public Model {
 public:
 %feature("director") CpuModel;
 class CpuModel : public Model {
 public:

-  CpuModel(const char *name);
+  CpuModel();

   virtual ~CpuModel();
   virtual Cpu *createCpu(const char *name, DoubleDynar power_peak,
                               int pstate, double power_scale,
   virtual ~CpuModel();
   virtual Cpu *createCpu(const char *name, DoubleDynar power_peak,
                               int pstate, double power_scale,

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 617e2da..d7a4faf 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -39,7 +39,7 @@ void surf_cpu_model_init_Cas01()
   xbt_dynar_push(model_list, &model_vm);
 }
 
   xbt_dynar_push(model_list, &model_vm);
 }
 

-CpuCas01Model::CpuCas01Model() : CpuModel("cpu")
+CpuCas01Model::CpuCas01Model() : CpuModel()

 {
   char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
   int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update");
 {
   char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
   int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update");

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index ecbf8b0..595ff81 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -61,12 +61,8 @@ XBT_PUBLIC(void) cpu_add_traces();
  */
 XBT_PUBLIC_CLASS CpuModel : public Model {
 public:
  */
 XBT_PUBLIC_CLASS CpuModel : public Model {
 public:

-  /**
-   * @brief CpuModel constructor
-   *
-   * @param name The name of the model
-   */
-  CpuModel(const char *name) : Model(name) {};
+  /** @brief Constructor */
+  CpuModel() : Model() {};

 
   /**
    * @brief Create a Cpu
 
   /**
    * @brief Create a Cpu

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 9841ec9..65bfcca 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -404,7 +404,7 @@ void surf_cpu_model_init_ti()
   xbt_dynar_push(model_list, &model_vm);
 }
 
   xbt_dynar_push(model_list, &model_vm);
 }
 

-CpuTiModel::CpuTiModel() : CpuModel("cpu_ti")
+CpuTiModel::CpuTiModel() : CpuModel()

 {
   p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList();
 
 {
   p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList();
 

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 2932677..5c98156 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -46,14 +46,6 @@ void surf_host_model_init_compound()
   sg_platf_host_add_cb(host_parse_init);
 }
 
   sg_platf_host_add_cb(host_parse_init);
 }
 

-HostCLM03Model::HostCLM03Model()
- : HostModel("Host CLM03")
-{
-}
-
-HostCLM03Model::~HostCLM03Model()
-{}
-

 Host *HostCLM03Model::createHost(const char *name){
   sg_host_t sg_host = sg_host_by_name(name);
   Host *host = new HostCLM03(surf_host_model, name, NULL,
 Host *HostCLM03Model::createHost(const char *name){
   sg_host_t sg_host = sg_host_by_name(name);
   Host *host = new HostCLM03(surf_host_model, name, NULL,

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index 3a935eb..d786d92 100644 (file)
--- a/src/surf/host_clm03.hpp
+++ b/src/surf/host_clm03.hpp
@@ -26,8 +26,8 @@ class HostCLM03Action;
 
 class HostCLM03Model : public HostModel {
 public:
 
 class HostCLM03Model : public HostModel {
 public:

-  HostCLM03Model();
-  ~HostCLM03Model();
+  HostCLM03Model(): HostModel(){}
+  ~HostCLM03Model() {}

   Host *createHost(const char *name);
   double shareResources(double now);
 
   Host *createHost(const char *name);
   double shareResources(double now);
 

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 9433fe7..5c6903f 100644 (file)
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -39,16 +39,6 @@ void host_add_traces(){
 /*********
  * Model *
  *********/
 /*********
  * Model *
  *********/

-HostModel::HostModel(const char *name)
- : Model(name)
-{}
-
-HostModel::HostModel()
-: Model("Host") {}
-
-HostModel::~HostModel() {
-}
-

 /* Each VM has a dummy CPU action on the PM layer. This CPU action works as the
  * constraint (capacity) of the VM in the PM layer. If the VM does not have any
  * active task, the dummy CPU action must be deactivated, so that the VM does
 /* Each VM has a dummy CPU action on the PM layer. This CPU action works as the
  * constraint (capacity) of the VM in the PM layer. If the VM does not have any
  * active task, the dummy CPU action must be deactivated, so that the VM does

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index 78e7f5a..cfbce47 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -60,14 +60,8 @@ XBT_PUBLIC(void) host_add_traces();
  */
 class HostModel : public Model {
 public:
  */
 class HostModel : public Model {
 public:

-  /** @brief Constructor */
-  HostModel(const char *name);
-
-  /** @brief Constructor */
-  HostModel();
-
-  /** @brief Destructor */
-  ~HostModel();
+  HostModel() : Model() {}
+  ~HostModel() {}

 
   virtual Host *createHost(const char *name)=0;
   void addTraces(){DIE_IMPOSSIBLE;}
 
   virtual Host *createHost(const char *name)=0;
   void addTraces(){DIE_IMPOSSIBLE;}

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index ec93090..1203758 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -45,7 +45,7 @@ void surf_host_model_init_ptask_L07(void)
 }
 
 
 }
 
 

-HostL07Model::HostL07Model() : HostModel("Host ptask_L07") {
+HostL07Model::HostL07Model() : HostModel() {

   if (!ptask_maxmin_system)
        ptask_maxmin_system = lmm_system_new(1);
   surf_host_model = NULL;
   if (!ptask_maxmin_system)
        ptask_maxmin_system = lmm_system_new(1);
   surf_host_model = NULL;

diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp
index 33a957d..ac3bf98 100644 (file)
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -51,7 +51,7 @@ public:
 
 class CpuL07Model : public CpuModel {
 public:
 
 class CpuL07Model : public CpuModel {
 public:

-  CpuL07Model() : CpuModel("cpuL07") {};
+  CpuL07Model() : CpuModel() {};

   ~CpuL07Model() {surf_cpu_model_pm = NULL;};
   Cpu *createCpu(const char *name,  xbt_dynar_t powerPeak,
                           int pstate, double power_scale,
   ~CpuL07Model() {surf_cpu_model_pm = NULL;};
   Cpu *createCpu(const char *name,  xbt_dynar_t powerPeak,
                           int pstate, double power_scale,

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index e9c08ba..1ce6db8 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -161,7 +161,8 @@ void surf_network_model_init_Vegas(void)
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 

-void NetworkCm02Model::initialize()
+NetworkCm02Model::NetworkCm02Model()
+       :NetworkModel()

 {
   char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
   int select =
 {
   char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
   int select =

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 3007837..7edb83f 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -30,16 +30,11 @@ class NetworkCm02Model : public NetworkModel {
 private:
   void initialize();
 public:
 private:
   void initialize();
 public:

-  NetworkCm02Model(int /*i*/) : NetworkModel("network") {
+  NetworkCm02Model(int /*i*/) : NetworkModel() {

        f_networkSolve = lmm_solve;
        m_haveGap = false;
   };//FIXME: add network clean interface
        f_networkSolve = lmm_solve;
        m_haveGap = false;
   };//FIXME: add network clean interface

-  NetworkCm02Model(const char *name) : NetworkModel(name) {
-    this->initialize();
-  }
-  NetworkCm02Model() : NetworkModel("network") {
-    this->initialize();
-  }
+  NetworkCm02Model();

   ~NetworkCm02Model() {
   }
   Link* createLink(const char *name,
   ~NetworkCm02Model() {
   }
   Link* createLink(const char *name,

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 0705b97..2b0f0e0 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -21,14 +21,13 @@ class NetworkConstantAction;
 class NetworkConstantModel : public NetworkCm02Model {
 public:
   NetworkConstantModel()
 class NetworkConstantModel : public NetworkCm02Model {
 public:
   NetworkConstantModel()

-  : NetworkCm02Model("constant time network")
+  : NetworkCm02Model()

   {
     p_updateMechanism = UM_UNDEFINED;
   };
   double shareResources(double now);
   void updateActionsState(double now, double delta);
   {
     p_updateMechanism = UM_UNDEFINED;
   };
   double shareResources(double now);
   void updateActionsState(double now, double delta);

-  Action *communicate(RoutingEdge *src, RoutingEdge *dst,
-                                          double size, double rate);
+  Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);

   void gapRemove(Action *action);
 };
 
   void gapRemove(Action *action);
 };
 

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 9858267..e2bd2b4 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -72,12 +72,9 @@ XBT_PUBLIC(void) net_add_traces();
 class NetworkModel : public Model {
 public:
   /** @brief Constructor */
 class NetworkModel : public Model {
 public:
   /** @brief Constructor */

-  NetworkModel() : Model("network") { }
+  NetworkModel() : Model() { }

 
 

-  /** @brief Constructor */
-  NetworkModel(const char *name) : Model(name) { }
-
-  /** @brief The destructor of the NetworkModel */
+  /** @brief Destructor */

   ~NetworkModel() {
        if (p_maxminSystem)
          lmm_system_free(p_maxminSystem);
   ~NetworkModel() {
        if (p_maxminSystem)
          lmm_system_free(p_maxminSystem);

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 4e8cccc..1de003d 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -273,7 +273,7 @@ void surf_network_model_init_NS3()
   xbt_dynar_push(model_list, &surf_network_model);
 }
 
   xbt_dynar_push(model_list, &surf_network_model);
 }
 

-NetworkNS3Model::NetworkNS3Model() : NetworkModel("network NS3") {
+NetworkNS3Model::NetworkNS3Model() : NetworkModel() {

   if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
     xbt_die("Impossible to initialize NS3 interface");
   }
   if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
     xbt_die("Impossible to initialize NS3 interface");
   }

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 996c771..d0078f1 100644 (file)
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -33,7 +33,9 @@ surf_callback(void, StorageAction*, e_surf_action_state_t, e_surf_action_state_t
  * Model *
  *********/
 
  * Model *
  *********/
 

-StorageModel::StorageModel() : Model("Storage") {
+StorageModel::StorageModel()
+       : Model()
+{

   p_storageList = NULL;
 }
 
   p_storageList = NULL;
 }
 

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 715a74e..0ed0576 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -435,9 +435,8 @@ void surf_exit(void)
  * Model *
  *********/
 
  * Model *
  *********/
 

-Model::Model(const char *name)
+Model::Model()

   : p_maxminSystem(NULL)
   : p_maxminSystem(NULL)

-  , p_name(name)

 {
   p_readyActionSet = new ActionList();
   p_runningActionSet = new ActionList();
 {
   p_readyActionSet = new ActionList();
   p_runningActionSet = new ActionList();

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index f9ca6db..e8aa31d 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -107,27 +107,13 @@ XBT_PUBLIC_DATA(xbt_dynar_t) model_list;
  */
 XBT_PUBLIC_CLASS Model {
 public:
  */
 XBT_PUBLIC_CLASS Model {
 public:

-  /**
-   * @brief Model constructor
-   *
-   * @param name the name of the model
-   */
-  Model(const char *name);
-
-  /**
-   * @brief Model destructor
-   */
+  /** @brief Constructor */
+  Model();
+  /** @brief Destructor */

   virtual ~Model();
 
   virtual void addTraces() =0;
 
   virtual ~Model();
 
   virtual void addTraces() =0;
 

-  /**
-   * @brief Get the name of the current Model
-   *
-   * @return The name of the current Model
-   */
-  const char *getName() {return p_name;}
-

   /**
    * @brief Get the set of [actions](@ref Action) in *ready* state
    *
   /**
    * @brief Get the set of [actions](@ref Action) in *ready* state
    *


@@ -226,8 +212,6 @@ protected:
   xbt_heap_t p_actionHeap;
 
 private:
   xbt_heap_t p_actionHeap;
 
 private:

-  const char *p_name;
-

   ActionListPtr p_readyActionSet; /**< Actions in state SURF_ACTION_READY */
   ActionListPtr p_runningActionSet; /**< Actions in state SURF_ACTION_RUNNING */
   ActionListPtr p_failedActionSet; /**< Actions in state SURF_ACTION_FAILED */
   ActionListPtr p_readyActionSet; /**< Actions in state SURF_ACTION_READY */
   ActionListPtr p_runningActionSet; /**< Actions in state SURF_ACTION_RUNNING */
   ActionListPtr p_failedActionSet; /**< Actions in state SURF_ACTION_FAILED */

diff --git a/src/surf/vm_interface.cpp b/src/surf/vm_interface.cpp
index a76652d..872bdd3 100644 (file)
--- a/src/surf/vm_interface.cpp
+++ b/src/surf/vm_interface.cpp
@@ -23,8 +23,6 @@ surf_callback(void, VM*) VMStateChangedCallbacks;
  * Model *
  *********/
 
  * Model *
  *********/
 

-VMModel::VMModel() : HostModel("Virtual Machine") {}
-

 VMModel::vm_list_t VMModel::ws_vms;
 
 /************
 VMModel::vm_list_t VMModel::ws_vms;
 
 /************

diff --git a/src/surf/vm_interface.hpp b/src/surf/vm_interface.hpp
index e221713..c050250 100644 (file)
--- a/src/surf/vm_interface.hpp
+++ b/src/surf/vm_interface.hpp
@@ -47,7 +47,7 @@ extern surf_callback(void, VM*) VMStateChangedCallbacks;
  */
 class VMModel : public HostModel {
 public:
  */
 class VMModel : public HostModel {
 public:

-  VMModel();
+  VMModel() :HostModel(){}

   ~VMModel(){};
 
   Host *createHost(const char *name){DIE_IMPOSSIBLE;}
   ~VMModel(){};
 
   Host *createHost(const char *name){DIE_IMPOSSIBLE;}