#include "xbt/log.h"
#include "simgrid/simix.h"
#include <simgrid/s4u/host.hpp>
+#include <numeric>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
+int sg_storage_max_file_descriptors = 1024;
+
/** @addtogroup m_host_management
* (#msg_host_t) and the functions for managing it.
*
priv->dp_updated_by_deleted_tasks = 0;
priv->is_migrating = 0;
- priv->affinity_mask_db = xbt_dict_new_homogeneous(nullptr);
-
- priv->file_descriptor_table = xbt_dynar_new(sizeof(int), nullptr);
- for (int i=1023; i>=0;i--)
- xbt_dynar_push_as(priv->file_descriptor_table, int, i);
+ priv->file_descriptor_table = new std::vector<int>(sg_storage_max_file_descriptors);
+ std::iota (priv->file_descriptor_table->rbegin(), priv->file_descriptor_table->rend(), 0); // Fill with ..., 1, 0.
sg_host_msg_set(host,priv);
*
* \brief Return the location on which the current process is executed.
*/
-msg_host_t MSG_host_self(void)
+msg_host_t MSG_host_self()
{
return MSG_process_get_host(nullptr);
}
if (size > 0)
XBT_WARN("dp_objs: %u pending task?", size);
xbt_dict_free(&priv->dp_objs);
- xbt_dict_free(&priv->affinity_mask_db);
- xbt_dynar_free(&priv->file_descriptor_table);
-
+ delete priv->file_descriptor_table;
free(priv);
}
/** \ingroup m_host_management
* \brief Return the current number MSG hosts.
*/
-int MSG_get_host_number(void)
+int MSG_get_host_number()
{
- return xbt_dict_length(host_list);
+ return sg_host_count();
}
/** \ingroup m_host_management
* \remark The host order in the returned array is generally different from the host creation/declaration order in the
* XML platform (we use a hash table internally)
*/
-xbt_dynar_t MSG_hosts_as_dynar(void) {
+xbt_dynar_t MSG_hosts_as_dynar() {
return sg_hosts_as_dynar();
}
return MSG_host_get_speed(host);
}
-
/** \ingroup m_host_management
* \brief Return the number of cores.
*
* \return the number of cores
*/
int MSG_host_get_core_number(msg_host_t host) {
- return host->core_count();
+ return host->coreCount();
}
/** \ingroup m_host_management
*/
const char *MSG_host_get_property_value(msg_host_t host, const char *name)
{
- return (const char*) xbt_dict_get_or_null(MSG_host_get_properties(host), name);
+ return static_cast<const char*>(xbt_dict_get_or_null(MSG_host_get_properties(host), name));
}
/** \ingroup m_host_management
return host->isOff();
}
-/** \ingroup m_host_management
- * \brief Set the parameters of a given host
- *
- * \param host a host
- * \param params a prameter object
- */
-void MSG_host_set_params(msg_host_t host, vm_params_t params)
-{
- host->setParameters(params);
-}
-
-/** \ingroup m_host_management
- * \brief Get the parameters of a given host
- *
- * \param host a host
- * \param params a prameter object
- */
-void MSG_host_get_params(msg_host_t host, vm_params_t params)
-{
- host->parameters(params);
-}
-
/** \ingroup m_host_management
* \brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref SURF_plugin_energy.
*
*/
double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) {
xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)");
- return host->powerPeakAt(pstate_index);
+ return host->getPstateSpeed(pstate_index);
}
/** \ingroup m_host_management
*/
double MSG_host_get_current_power_peak(msg_host_t host) {
xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)");
- return host->currentPowerPeak();
+ return host->getPstateSpeedCurrent();
}
/** \ingroup m_host_management
xbt_dict_t storage_list = host->mountedStoragesAsDict();
xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
- storage = (msg_storage_t)xbt_lib_get_elm_or_null(storage_lib,storage_name);
+ storage = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib,storage_name));
xbt_dict_t content = simcall_storage_get_content(storage);
xbt_dict_set(contents,mount_name, content,nullptr);
}
int __MSG_host_get_file_descriptor_id(msg_host_t host){
msg_host_priv_t priv = sg_host_msg(host);
- xbt_assert(!xbt_dynar_is_empty(priv->file_descriptor_table), "Too much files are opened! Some have to be closed.");
- return xbt_dynar_pop_as(priv->file_descriptor_table, int);
+ xbt_assert(!priv->file_descriptor_table->empty(), "Too much files are opened! Some have to be closed.");
+ int desc = priv->file_descriptor_table->back();
+ priv->file_descriptor_table->pop_back();
+ return desc;
}
void __MSG_host_release_file_descriptor_id(msg_host_t host, int id){
msg_host_priv_t priv = sg_host_msg(host);
- xbt_dynar_push_as(priv->file_descriptor_table, int, id);
+ priv->file_descriptor_table->push_back(id);
}