cosmetics: .name().c_str() becomes .cname()

diff --git a/examples/s4u/io/s4u_io.cpp b/examples/s4u/io/s4u_io.cpp
index 7499e4d..28f0b4e 100644 (file)
--- a/examples/s4u/io/s4u_io.cpp
+++ b/examples/s4u/io/s4u_io.cpp
@@ -13,8 +13,7 @@ class MyHost {
 public:
 
   void show_info(boost::unordered_map <std::string, simgrid::s4u::Storage*> const&mounts) {
 public:
 
   void show_info(boost::unordered_map <std::string, simgrid::s4u::Storage*> const&mounts) {

-    XBT_INFO("Storage info on %s:",
-      simgrid::s4u::Host::current()->name().c_str());
+    XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->cname());

 
     for (const auto&kv : mounts) {
       const char* mountpoint = kv.first.c_str();
 
     for (const auto&kv : mounts) {
       const char* mountpoint = kv.first.c_str();

diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp
index 934858f..83878d6 100644 (file)
--- a/src/msg/msg_vm.cpp
+++ b/src/msg/msg_vm.cpp
@@ -187,7 +187,7 @@ void MSG_vm_destroy(msg_vm_t vm)
   });
 
   if (TRACE_msg_vm_is_enabled()) {
   });
 
   if (TRACE_msg_vm_is_enabled()) {

-    container_t container = PJ_container_get(vm->name().c_str());
+    container_t container = PJ_container_get(vm->cname());

     PJ_container_remove_from_parent(container);
     PJ_container_free(container);
   }
     PJ_container_remove_from_parent(container);
     PJ_container_free(container);
   }


@@ -230,7 +230,7 @@ void MSG_vm_start(msg_vm_t vm)
   });
 
   if (TRACE_msg_vm_is_enabled()) {
   });
 
   if (TRACE_msg_vm_is_enabled()) {

-    container_t vm_container = PJ_container_get(vm->name().c_str());
+    container_t vm_container = PJ_container_get(vm->cname());

     type_t type              = PJ_type_get("MSG_VM_STATE", vm_container->type);
     val_t value              = PJ_value_get_or_new("start", "0 0 1", type); // start is blue
     new_pajePushState(MSG_get_clock(), vm_container, type, value);
     type_t type              = PJ_type_get("MSG_VM_STATE", vm_container->type);
     val_t value              = PJ_value_get_or_new("start", "0 0 1", type); // start is blue
     new_pajePushState(MSG_get_clock(), vm_container, type, value);


@@ -354,7 +354,7 @@ static int migration_rx_fun(int argc, char *argv[])
       PJ_container_new(vm->cname(), INSTR_MSG_VM, PJ_container_get(ms->dst_pm->cname()));
 
       // end link
       PJ_container_new(vm->cname(), INSTR_MSG_VM, PJ_container_get(ms->dst_pm->cname()));
 
       // end link

-      msg  = PJ_container_get(vm->name().c_str());
+      msg  = PJ_container_get(vm->cname());

       type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root());
       new_pajeEndLink(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
     }
       type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root());
       new_pajeEndLink(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
     }


@@ -902,10 +902,9 @@ void MSG_vm_restore(msg_vm_t vm)
 {
   simgrid::simix::kernelImmediate([vm]() {
     if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_SAVED)
 {
   simgrid::simix::kernelImmediate([vm]() {
     if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_SAVED)

-      THROWF(vm_error, 0, "VM(%s) was not saved", vm->name().c_str());
+      THROWF(vm_error, 0, "VM(%s) was not saved", vm->cname());

 
 

-    XBT_DEBUG("restore VM(%s), where %d processes exist", vm->name().c_str(),
-              xbt_swag_size(sg_host_simix(vm)->process_list));
+    XBT_DEBUG("restore VM(%s), where %d processes exist", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list));

 
     /* jump to vm_ws_restore() */
     static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->restore();
 
     /* jump to vm_ws_restore() */
     static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->restore();

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 8f9c116..a34c8a3 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -77,8 +77,7 @@ double VMModel::nextOccuringEvent(double now)
     xbt_assert(cpu, "cpu-less host");
 
     double solved_value = ws_vm->pimpl_vm_->action_->getVariable()->value;
     xbt_assert(cpu, "cpu-less host");
 
     double solved_value = ws_vm->pimpl_vm_->action_->getVariable()->value;

-    XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->name().c_str(),
-              ws_vm->pimpl_vm_->getPm()->name().c_str());
+    XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->cname(), ws_vm->pimpl_vm_->getPm()->cname());

 
     // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution.
     // cpu_cas01->constraint->bound = solved_value;
 
     // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution.
     // cpu_cas01->constraint->bound = solved_value;


@@ -111,7 +110,7 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim
   /* Initialize the VM parameters */
   params_.ramsize = 0;
 
   /* Initialize the VM parameters */
   params_.ramsize = 0;
 

-  XBT_VERB("Create VM(%s)@PM(%s)", piface->name().c_str(), hostPM_->name().c_str());
+  XBT_VERB("Create VM(%s)@PM(%s)", piface->cname(), hostPM_->cname());

 }
 
 extern "C" int
 }
 
 extern "C" int


