Merge branch 'master' into mc-process

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

diff --git a/src/surf/vm_workstation_hl13.cpp b/src/surf/vm_workstation_hl13.cpp
index a0a6867..725b313 100644 (file)
--- a/src/surf/vm_workstation_hl13.cpp
+++ b/src/surf/vm_workstation_hl13.cpp
@@ -70,9 +70,11 @@ double WorkstationVMHL13Model::shareResources(double now)
   /* 0. Make sure that we already calculated the resource share at the physical
    * machine layer. */
   {
-    xbt_assert((xbt_dynar_search(model_list_invoke, &surf_workstation_model)< 
-    xbt_dynar_search(model_list_invoke, &surf_vm_workstation_model)), 
-    "Cannot assume surf_workstation_model comes before");
+    _XBT_GNUC_UNUSED ModelPtr ws_model = surf_workstation_model;
+    _XBT_GNUC_UNUSED ModelPtr vm_ws_model = surf_vm_workstation_model;
+    _XBT_GNUC_UNUSED unsigned int index_of_pm_ws_model = xbt_dynar_search(model_list_invoke, &ws_model);
+    _XBT_GNUC_UNUSED unsigned int index_of_vm_ws_model = xbt_dynar_search(model_list_invoke, &vm_ws_model);
+    xbt_assert((index_of_pm_ws_model < index_of_vm_ws_model), "Cannot assume surf_workstation_model comes before");
 
     /* Another option is that we call sub_ws->share_resource() here. The
      * share_resource() function has no side-effect. We can call it here to
@@ -181,26 +183,26 @@ double WorkstationVMHL13Model::shareResources(double now)
 
 ActionPtr WorkstationVMHL13Model::executeParallelTask(int workstation_nb,
                                         void **workstation_list,
-                                        double *computation_amount,
-                                        double *communication_amount,
+                                        double *flops_amount,
+                                        double *bytes_amount,
                                         double rate){
 #define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
   if ((workstation_nb == 1)
-      && (cost_or_zero(communication_amount, 0) == 0.0))
-    return ((WorkstationCLM03Ptr)workstation_list[0])->execute(computation_amount[0]);
+      && (cost_or_zero(bytes_amount, 0) == 0.0))
+    return ((WorkstationCLM03Ptr)workstation_list[0])->execute(flops_amount[0]);
   else if ((workstation_nb == 1)
-           && (cost_or_zero(computation_amount, 0) == 0.0))
-    return communicate((WorkstationCLM03Ptr)workstation_list[0], (WorkstationCLM03Ptr)workstation_list[0],communication_amount[0], rate);
+           && (cost_or_zero(flops_amount, 0) == 0.0))
+    return communicate((WorkstationCLM03Ptr)workstation_list[0], (WorkstationCLM03Ptr)workstation_list[0],bytes_amount[0], rate);
   else if ((workstation_nb == 2)
-             && (cost_or_zero(computation_amount, 0) == 0.0)
-             && (cost_or_zero(computation_amount, 1) == 0.0)) {
+             && (cost_or_zero(flops_amount, 0) == 0.0)
+             && (cost_or_zero(flops_amount, 1) == 0.0)) {
     int i,nb = 0;
     double value = 0.0;
 
     for (i = 0; i < workstation_nb * workstation_nb; i++) {
-      if (cost_or_zero(communication_amount, i) > 0.0) {
+      if (cost_or_zero(bytes_amount, i) > 0.0) {
         nb++;
-        value = cost_or_zero(communication_amount, i);
+        value = cost_or_zero(bytes_amount, i);
       }
     }
     if (nb == 1)
@@ -276,7 +278,8 @@ WorkstationVMHL13::WorkstationVMHL13(WorkstationVMModelPtr model, const char* na
 WorkstationVMHL13::~WorkstationVMHL13()
 {
   /* Free the cpu_action of the VM. */
-  xbt_assert(p_action->unref() == 1, "Bug: some resource still remains");
+  _XBT_GNUC_UNUSED int ret = p_action->unref();
+  xbt_assert(ret == 1, "Bug: some resource still remains");
 }
 
 void WorkstationVMHL13::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/) {
@@ -382,11 +385,12 @@ void WorkstationVMHL13::migrate(surf_resource_t ind_dst_pm)
      /* keep the bound value of the cpu action of the VM. */
      double old_bound = p_action->getBound();
      if (old_bound != 0) {
-       XBT_INFO("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst);
+       XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst);
        new_cpu_action->setBound(old_bound);
      }
 
-     xbt_assert( p_action->unref() == 1, "Bug: some resource still remains");
+     _XBT_GNUC_UNUSED int ret = p_action->unref();
+     xbt_assert(ret == 1, "Bug: some resource still remains");
 
      p_action = new_cpu_action;
    }