Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
leak--
[simgrid.git] / src / surf / workstation_clm03.cpp
index 7b45c6a..f149e7f 100644 (file)
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. 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. */
+
 #include "workstation_clm03.hpp"
 #include "vm_workstation_interface.hpp"
 #include "cpu_cas01.hpp"
@@ -9,10 +15,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_workstation);
  * CallBacks *
  *************/
 
-static void workstation_new(sg_platf_host_cbarg_t host){
-  reinterpret_cast<WorkstationCLM03ModelPtr>(surf_workstation_model)->createResource(host->id);
-}
-
 /*********
  * Model *
  *********/
@@ -25,10 +27,10 @@ void surf_workstation_model_init_current_default(void)
   surf_network_model_init_LegrandVelho();
   surf_workstation_model->p_cpuModel = surf_cpu_model_pm;
 
-  ModelPtr model = static_cast<ModelPtr>(surf_workstation_model);
+  ModelPtr model = surf_workstation_model;
   xbt_dynar_push(model_list, &model);
   xbt_dynar_push(model_list_invoke, &model);
-  sg_platf_host_add_cb(workstation_new);
+  sg_platf_host_add_cb(workstation_parse_init);
 }
 
 void surf_workstation_model_init_compound()
@@ -38,17 +40,12 @@ void surf_workstation_model_init_compound()
   xbt_assert(surf_network_model, "No network model defined yet!");
   surf_workstation_model = new WorkstationCLM03Model();
 
-  ModelPtr model = static_cast<ModelPtr>(surf_workstation_model);
+  ModelPtr model = surf_workstation_model;
   xbt_dynar_push(model_list, &model);
   xbt_dynar_push(model_list_invoke, &model);
-  sg_platf_host_add_cb(workstation_new);
+  sg_platf_host_add_cb(workstation_parse_init);
 }
 
-WorkstationCLM03Model::WorkstationCLM03Model(const char *name)
- : WorkstationModel(name)
-{}
-
-
 WorkstationCLM03Model::WorkstationCLM03Model()
  : WorkstationModel("Workstation")
 {
@@ -57,18 +54,13 @@ WorkstationCLM03Model::WorkstationCLM03Model()
 WorkstationCLM03Model::~WorkstationCLM03Model()
 {}
 
-void WorkstationCLM03Model::parseInit(sg_platf_host_cbarg_t host){
-  createResource(host->id);
-}
-
-WorkstationPtr WorkstationCLM03Model::createResource(const char *name){
-
-  WorkstationPtr workstation = new WorkstationCLM03Lmm(surf_workstation_model, name, NULL,
+WorkstationPtr WorkstationCLM03Model::createWorkstation(const char *name){
+  WorkstationPtr workstation = new WorkstationCLM03(surf_workstation_model, name, NULL,
                  (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
                  (RoutingEdgePtr)xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL),
-                 dynamic_cast<CpuPtr>(static_cast<ResourcePtr>(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL))));
+                 static_cast<CpuPtr>(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL)));
   XBT_DEBUG("Create workstation %s with %ld mounted disks", name, xbt_dynar_length(workstation->p_storage));
-  xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, static_cast<ResourcePtr>(workstation));
+  xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation);
   return workstation;
 }
 
