clang-format before starting changing files

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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 18b646e..3b4cf2a 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2021. 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. */
@@ -7,7 +7,7 @@
 #include "simgrid/sg_config.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host);
 
 void surf_host_model_init_current_default()
 {
@@ -36,18 +36,14 @@ double HostCLM03Model::next_occurring_event(double now)
   double min_by_cpu = surf_cpu_model_pm->next_occurring_event(now);
   double min_by_net =
       surf_network_model->next_occurring_event_is_idempotent() ? surf_network_model->next_occurring_event(now) : -1;
-  double min_by_sto = surf_storage_model->next_occurring_event(now);
   double min_by_dsk = surf_disk_model->next_occurring_event(now);
 
-  XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f, %s min_by_dsk %f", this,
-            typeid(surf_cpu_model_pm).name(), min_by_cpu, typeid(surf_network_model).name(), min_by_net,
-            typeid(surf_storage_model).name(), min_by_sto, typeid(surf_disk_model).name(), min_by_dsk);
+  XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_dsk %f", this, typeid(surf_cpu_model_pm).name(),
+            min_by_cpu, typeid(surf_network_model).name(), min_by_net, typeid(surf_disk_model).name(), min_by_dsk);
 
   double res = min_by_cpu;
   if (res < 0 || (min_by_net >= 0.0 && min_by_net < res))
     res = min_by_net;
-  if (res < 0 || (min_by_sto >= 0.0 && min_by_sto < res))
-    res = min_by_sto;
   if (res < 0 || (min_by_dsk >= 0.0 && min_by_dsk < res))
     res = min_by_dsk;
   return res;