@@ -188,9 +187,9 @@ s4u::Host* VirtualMachineImpl::getPm()
 /* Update the physical host of the given VM */
 void VirtualMachineImpl::migrate(s4u::Host* host_dest)
 {
 /* Update the physical host of the given VM */
 void VirtualMachineImpl::migrate(s4u::Host* host_dest)
 {

-  const char* vm_name     = piface_->name().c_str();
-  const char* pm_name_src = hostPM_->name().c_str();
-  const char* pm_name_dst = host_dest->name().c_str();
+  const char* vm_name     = piface_->cname();
+  const char* pm_name_src = hostPM_->cname();
+  const char* pm_name_dst = host_dest->cname();

 
   /* update net_elm with that of the destination physical host */
   piface_->pimpl_netcard = host_dest->pimpl_netcard;
 
   /* update net_elm with that of the destination physical host */
   piface_->pimpl_netcard = host_dest->pimpl_netcard;

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index d648250..86a184f 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -46,7 +46,7 @@ VirtualMachine::~VirtualMachine()
 {
   onDestruction(*this);
 
 {
   onDestruction(*this);
 

-  XBT_DEBUG("destroy %s", name().c_str());
+  XBT_DEBUG("destroy %s", cname());

 
   /* FIXME: this is really strange that everything fails if the next line is removed.
    * This is as if we shared these data with the PM, which definitely should not be the case...
 
   /* FIXME: this is really strange that everything fails if the next line is removed.
    * This is as if we shared these data with the PM, which definitely should not be the case...

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 70e54c4..0da2044 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -81,8 +81,8 @@ sg_host_t sg_host_by_name(const char *name)
 
 static int hostcmp_voidp(const void* pa, const void* pb)
 {
 
 static int hostcmp_voidp(const void* pa, const void* pb)
 {

-  return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->name().c_str(),
-                (*static_cast<simgrid::s4u::Host* const*>(pb))->name().c_str());
+  return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->cname(),
+                (*static_cast<simgrid::s4u::Host* const*>(pb))->cname());

 }
 
 xbt_dynar_t sg_hosts_as_dynar()
 }
 
 xbt_dynar_t sg_hosts_as_dynar()

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 99b2569..346c51b 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -247,10 +247,10 @@ smx_actor_t SIMIX_process_create(
 {
   smx_actor_t process = nullptr;
 
 {
   smx_actor_t process = nullptr;
 

-  XBT_DEBUG("Start process %s on host '%s'", name, host->name().c_str());
+  XBT_DEBUG("Start process %s on host '%s'", name, host->cname());

 
   if (host->isOff()) {
 
   if (host->isOff()) {

-    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->name().c_str());
+    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->cname());

     return nullptr;
   }
   else {
     return nullptr;
   }
   else {

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 6904369..0f31142 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -62,7 +62,7 @@ namespace simgrid {
     void Host::turnOn()
     {
       for (auto arg : boot_processes) {
     void Host::turnOn()
     {
       for (auto arg : boot_processes) {

-        XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->name().c_str());
+        XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->cname());

         simix_global->create_process_function(arg->name.c_str(),
             arg->code,
             nullptr,
         simix_global->create_process_function(arg->name.c_str(),
             arg->code,
             nullptr,

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index 12a0406..5714078 100644 (file)
--- a/src/simix/smx_vm.cpp
+++ b/src/simix/smx_vm.cpp
@@ -22,9 +22,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virt
 void SIMIX_vm_suspend(sg_host_t vm, smx_actor_t issuer)
 {
   if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)
 void SIMIX_vm_suspend(sg_host_t vm, smx_actor_t issuer)
 {
   if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)

-    THROWF(vm_error, 0, "VM(%s) is not running", vm->name().c_str());
+    THROWF(vm_error, 0, "VM(%s) is not running", vm->cname());

 
 

-  XBT_DEBUG("suspend VM(%s), where %d processes exist", vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list));
+  XBT_DEBUG("suspend VM(%s), where %d processes exist", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list));

 
   /* jump to vm_ws_suspend. The state will be set. */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->suspend();
 
   /* jump to vm_ws_suspend. The state will be set. */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->suspend();


@@ -57,10 +57,9 @@ void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t vm)
 void SIMIX_vm_resume(sg_host_t vm)
 {
   if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_SUSPENDED)
 void SIMIX_vm_resume(sg_host_t vm)
 {
   if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_SUSPENDED)

-    THROWF(vm_error, 0, "VM(%s) was not suspended", vm->name().c_str());
+    THROWF(vm_error, 0, "VM(%s) was not suspended", vm->cname());

 
 

-  XBT_DEBUG("resume VM(%s), where %d processes exist",
-      vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list));
+  XBT_DEBUG("resume VM(%s), where %d processes exist", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list));

 
   /* jump to vm_ws_resume() */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->resume();
 
   /* jump to vm_ws_resume() */
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->resume();


@@ -110,10 +109,9 @@ void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t vm)
 void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer)
 {
   if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)
 void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer)
 {
   if (static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING)

-    THROWF(vm_error, 0, "VM(%s) is not running", vm->name().c_str());
+    THROWF(vm_error, 0, "VM(%s) is not running", vm->cname());

 
 

-  XBT_DEBUG("shutdown VM %s, that contains %d processes",
-      vm->name().c_str(),xbt_swag_size(sg_host_simix(vm)->process_list));
+  XBT_DEBUG("shutdown VM %s, that contains %d processes", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list));

 
   smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) {
 
   smx_actor_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) {

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index c727c67..3ffb283 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -112,7 +112,7 @@ simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount)
   s_mount_t mnt;
   unsigned int cursor;
 
   s_mount_t mnt;
   unsigned int cursor;
 

