Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Remove SIMIX wrappers
[simgrid.git] / src / simgrid / host.cpp
index 0d2785c..19330ae 100644 (file)
@@ -1,37 +1,59 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-201. 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. */
 
+#include <simgrid/simix.hpp>
+
 #include "xbt/dict.h"
 #include "simgrid/host.h"
+#include "simgrid/Host.hpp"
 #include "surf/surf.h" // routing_get_network_element_type FIXME:killme
 
-sg_host_t sg_host_by_name(const char *name){
-  return xbt_lib_get_elm_or_null(host_lib, name);
+#include "src/simix/smx_private.hpp"
+#include "src/surf/host_interface.hpp"
+
+size_t sg_host_count()
+{
+  return xbt_dict_length(host_list);
 }
 
-sg_host_t sg_host_by_name_or_create(const char *name) {
-       sg_host_t res = xbt_lib_get_elm_or_null(host_lib, name);
-       if (!res) {
-               xbt_lib_set(host_lib,name,0,NULL); // Should only create the bucklet with no data added
-               res = xbt_lib_get_elm_or_null(host_lib, name);
-       }
-       return res;
+const char *sg_host_get_name(sg_host_t host)
+{
+       return host->getName().c_str();
+}
+
+void* sg_host_extension_get(sg_host_t host, size_t ext)
+{
+  return host->extension(ext);
+}
+
+size_t sg_host_extension_create(void(*deleter)(void*))
+{
+  return simgrid::Host::extension_create(deleter);
+}
+
+sg_host_t sg_host_by_name(const char *name)
+{
+  return simgrid::Host::by_name_or_null(name);
+}
+
+sg_host_t sg_host_by_name_or_create(const char *name)
+{
+  return simgrid::Host::by_name_or_create(name);
 }
-xbt_dynar_t sg_hosts_as_dynar(void) {
-       xbt_lib_cursor_t cursor;
-       char *key;
-       void **data;
+
+xbt_dynar_t sg_hosts_as_dynar(void)
+{
        xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),NULL);
 
-       xbt_lib_foreach(host_lib, cursor, key, data) {
-               if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST) {
-                       xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
-                       xbt_dynar_push(res, &elm);
-               }
-       }
+  xbt_dict_cursor_t cursor = nullptr;
+  const char* name = nullptr;
+  simgrid::Host* host = nullptr;
+       xbt_dict_foreach(host_list, cursor, name, host)
+               if(routing_get_network_element_type(name) == SURF_NETWORK_ELEMENT_HOST)
+                       xbt_dynar_push(res, &host);
        return res;
 }
 
@@ -41,122 +63,83 @@ int MSG_HOST_LEVEL;
 int SD_HOST_LEVEL;
 int SIMIX_HOST_LEVEL;
 int ROUTING_HOST_LEVEL;
-int SURF_CPU_LEVEL;
 int USER_HOST_LEVEL;
 
-#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
-#include "src/simdag/private.h" // __SD_workstation_destroy. FIXME: killme
-#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
+#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme by initializing that level in msg when used
+#include "src/simdag/simdag_private.h" // __SD_workstation_destroy. FIXME: killme by initializing that level in simdag when used
+#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme by initializing that level in simix when used
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_routing.hpp"
 
-static XBT_INLINE void surf_cpu_free(void *r) {
-  delete static_cast<Cpu*>(r);
-}
-static XBT_INLINE void routing_asr_host_free(void *p) {
-  delete static_cast<RoutingEdge*>(p);
-}
+void sg_host_init()
+{
+  MSG_HOST_LEVEL = simgrid::Host::extension_create([](void *p) {
+    __MSG_host_priv_free((msg_host_priv_t) p);
+  });
 
-void sg_host_init() {
-  MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_priv_free);
-  SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy);
+  ROUTING_HOST_LEVEL = simgrid::Host::extension_create([](void *p) {
+         delete static_cast<simgrid::surf::NetCard*>(p);
+  });
 
-  SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
-  SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_cpu_free);
-  ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
-  USER_HOST_LEVEL = xbt_lib_add_level(host_lib,NULL);
+  SD_HOST_LEVEL = simgrid::Host::extension_create(__SD_workstation_destroy);
+  SIMIX_HOST_LEVEL = simgrid::Host::extension_create(SIMIX_host_destroy);
+  USER_HOST_LEVEL = simgrid::Host::extension_create(NULL);
 }
