X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a17d773484b05eb5d041babda0b346350b9ae72..8c416e92254512408c1d0ce729e8d3cf82ec9938:/src/simgrid/host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 0ee923f7bf..ad422c6b7a 100644
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -19,11 +19,9 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
 
-extern "C" {
-
 size_t sg_host_count()
 {
-  return simgrid::s4u::Engine::getInstance()->getHostCount();
+  return simgrid::s4u::Engine::getInstance()->get_host_count();
 }
 /** @brief Returns the host list
  *
@@ -37,7 +35,7 @@ size_t sg_host_count()
  */
 sg_host_t *sg_host_list() {
   xbt_assert(sg_host_count() > 0, "There is no host!");
-  std::vector<simgrid::s4u::Host*> hosts = simgrid::s4u::Engine::getInstance()->getAllHosts();
+  std::vector<simgrid::s4u::Host*> hosts = simgrid::s4u::Engine::getInstance()->get_all_hosts();
 
   sg_host_t* res = (sg_host_t*)malloc(sizeof(sg_host_t) * hosts.size());
   memcpy(res, hosts.data(), sizeof(sg_host_t) * hosts.size());
@@ -47,7 +45,7 @@ sg_host_t *sg_host_list() {
 
 const char *sg_host_get_name(sg_host_t host)
 {
-  return host->getCname();
+  return host->get_cname();
 }
 
 void* sg_host_extension_get(sg_host_t host, size_t ext)
@@ -67,18 +65,18 @@ sg_host_t sg_host_by_name(const char *name)
 
 static int hostcmp_voidp(const void* pa, const void* pb)
 {
-  return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->getCname(),
-                (*static_cast<simgrid::s4u::Host* const*>(pb))->getCname());
+  return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->get_cname(),
+                (*static_cast<simgrid::s4u::Host* const*>(pb))->get_cname());
 }
 
 xbt_dynar_t sg_hosts_as_dynar()
 {
   xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr);
 
-  std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::getInstance()->getAllHosts();
+  std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::getInstance()->get_all_hosts();
 
   for (auto const& host : list) {
-    if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost())
+    if (host && host->pimpl_netpoint && host->pimpl_netpoint->is_host())
       xbt_dynar_push(res, &host);
   }
   xbt_dynar_sort(res, hostcmp_voidp);
@@ -105,19 +103,17 @@ xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
   for (auto const& elm : host->getMountedStorages()) {
     const char* mount_name = elm.first.c_str();
     sg_storage_t storage   = elm.second;
-    xbt_dict_set(res, mount_name, (void*)storage->getCname(), nullptr);
+    xbt_dict_set(res, mount_name, (void*)storage->get_cname(), nullptr);
   }
 
   return res;
 }
 
 xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
-  std::vector<const char*>* storage_vector = new std::vector<const char*>();
   xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr);
-  host->getAttachedStorages(storage_vector);
-  for (auto const& name : *storage_vector)
+  std::vector<const char*> storage_vector = host->get_attached_storages();
+  for (auto const& name : storage_vector)
     xbt_dynar_push(storage_dynar, &name);
-  delete storage_vector;
   return storage_dynar;
 }
 
@@ -153,7 +149,7 @@ int sg_host_core_count(sg_host_t host)
 
 double sg_host_get_available_speed(sg_host_t host)
 {
-  return host->pimpl_cpu->getAvailableSpeed();
+  return host->pimpl_cpu->get_available_speed();
 }
 
 /** @brief Returns the number of power states for a host.
@@ -307,7 +303,7 @@ double sg_host_route_bandwidth(sg_host_t from, sg_host_t to)
 /** @brief Displays debugging information about a host */
 void sg_host_dump(sg_host_t host)
 {
-  XBT_INFO("Displaying host %s", host->getCname());
+  XBT_INFO("Displaying host %s", host->get_cname());
   XBT_INFO("  - speed: %.0f", host->getSpeed());
   XBT_INFO("  - available speed: %.2f", sg_host_get_available_speed(host));
   std::map<std::string, std::string>* props = host->getProperties();
@@ -338,5 +334,3 @@ sg_host_t sg_host_self()
   smx_actor_t process = SIMIX_process_self();
   return (process == nullptr) ? nullptr : process->host;
 }
-
-} // extern "C"