-  XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->name().c_str());
+  XBT_DEBUG("Search for storage name '%s' on '%s'", mount, piface_->cname());

   xbt_dynar_foreach (storage_, cursor, mnt) {
     XBT_DEBUG("See '%s'", mnt.name);
     if (!strcmp(mount, mnt.name)) {
   xbt_dynar_foreach (storage_, cursor, mnt) {
     XBT_DEBUG("See '%s'", mnt.name);
     if (!strcmp(mount, mnt.name)) {


@@ -121,7 +121,7 @@ simgrid::surf::Storage* HostImpl::findStorageOnMountList(const char* mount)
     }
   }
   if (!st)
     }
   }
   if (!st)

-    xbt_die("Can't find mount '%s' for '%s'", mount, piface_->name().c_str());
+    xbt_die("Can't find mount '%s' for '%s'", mount, piface_->cname());

   return st;
 }
 
   return st;
 }
 


@@ -150,7 +150,7 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
     if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
       simgrid::surf::Storage* storage = static_cast<simgrid::surf::Storage*>(
           xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
     if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
       simgrid::surf::Storage* storage = static_cast<simgrid::surf::Storage*>(
           xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));

-      if (!strcmp((const char*)storage->attach_, piface_->name().c_str())) {
+      if (!strcmp((const char*)storage->attach_, piface_->cname())) {

         xbt_dynar_push_as(result, void*, (void*)storage->getName());
       }
     }
         xbt_dynar_push_as(result, void*, (void*)storage->getName());
       }
     }


@@ -169,7 +169,7 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
       char* file_mount_name        = nullptr;
       char* mount_name             = nullptr;
 
       char* file_mount_name        = nullptr;
       char* mount_name             = nullptr;
 

-      XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->name().c_str());
+      XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, piface_->cname());

       xbt_dynar_foreach (storage_, cursor, mnt) {
         XBT_DEBUG("See '%s'", mnt.name);
         file_mount_name = (char*)xbt_malloc((strlen(mnt.name) + 1));
       xbt_dynar_foreach (storage_, cursor, mnt) {
         XBT_DEBUG("See '%s'", mnt.name);
         file_mount_name = (char*)xbt_malloc((strlen(mnt.name) + 1));


@@ -192,7 +192,7 @@ xbt_dynar_t HostImpl::getAttachedStorageList()
         path[strlen(fullpath) - longest_prefix_length] = '\0';
         mount_name[longest_prefix_length]              = '\0';
       } else
         path[strlen(fullpath) - longest_prefix_length] = '\0';
         mount_name[longest_prefix_length]              = '\0';
       } else