+
 // ========== User data Layer ==========
 void *sg_host_user(sg_host_t host) {
-       return xbt_lib_get_level(host, USER_HOST_LEVEL);
+  return host->extension(USER_HOST_LEVEL);
 }
 void sg_host_user_set(sg_host_t host, void* userdata) {
-       xbt_lib_set(host_lib,host->key,USER_HOST_LEVEL,userdata);
+  host->extension_set(USER_HOST_LEVEL,userdata);
 }
 void sg_host_user_destroy(sg_host_t host) {
-       xbt_lib_unset(host_lib,host->key,USER_HOST_LEVEL,1);
+  host->extension_set(USER_HOST_LEVEL, nullptr);
 }
 
 // ========== MSG Layer ==============
 msg_host_priv_t sg_host_msg(sg_host_t host) {
-       return (msg_host_priv_t) xbt_lib_get_level(host, MSG_HOST_LEVEL);
+       return (msg_host_priv_t) host->extension(MSG_HOST_LEVEL);
 }
 void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
-         xbt_lib_set(host_lib,host->key,MSG_HOST_LEVEL,smx_host);
+  host->extension_set(MSG_HOST_LEVEL, smx_host);
 }
 void sg_host_msg_destroy(sg_host_t host) {
-         xbt_lib_unset(host_lib,host->key,MSG_HOST_LEVEL,1);
+  host->extension_set(MSG_HOST_LEVEL, nullptr);
 }
 // ========== SimDag Layer ==============
 SD_workstation_priv_t sg_host_sd(sg_host_t host) {
-       return (SD_workstation_priv_t) xbt_lib_get_level(host, SD_HOST_LEVEL);
+  return (SD_workstation_priv_t) host->extension(SD_HOST_LEVEL);
 }
 void sg_host_sd_set(sg_host_t host, SD_workstation_priv_t smx_host) {
-         xbt_lib_set(host_lib,host->key,SD_HOST_LEVEL,smx_host);
+  host->extension_set(SD_HOST_LEVEL, smx_host);
 }
 void sg_host_sd_destroy(sg_host_t host) {
-         xbt_lib_unset(host_lib,host->key,SD_HOST_LEVEL,1);
+  host->extension_set(SD_HOST_LEVEL, nullptr);
 }
 
 // ========== Simix layer =============
 smx_host_priv_t sg_host_simix(sg_host_t host){
-  return (smx_host_priv_t) xbt_lib_get_level(host, SIMIX_HOST_LEVEL);
+  return (smx_host_priv_t) host->extension(SIMIX_HOST_LEVEL);
 }
 void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) {
-       xbt_lib_set(host_lib,host->key,SIMIX_HOST_LEVEL,smx_host);
+  host->extension_set(SIMIX_HOST_LEVEL, smx_host);
 }
 void sg_host_simix_destroy(sg_host_t host) {
-       xbt_lib_unset(host_lib,host->key,SIMIX_HOST_LEVEL,1);
-}
-
-// ========== SURF CPU ============
-surf_cpu_t sg_host_surfcpu(sg_host_t host) {
-       return (surf_cpu_t) xbt_lib_get_level(host, SURF_CPU_LEVEL);
-}
-void sg_host_surfcpu_set(sg_host_t host, surf_cpu_t cpu) {
-       xbt_lib_set(host_lib, host->key, SURF_CPU_LEVEL, cpu);
-}
-void sg_host_surfcpu_destroy(sg_host_t host) {
-       xbt_lib_unset(host_lib,host->key,SURF_CPU_LEVEL,1);
-}
-// ========== RoutingEdge ============
-RoutingEdge *sg_host_edge(sg_host_t host) {
-       return (RoutingEdge*) xbt_lib_get_level(host, ROUTING_HOST_LEVEL);
+  host->extension_set(SIMIX_HOST_LEVEL, nullptr);
 }
-void sg_host_edge_set(sg_host_t host, RoutingEdge *edge) {
-       xbt_lib_set(host_lib, host->key, ROUTING_HOST_LEVEL, edge);
-}
-void sg_host_edge_destroy(sg_host_t host, int do_callback) {
-       xbt_lib_unset(host_lib,host->key,ROUTING_HOST_LEVEL,do_callback);
-}
-
 
 // =========== user-level functions ===============
 // ================================================
-double sg_host_get_speed(sg_host_t host){
-  return surf_host_get_speed(host, 1.0);
-}
 
 double sg_host_get_available_speed(sg_host_t host){
   return surf_host_get_available_speed(host);
 }
-/** @brief Returns the number of core of the processor. */
-int sg_host_get_core(sg_host_t host) {
-       return surf_host_get_core(host);
-}
 /** @brief Returns the state of a host.
  *  @return 1 if the host is active or 0 if it has crashed.
  */