@@ -76,7 +68,7 @@ double WorkstationCLM03Model::shareResources(double now){
   adjustWeightOfDummyCpuActions();
 
   double min_by_cpu = p_cpuModel->shareResources(now);
-  double min_by_net = surf_network_model->shareResources(now);
+  double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;
   double min_by_sto = -1;
   if (p_cpuModel == surf_cpu_model_pm)
        min_by_sto = surf_storage_model->shareResources(now);
@@ -106,13 +98,15 @@ ActionPtr WorkstationCLM03Model::executeParallelTask(int workstation_nb,
                                         double *communication_amount,
                                         double rate){
 #define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
+  ActionPtr action =NULL;
   if ((workstation_nb == 1)
-      && (cost_or_zero(communication_amount, 0) == 0.0))
-    return ((WorkstationCLM03LmmPtr)workstation_list[0])->execute(computation_amount[0]);
-  else if ((workstation_nb == 1)
-           && (cost_or_zero(computation_amount, 0) == 0.0))
-    return communicate((WorkstationCLM03LmmPtr)workstation_list[0], (WorkstationCLM03LmmPtr)workstation_list[0],communication_amount[0], rate);
-  else if ((workstation_nb == 2)
+      && (cost_or_zero(communication_amount, 0) == 0.0)){
+    action = ((WorkstationCLM03Ptr)workstation_list[0])->execute(computation_amount[0]);
+  } else if ((workstation_nb == 1)
+           && (cost_or_zero(computation_amount, 0) == 0.0)) {
+    action = communicate((WorkstationCLM03Ptr)workstation_list[0],
+        (WorkstationCLM03Ptr)workstation_list[0],communication_amount[0], rate);
+  } else if ((workstation_nb == 2)
              && (cost_or_zero(computation_amount, 0) == 0.0)
              && (cost_or_zero(computation_amount, 1) == 0.0)) {
     int i,nb = 0;
@@ -124,20 +118,15 @@ ActionPtr WorkstationCLM03Model::executeParallelTask(int workstation_nb,
         value = cost_or_zero(communication_amount, i);
       }
     }
-    if (nb == 1)
-      return communicate((WorkstationCLM03LmmPtr)workstation_list[0], (WorkstationCLM03LmmPtr)workstation_list[1],value, rate);
-  }
+    if (nb == 1){
+      action = communicate((WorkstationCLM03Ptr)workstation_list[0],
+          (WorkstationCLM03Ptr)workstation_list[1],value, rate);
+    }
+  } else
+    THROW_UNIMPLEMENTED;      /* This model does not implement parallel tasks */
 #undef cost_or_zero
-
-  THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
-  return NULL;
-}
-
-/* returns an array of network_link_CM02_t */
-xbt_dynar_t WorkstationCLM03Model::getRoute(WorkstationPtr src, WorkstationPtr dst)
-{
-  XBT_DEBUG("ws_get_route");
-  return surf_network_model->getRoute(src->p_netElm, dst->p_netElm);
+  xbt_free((WorkstationCLM03Ptr)workstation_list);
+  return action;
 }
 
 ActionPtr WorkstationCLM03Model::communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate){
@@ -149,39 +138,30 @@ ActionPtr WorkstationCLM03Model::communicate(WorkstationPtr src, WorkstationPtr
 /************
  * Resource *
  ************/
-WorkstationCLM03Lmm::WorkstationCLM03Lmm(WorkstationModelPtr model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu)
-  : Resource(model, name, properties), Workstation(storage, netElm, cpu) {}
+WorkstationCLM03::WorkstationCLM03(WorkstationModelPtr model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu)
+  : Workstation(model, name, properties, storage, netElm, cpu) {}
 
-bool WorkstationCLM03Lmm::isUsed(){
+bool WorkstationCLM03::isUsed(){
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
   return -1;
 }
 
-void WorkstationCLM03Lmm::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/){
+void WorkstationCLM03::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/){
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
 }
 
-ActionPtr WorkstationCLM03Lmm::execute(double size) {
+ActionPtr WorkstationCLM03::execute(double size) {
   return p_cpu->execute(size);
 }
 
-ActionPtr WorkstationCLM03Lmm::sleep(double duration) {
+ActionPtr WorkstationCLM03::sleep(double duration) {
   return p_cpu->sleep(duration);
 }
 
-e_surf_resource_state_t WorkstationCLM03Lmm::getState() {
+e_surf_resource_state_t WorkstationCLM03::getState() {
   return p_cpu->getState();
 }
 
-
-
-
-
-
-
-
-
-
 /**********
  * Action *
  **********/