-        xbt_die("Can't find mount point for '%s' on '%s'", fullpath, piface_->name().c_str());
+        xbt_die("Can't find mount point for '%s' on '%s'", fullpath, piface_->cname());

 
       XBT_DEBUG("OPEN %s on disk '%s'", path, st->getName());
       Action* action = st->open((const char*)mount_name, (const char*)path);
 
       XBT_DEBUG("OPEN %s on disk '%s'", path, st->getName());
       Action* action = st->open((const char*)mount_name, (const char*)path);

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 4873c12..3d7be6f 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -113,18 +113,16 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPs
 {
 }
 
 {
 }
 

-Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
-    std::vector<double> * speedPerPstate, int core)
- : Resource(model, host->name().c_str(), constraint)
- , coresAmount_(core)
- , host_(host)
+Cpu::Cpu(Model* model, simgrid::s4u::Host* host, lmm_constraint_t constraint, std::vector<double>* speedPerPstate,
+         int core)
+    : Resource(model, host->cname(), constraint), coresAmount_(core), host_(host)

 {
 {

-  xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->name().c_str());
+  xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->cname());

 
   speed_.peak = speedPerPstate->front();
   speed_.scale = 1;
   host->pimpl_cpu = this;
 
   speed_.peak = speedPerPstate->front();
   speed_.scale = 1;
   host->pimpl_cpu = this;

-  xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->name().c_str());
+  xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->cname());

 
   // Copy the power peak array:
   for (double value : *speedPerPstate) {
 
   // Copy the power peak array:
   for (double value : *speedPerPstate) {


@@ -193,13 +191,13 @@ int Cpu::coreCount()
 
 void Cpu::setStateTrace(tmgr_trace_t trace)
 {
 
 void Cpu::setStateTrace(tmgr_trace_t trace)
 {

-  xbt_assert(stateEvent_==nullptr,"Cannot set a second state trace to Host %s", host_->name().c_str());
+  xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->cname());

 
   stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
 }
 void Cpu::setSpeedTrace(tmgr_trace_t trace)
 {
 
   stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
 }
 void Cpu::setSpeedTrace(tmgr_trace_t trace)
 {

-  xbt_assert(speed_.event==nullptr,"Cannot set a second speed trace to Host %s", host_->name().c_str());
+  xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->cname());

 
   speed_.event = future_evt_set->add_trace(trace, 0.0, this);
 }
 
   speed_.event = future_evt_set->add_trace(trace, 0.0, this);
 }

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index d0c5cb8..0bf0be3 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -249,7 +249,7 @@ static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link)
 void sg_instr_new_host(simgrid::s4u::Host& host)
 {
   container_t father = currentContainer.back();
 void sg_instr_new_host(simgrid::s4u::Host& host)
 {
   container_t father = currentContainer.back();

-  container_t container = PJ_container_new(host.name().c_str(), INSTR_HOST, father);
+  container_t container = PJ_container_new(host.cname(), INSTR_HOST, father);

 
   if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) {
     type_t speed = PJ_type_get_or_null ("power", container->type);
 
   if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) {
     type_t speed = PJ_type_get_or_null ("power", container->type);

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 26ba959..75d41bc 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -295,12 +295,12 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
 
   std::vector<Link*> *route = new std::vector<Link*>();
 
 
   std::vector<Link*> *route = new std::vector<Link*>();
 

-  XBT_IN("(%s,%s,%g,%g)", src->name().c_str(), dst->name().c_str(), size, rate);
+  XBT_IN("(%s,%s,%g,%g)", src->cname(), dst->cname(), size, rate);

 
   src->routeTo(dst, route, &latency);
   xbt_assert(!route->empty() || latency,
              "You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
 
   src->routeTo(dst, route, &latency);
   xbt_assert(!route->empty() || latency,
              "You're trying to send data from %s to %s but there is no connecting path between these two hosts.",

-             src->name().c_str(), dst->name().c_str());
+             src->cname(), dst->cname());

 
   for (auto link: *route)
     if (link->isOff())
 
   for (auto link: *route)
     if (link->isOff())


@@ -341,7 +341,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
                "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!");
 
     gapAppend(size, route->at(0), action);
                "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!");
 
     gapAppend(size, route->at(0), action);