-int sg_host_get_state(sg_host_t host) {
-       return surf_host_get_state(surf_host_resource_priv(host));
-}
-
-/** @brief Returns the total energy consumed by the host (in Joules).
- *
- *  See also @ref SURF_plugin_energy.
- */
-double sg_host_get_consumed_energy(sg_host_t host) {
-       return surf_host_get_consumed_energy(host);
+int sg_host_is_on(sg_host_t host) {
+       return host->pimpl_cpu->isOn();
 }
 
 /** @brief Returns the number of power states for a host.
@@ -164,7 +147,7 @@ double sg_host_get_consumed_energy(sg_host_t host) {
  *  See also @ref SURF_plugin_energy.
  */
 int sg_host_get_nb_pstates(sg_host_t host) {
-       return surf_host_get_nb_pstates(host);
+  return host->pimpl_cpu->getNbPStates();
 }
 
 /** @brief Gets the pstate at which that host currently runs.
@@ -172,5 +155,150 @@ int sg_host_get_nb_pstates(sg_host_t host) {
  *  See also @ref SURF_plugin_energy.
  */
 int sg_host_get_pstate(sg_host_t host) {
-       return surf_host_get_pstate(host);
+  return host->getPState();
+}
+/** @brief Sets the pstate at which that host should run.
+ *
+ *  See also @ref SURF_plugin_energy.
+ */
+void sg_host_set_pstate(sg_host_t host,int pstate) {
+  host->setPState(pstate);
+}
+
+namespace simgrid {
+
+Host::Host(std::string const& id)
+  : name_(id)
+{
+}
+
+Host::~Host()
+{
+}
+
+/** Start the host if it is off */
+void Host::turnOn()
+{
+  simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
+}
+
+/** Stop the host if it is on */
+void Host::turnOff()
+{
+  /* Go to that function to follow the code flow through the simcall barrier */
+  if (0) simcall_HANDLER_host_off(&SIMIX_process_self()->simcall, this);
+  simgrid::simix::simcall<void>(SIMCALL_HOST_OFF, this);
+}
+
+bool Host::isOn() {
+  return pimpl_cpu->isOn();
+}
+bool Host::isOff() {
+  return ! pimpl_cpu->isOn();
+}
+
+
+/** Get the properties assigned to a host */
+xbt_dict_t Host::getProperties()
+{
+  return simgrid::simix::kernel(std::bind(sg_host_get_properties, this));
+}
+
+/** Get the processes attached to the host */
+xbt_swag_t Host::getProcessList()
+{
+  return simgrid::simix::kernel([&]() {
+    return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+  });
+}
+
+/** Get the peak power of a host */
+double Host::getCurrentPowerPeak()
+{
+  return simgrid::simix::kernel(
+    std::bind(surf_host_get_current_power_peak, this));
+}
+
+/** Get one power peak (in flops/s) of a host at a given pstate */
+double Host::getPowerPeakAt(int pstate_index)
+{
+  return simgrid::simix::kernel(
+    std::bind(surf_host_get_power_peak_at, this, pstate_index));
+}
+
+/** @brief Get the speed of the cpu associated to a host */
+double Host::getSpeed() {
+       return pimpl_cpu->getSpeed(1.0);
+}
+/** @brief Returns the number of core of the processor. */
+int Host::getCoreAmount() {
+       return pimpl_cpu->getCore();
+}
+
+Host* Host::by_name_or_null(const char* name)
+{
+  return (Host*) xbt_dict_get_or_null(host_list, name);
+}
+
+Host* Host::by_name_or_create(const char* name)
+{
+  Host* host = by_name_or_null(name);
+  if (host == nullptr) {
+    host = new Host(name);
+    xbt_dict_set(host_list, name, host, NULL);
+  }
+  return host;
+}
+
+/** @brief Set the pstate at which the host should run */
+void Host::setPState(int pstate_index)
+{
+  simgrid::simix::kernel(std::bind(
+      &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
+  ));
+}
+/** @brief Retrieve the pstate at which the host is currently running */
+int Host::getPState()
+{
+  return pimpl_cpu->getPState();
+}
+
+void Host::getParams(vm_params_t params)
+{
+  simgrid::simix::kernel([&]() {
+    this->extension<simgrid::surf::Host>()->getParams(params);
+  });
+}
+
+void Host::setParams(vm_params_t params)
+{
+  simgrid::simix::kernel([&]() {
+    this->extension<simgrid::surf::Host>()->setParams(params);
+  });
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns the list of storages mounted on an host.
+ * \return a dict containing all storages mounted on the host
+ */
+xbt_dict_t Host::getMountedStorageList()
+{
+  return simgrid::simix::kernel([&] {
+    return this->extension<simgrid::surf::Host>()->getMountedStorageList();
+  });
+}
+
+/**
+ * \ingroup simix_storage_management
+ * \brief Returns the list of storages attached to an host.
+ * \return a dict containing all storages attached to the host
+ */
+xbt_dynar_t Host::getAttachedStorageList()
+{
+  return simgrid::simix::kernel([&] {
+    return this->extension<simgrid::surf::Host>()->getAttachedStorageList();
+  });
+}
+
 }