Merge commit '045db1657e870c721be490b411868f4181a12ced' into surf++

[simgrid.git] / src / surf / workstation_ptask_L07.cpp

diff --git a/src/surf/workstation_ptask_L07.cpp b/src/surf/workstation_ptask_L07.cpp
index bfe7b5b..507d25e 100644 (file)
--- a/src/surf/workstation_ptask_L07.cpp
+++ b/src/surf/workstation_ptask_L07.cpp
@@ -17,14 +17,27 @@ lmm_system_t ptask_maxmin_system = NULL;
 WorkstationL07Model::WorkstationL07Model() : WorkstationModel("Workstation ptask_L07") {
   if (!ptask_maxmin_system)
        ptask_maxmin_system = lmm_system_new(1);
+  surf_workstation_model = NULL;
+  surf_network_model = new NetworkL07Model();
+  surf_cpu_model = new CpuL07Model();
   routing_model_create(p_networkModel->createResource("__loopback__",
                                                          498000000, NULL,
                                                          0.000015, NULL,
                                                          SURF_RESOURCE_ON, NULL,
                                                          SURF_LINK_FATPIPE, NULL));
+}
+
+WorkstationL07Model::~WorkstationL07Model() {
+  xbt_dict_free(&ptask_parallel_task_link_set);
+
+  delete surf_cpu_model;
+  delete surf_network_model;
+  ptask_host_count = 0;
 
-   surf_network_model = new NetworkL07Model();
-   surf_cpu_model = new CpuL07Model();
+  if (ptask_maxmin_system) {
+    lmm_system_free(ptask_maxmin_system);
+    ptask_maxmin_system = NULL;
+  }
 }
 
 double WorkstationL07Model::shareResources(double now)
@@ -151,16 +164,16 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb,
 
         routing_platf->getRouteAndLatency(dynamic_cast<WorkstationL07Ptr>(
                                                   static_cast<ResourcePtr>(
-                                                   surf_workstation_resource_priv(workstation_list[i])))->p_netElm,
+                                                   workstation_list[i]))->p_netElm,
                                                  dynamic_cast<WorkstationL07Ptr>(
                                                   static_cast<ResourcePtr>(
-                                                       surf_workstation_resource_priv(workstation_list[j])))->p_netElm,
+                                                       workstation_list[j]))->p_netElm,
                                                  &route,
                                                  &lat);
         latency = MAX(latency, lat);
 
         xbt_dynar_foreach(route, cpt, _link) {
-           link = dynamic_cast<LinkL07Ptr>(static_cast<NetworkCm02LinkPtr>(_link));
+           link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(_link));
            xbt_dict_set(ptask_parallel_task_link_set, link->m_name, link, NULL);
         }
       }
@@ -196,28 +209,26 @@ ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb,
   for (i = 0; i < workstation_nb; i++)
     lmm_expand(ptask_maxmin_system,
               static_cast<CpuLmmPtr>(dynamic_cast<WorkstationL07Ptr>(
-                                          static_cast<ResourcePtr>(
-                                           surf_workstation_resource_priv(workstation_list[i])))->p_cpu)->p_constraint,
+                                          static_cast<ResourcePtr>(workstation_list[i]))->p_cpu)->p_constraint,
                action->p_variable, computation_amount[i]);
 
   for (i = 0; i < workstation_nb; i++) {
     for (j = 0; j < workstation_nb; j++) {
       void *_link;
       LinkL07Ptr link;
+
       xbt_dynar_t route=NULL;
       if (communication_amount[i * workstation_nb + j] == 0.0)
         continue;
 
       routing_platf->getRouteAndLatency(dynamic_cast<WorkstationL07Ptr>(
-                                         static_cast<ResourcePtr>(
-                                          surf_workstation_resource_priv(workstation_list[i])))->p_netElm,
+                                         static_cast<ResourcePtr>(workstation_list[i]))->p_netElm,
                                         dynamic_cast<WorkstationL07Ptr>(
-                                         static_cast<ResourcePtr>(
-                                          surf_workstation_resource_priv(workstation_list[j])))->p_netElm,
+                                         static_cast<ResourcePtr>(workstation_list[j]))->p_netElm,
                                            &route, NULL);
 
       xbt_dynar_foreach(route, cpt, _link) {
-        link = static_cast<LinkL07Ptr>(static_cast<NetworkCm02LinkPtr>(_link));
+        link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(_link));
         lmm_expand_add(ptask_maxmin_system, link->p_constraint,
                        action->p_variable,
                        communication_amount[i * workstation_nb + j]);
@@ -352,7 +363,7 @@ ResourcePtr NetworkL07Model::createResource(const char *name,
   if (policy == SURF_LINK_FATPIPE)
     lmm_constraint_shared(nw_link->p_constraint);
 
-  xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, static_cast<NetworkCm02LinkPtr>(nw_link));
+  xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, static_cast<ResourcePtr>(nw_link));
   return nw_link;
 }
 
@@ -367,7 +378,10 @@ void WorkstationL07Model::addTraces()
   /* Connect traces relative to cpu */
   xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