-    XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->name().c_str(), dst->name().c_str(), action->senderGap_,
+    XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->cname(), dst->cname(), action->senderGap_,

               action->latency_);
   }
 
               action->latency_);
   }
 

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 78a4a28..30d8f4a 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -26,9 +26,7 @@ static void IB_create_host_callback(simgrid::s4u::Host& host){
   IBNode* act = new IBNode(id);
 
   id++;
   IBNode* act = new IBNode(id);
 
   id++;

-  xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes,
-      host.name().c_str(), act, nullptr);
-
+  xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, host.cname(), act, nullptr);

 }
 
 static void IB_action_state_changed_callback(
 }
 
 static void IB_action_state_changed_callback(


@@ -54,12 +52,10 @@ static void IB_action_init_callback(simgrid::surf::NetworkAction* action, simgri
 {
   simgrid::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model;
 
 {
   simgrid::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model;
 

-  simgrid::surf::IBNode* act_src =
-      (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, src->name().c_str());
+  simgrid::surf::IBNode* act_src = (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, src->cname());

   xbt_assert(act_src, "could not find src node active comms !");
 
   xbt_assert(act_src, "could not find src node active comms !");
 

-  simgrid::surf::IBNode* act_dst =
-      (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, dst->name().c_str());
+  simgrid::surf::IBNode* act_dst = (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, dst->cname());

   xbt_assert(act_dst, "could not find dst node active comms !");
 
   ibModel->active_comms[action]=std::make_pair(act_src, act_dst);
   xbt_assert(act_dst, "could not find dst node active comms !");
 
   ibModel->active_comms[action]=std::make_pair(act_src, act_dst);

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index 9a6cc76..b1b51c9 100644 (file)
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -103,7 +103,7 @@ void HostEnergy::update()
 
   XBT_DEBUG(
       "[update_energy of %s] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> %.2f J",
 
   XBT_DEBUG(
       "[update_energy of %s] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> %.2f J",

-      host->name().c_str(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy, energy_this_step);
+      host->cname(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy, energy_this_step);

 }
 
 HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_get_clock())
 }
 
 HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_get_clock())


@@ -113,7 +113,7 @@ HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_g
   if (host->properties() != nullptr) {
     char* off_power_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_off");
     if (off_power_str != nullptr) {
   if (host->properties() != nullptr) {
     char* off_power_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_off");
     if (off_power_str != nullptr) {

-      char *msg = bprintf("Invalid value for property watt_off of host %s: %%s",host->name().c_str());
+      char* msg = bprintf("Invalid value for property watt_off of host %s: %%s", host->cname());

       watts_off = xbt_str_parse_double(off_power_str, msg);
       xbt_free(msg);
     }
       watts_off = xbt_str_parse_double(off_power_str, msg);
       xbt_free(msg);
     }


@@ -126,20 +126,20 @@ HostEnergy::~HostEnergy()=default;
 
 double HostEnergy::getWattMinAt(int pstate)
 {
 
 double HostEnergy::getWattMinAt(int pstate)
 {

-  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str());
+  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->cname());

   return power_range_watts_list[pstate].min;
 }
 
 double HostEnergy::getWattMaxAt(int pstate)
 {
   return power_range_watts_list[pstate].min;
 }
 
 double HostEnergy::getWattMaxAt(int pstate)
 {

-  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str());
+  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->cname());

   return power_range_watts_list[pstate].max;
 }
 
 /** @brief Computes the power consumed by the host according to the current pstate and processor load */
 double HostEnergy::getCurrentWattsValue(double cpu_load)
 {
   return power_range_watts_list[pstate].max;
 }
 
 /** @brief Computes the power consumed by the host according to the current pstate and processor load */
 double HostEnergy::getCurrentWattsValue(double cpu_load)
 {

-  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str());
+  xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->cname());

 
   /* min_power corresponds to the idle power (cpu load = 0) */
   /* max_power is the power consumed at 100% cpu load       */
 
   /* min_power corresponds to the idle power (cpu load = 0) */
   /* max_power is the power consumed at 100% cpu load       */


@@ -206,14 +206,14 @@ void HostEnergy::initWattsRangeList()
     /* retrieve the power values associated with the current pstate */
     xbt_dynar_t current_power_values = xbt_str_split(xbt_dynar_get_as(all_power_values, i, char*), ":");
     xbt_assert(xbt_dynar_length(current_power_values) == 3,
     /* retrieve the power values associated with the current pstate */
     xbt_dynar_t current_power_values = xbt_str_split(xbt_dynar_get_as(all_power_values, i, char*), ":");
     xbt_assert(xbt_dynar_length(current_power_values) == 3,

-        "Power properties incorrectly defined - could not retrieve idle, min and max power values for host %s",
-        host->name().c_str());
+               "Power properties incorrectly defined - could not retrieve idle, min and max power values for host %s",
+               host->cname());

 
     /* min_power corresponds to the idle power (cpu load = 0) */
     /* max_power is the power consumed at 100% cpu load       */
 
     /* min_power corresponds to the idle power (cpu load = 0) */
     /* max_power is the power consumed at 100% cpu load       */

