Add Dragonfly topology. Use XC30's Cray description as a basis

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

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 8e89a04..027ac81 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -68,7 +68,6 @@ CpuTiTgmr::~CpuTiTgmr()
 * Wrapper around surf_cpu_integrate_trace_simple() to get
 * the cyclic effect.
 *
-* \param trace Trace structure.
 * \param a      Begin of interval
 * \param b      End of interval
 * \return the integrate value. -1 if an error occurs.
@@ -253,7 +252,6 @@ double CpuTiTgmr::solveSomewhatSimple(double a, double amount)
 /**
  * \brief Auxiliary function to solve integral.
  *  It returns the date when the requested amount of flops is available
- * \param trace    Trace structure
  * \param a        Initial point
  * \param amount  Amount of flops
  * \return The date when amount is available.
@@ -280,7 +278,6 @@ double CpuTiTrace::solveSimple(double a, double amount)
 * \brief Auxiliary function to update the CPU speed scale.
 *
 *  This function uses the trace structure to return the speed scale at the determined time a.
-* \param trace    Trace structure to search the updated speed scale
 * \param a        Time
 * \return CPU speed scale
 */
@@ -302,7 +299,6 @@ double CpuTiTgmr::getPowerScale(double a)
 *
 * \param  speedTrace    CPU availability trace
 * \param  value          Percentage of CPU speed available (useful to fixed tracing)
-* \param  spacing        Initial spacing
 * \return  Integration trace structure
 */
 CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value)
@@ -401,14 +397,14 @@ CpuTiModel::CpuTiModel() : CpuModel()
 
   modifiedCpu_ = new CpuTiList();
 
-  tiActionHeap_ = xbt_heap_new(8, NULL);
+  tiActionHeap_ = xbt_heap_new(8, nullptr);
   xbt_heap_set_update_callback(tiActionHeap_,
                                cpu_ti_action_update_index_heap);
 }
 
 CpuTiModel::~CpuTiModel()
 {
-  surf_cpu_model_pm = NULL;
+  surf_cpu_model_pm = nullptr;
   delete runningActionSetThatDoesNotNeedBeingChecked_;
   delete modifiedCpu_;
   xbt_heap_free(tiActionHeap_);
@@ -469,7 +465,7 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPs
   xbt_dynar_get_cpy(speedPerPstate, 0, &speed_.peak);
   XBT_DEBUG("CPU create: peak=%f", speed_.peak);
 
-  speedIntegratedTrace_ = new CpuTiTgmr(NULL, 1/*scale*/);
+  speedIntegratedTrace_ = new CpuTiTgmr(nullptr, 1/*scale*/);
 }
 
 CpuTi::~CpuTi()