-    CpuL07Ptr host = (CpuL07Ptr) surf_workstation_resource_priv(surf_workstation_resource_by_name(elm));
+    CpuL07Ptr host = dynamic_cast<CpuL07Ptr>(
+                          static_cast<ResourcePtr>(
+                            surf_cpu_resource_priv(
+                              surf_cpu_resource_by_name(elm))));
 
     xbt_assert(host, "Host %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
@@ -377,7 +391,10 @@ void WorkstationL07Model::addTraces()
 
   xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
-    CpuL07Ptr host = (CpuL07Ptr) surf_workstation_resource_priv(surf_workstation_resource_by_name(elm));
+    CpuL07Ptr host = dynamic_cast<CpuL07Ptr>(
+                          static_cast<ResourcePtr>(
+                            surf_cpu_resource_priv(
+                              surf_cpu_resource_by_name(elm))));
 
     xbt_assert(host, "Host %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
@@ -388,7 +405,7 @@ void WorkstationL07Model::addTraces()
   /* Connect traces relative to network */
   xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
-    LinkL07Ptr link = (LinkL07Ptr) xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
+    LinkL07Ptr link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)));
 
     xbt_assert(link, "Link %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
@@ -398,7 +415,7 @@ void WorkstationL07Model::addTraces()
 
   xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
-    LinkL07Ptr link = (LinkL07Ptr) xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
+    LinkL07Ptr link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)));
 
     xbt_assert(link, "Link %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
@@ -408,7 +425,7 @@ void WorkstationL07Model::addTraces()
 
   xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
-    LinkL07Ptr link = (LinkL07Ptr) xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
+    LinkL07Ptr link = dynamic_cast<LinkL07Ptr>(static_cast<ResourcePtr>(xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)));
 
     xbt_assert(link, "Link %s undefined", elm);
     xbt_assert(trace, "Trace %s undefined", trace_name);
@@ -426,6 +443,29 @@ WorkstationL07::WorkstationL07(WorkstationModelPtr model, const char* name, xbt_
 {
 }
 
+double WorkstationL07::getPowerPeakAt(int pstate_index)
+{
+       XBT_DEBUG("[ws_get_power_peak_at] Not implemented for workstation_ptask_L07");
+       return 0.0;
+}
+
+int WorkstationL07::getNbPstates()
+{
+       XBT_DEBUG("[ws_get_nb_pstates] Not implemented for workstation_ptask_L07");
+       return 0.0;
+}
+
+void WorkstationL07::setPowerPeakAt(int pstate_index)
+{
+       XBT_DEBUG("[ws_set_power_peak_at] Not implemented for workstation_ptask_L07");
+}
+
+double WorkstationL07::getConsumedEnergy()
+{
+       XBT_DEBUG("[ws_get_consumed_energy] Not implemented for workstation_ptask_L07");
+       return 0.0;
+}
+
 CpuL07::CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t props)
  : Resource(model, name, props), CpuLmm(model, name, props) {
 
@@ -436,7 +476,11 @@ LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props)
 
 }
 
-bool WorkstationL07::isUsed(){
+bool CpuL07::isUsed(){
+  return lmm_constraint_used(ptask_maxmin_system, p_constraint);
+}
+
+bool LinkL07::isUsed(){
   return lmm_constraint_used(ptask_maxmin_system, p_constraint);
 }
 
@@ -585,11 +629,9 @@ void WorkstationL07ActionLmm::updateBound()
       if (p_communicationAmount[i * m_workstationNb + j] > 0) {
         double lat = 0.0;
         routing_platf->getRouteAndLatency(dynamic_cast<WorkstationL07Ptr>(
-                                           static_cast<ResourcePtr>(
-                                            surf_workstation_resource_priv(p_workstationList[i])))->p_netElm,
+                                           static_cast<ResourcePtr>(((void**)p_workstationList)[i]))->p_netElm,
                                           dynamic_cast<WorkstationL07Ptr>(
-                                           static_cast<ResourcePtr>(
-                                                           surf_workstation_resource_priv(p_workstationList[j])))->p_netElm,
+                                           static_cast<ResourcePtr>(((void**)p_workstationList)[j]))->p_netElm,
                                                          &route, &lat);
 
         lat_current = MAX(lat_current, lat * p_communicationAmount[i * m_workstationNb + j]);
@@ -721,9 +763,12 @@ static void ptask_finalize(void)
 
 static void ptask_parse_workstation_init(sg_platf_host_cbarg_t host)
 {
+  double power_peak = xbt_dynar_get_as(host->power_peak, host->pstate, double);
+  //cpu->power_peak = power_peak;
+  xbt_dynar_free(&(host->power_peak));  /* kill memory leak */
   static_cast<WorkstationL07ModelPtr>(surf_workstation_model)->createResource(
       host->id,
-      host->power_peak,
+      power_peak,
       host->power_scale,
       host->power_trace,
       host->initial_state,
@@ -733,9 +778,10 @@ static void ptask_parse_workstation_init(sg_platf_host_cbarg_t host)
 
 static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host)
 {
-       static_cast<CpuL07ModelPtr>(surf_cpu_model)->createResource(
+  double power_peak = xbt_dynar_get_as(host->power_peak, host->pstate, double);
+  static_cast<CpuL07ModelPtr>(surf_cpu_model)->createResource(
       host->id,
-      host->power_peak,
+      power_peak,
       host->power_scale,
       host->power_trace,
       host->initial_state,