-    char *msg_idle = bprintf("Invalid idle value for pstate %d on host %s: %%s", i, host->name().c_str());
-    char *msg_min = bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str());
-    char *msg_max = bprintf("Invalid max value for pstate %d on host %s: %%s", i, host->name().c_str());
+    char* msg_idle = bprintf("Invalid idle value for pstate %d on host %s: %%s", i, host->cname());
+    char* msg_min  = bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->cname());
+    char* msg_max  = bprintf("Invalid max value for pstate %d on host %s: %%s", i, host->cname());

     PowerRange range(
       xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 0, char*), msg_idle),
       xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 1, char*), msg_min),
     PowerRange range(
       xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 0, char*), msg_idle),
       xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 1, char*), msg_min),


@@ -273,7 +273,7 @@ static void onHostDestruction(simgrid::s4u::Host& host) {
     return;
   HostEnergy *host_energy = host.extension<HostEnergy>();
   host_energy->update();
     return;
   HostEnergy *host_energy = host.extension<HostEnergy>();
   host_energy->update();

-  XBT_INFO("Total energy of host %s: %f Joules", host.name().c_str(), host_energy->getConsumedEnergy());
+  XBT_INFO("Total energy of host %s: %f Joules", host.cname(), host_energy->getConsumedEnergy());

 }
 
 /* **************************** Public interface *************************** */
 }
 
 /* **************************** Public interface *************************** */

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index bf31e1f..09d488e 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -494,7 +494,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
     simgrid::s4u::Host* host;
     unsigned int cursor;
     xbt_dynar_foreach(all_hosts,cursor, host) {
     simgrid::s4u::Host* host;
     unsigned int cursor;
     xbt_dynar_foreach(all_hosts,cursor, host) {

-      xbt_strbuff_append(msg,host->name().c_str());
+      xbt_strbuff_append(msg, host->cname());

       xbt_strbuff_append(msg,"', '");
       if (msg->used > 1024) {
         msg->data[msg->used-3]='\0';
       xbt_strbuff_append(msg,"', '");
       if (msg->used > 1024) {
         msg->data[msg->used-3]='\0';


@@ -540,8 +540,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
     arg->kill_time = kill_time;
     arg->properties = current_property_set;
 
     arg->kill_time = kill_time;
     arg->properties = current_property_set;
 

-    XBT_DEBUG("Process %s@%s will be started at time %f",
-      arg->name.c_str(), arg->host->name().c_str(), start_time);
+    XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->cname(), start_time);

     SIMIX_timer_set(start_time, [=]() {
       simix_global->create_process_function(
                                             arg->name.c_str(),
     SIMIX_timer_set(start_time, [=]() {
       simix_global->create_process_function(
                                             arg->name.c_str(),


@@ -759,6 +758,6 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink)
   if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end())
     surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
 
   if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end())
     surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
 

-  XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name().c_str(), netcard->id());
+  XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->cname(), netcard->id());

   as_cluster->privateLinks_.insert({netcard->id(), {linkUp, linkDown}});
 }
   as_cluster->privateLinks_.insert({netcard->id(), {linkUp, linkDown}});
 }

diff --git a/teshsuite/simdag/is-router/is-router.cpp b/teshsuite/simdag/is-router/is-router.cpp
index 3c963c9..b03de1f 100644 (file)
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
   sg_host_t host;
   xbt_dynar_foreach(hosts, it, host) {
     simgrid::kernel::routing::NetCard * nc = host->pimpl_netcard;
   sg_host_t host;
   xbt_dynar_foreach(hosts, it, host) {
     simgrid::kernel::routing::NetCard * nc = host->pimpl_netcard;

-    printf("   - Seen: \"%s\". Type: %s\n", host->name().c_str(), nc->isRouter() ? "router" : (nc->isAS()?"AS":"host"));
+    printf("   - Seen: \"%s\". Type: %s\n", host->cname(), nc->isRouter() ? "router" : (nc->isAS() ? "AS" : "host"));

   }
   xbt_dynar_free(&hosts);
 
   }
   xbt_dynar_free(&hosts);