Fix bound checking in assert.

diff --git a/src/kernel/resource/CpuImpl.cpp b/src/kernel/resource/CpuImpl.cpp
index c69d23a..d597356 100644 (file)
--- a/src/kernel/resource/CpuImpl.cpp
+++ b/src/kernel/resource/CpuImpl.cpp
@@ -67,9 +67,9 @@ CpuImpl* CpuImpl::set_pstate(unsigned long pstate_index)
 {
   xbt_assert(
       pstate_index < speed_per_pstate_.size(),
 {
   xbt_assert(
       pstate_index < speed_per_pstate_.size(),

-      "Invalid parameters for CPU %s (pstate %lu >= length of pstates %d). Please fix your platform file, or your "
+      "Invalid parameters for CPU %s (pstate %lu >= length of pstates %zu). Please fix your platform file, or your "

       "call to change the pstate.",
       "call to change the pstate.",

-      get_cname(), pstate_index, static_cast<int>(speed_per_pstate_.size()));
+      get_cname(), pstate_index, speed_per_pstate_.size());

 
   double new_peak_speed = speed_per_pstate_[pstate_index];
   pstate_               = pstate_index;
 
   double new_peak_speed = speed_per_pstate_[pstate_index];
   pstate_               = pstate_index;


@@ -90,8 +90,8 @@ CpuImpl* CpuImpl::set_pstate_speed(const std::vector<double>& speed_per_state)
 
 double CpuImpl::get_pstate_peak_speed(unsigned long pstate_index) const
 {
 
 double CpuImpl::get_pstate_peak_speed(unsigned long pstate_index) const
 {

-  xbt_assert((pstate_index <= speed_per_pstate_.size()), "Invalid parameters (pstate index out of bounds)");
-
+  xbt_assert(pstate_index < speed_per_pstate_.size(), "Invalid parameters (pstate index %lu out of bounds %zu)",
+             pstate_index, speed_per_pstate_.size());

   return speed_per_pstate_[pstate_index];
 }
 
   return speed_per_pstate_[pstate_index];
 }