A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
that was useless.
[simgrid.git]
/
src
/
msg
/
msg_host.cpp
diff --git
a/src/msg/msg_host.cpp
b/src/msg/msg_host.cpp
index
1d369c0
..
28bd9bb
100644
(file)
--- a/
src/msg/msg_host.cpp
+++ b/
src/msg/msg_host.cpp
@@
-29,13
+29,12
@@
msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our paramete
{
msg_host_priv_t priv = xbt_new0(s_msg_host_priv_t, 1);
- priv->dp_objs =
xbt_dict_new()
;
+ priv->dp_objs =
nullptr
;
priv->dp_enabled = 0;
priv->dp_updated_by_deleted_tasks = 0;
priv->is_migrating = 0;
- 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.
+ priv->file_descriptor_table = nullptr;
sg_host_msg_set(host,priv);
@@
-115,7
+114,7
@@
void __MSG_host_priv_free(msg_host_priv_t priv)
{
if (priv == nullptr)
return;
- unsigned int size =
xbt_dict_size(priv->dp_objs)
;
+ unsigned int size =
priv->dp_objs ? xbt_dict_size(priv->dp_objs) : 0
;
if (size > 0)
XBT_WARN("dp_objs: %u pending task?", size);
xbt_dict_free(&priv->dp_objs);
@@
-163,7
+162,7
@@
double MSG_get_host_speed(msg_host_t host) {
* \return the number of cores
*/
int MSG_host_get_core_number(msg_host_t host) {
- return host->core
s
Count();
+ return host->coreCount();
}
/** \ingroup m_host_management
@@
-237,28
+236,6
@@
int MSG_host_is_off(msg_host_t host)
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.
*
@@
-340,6
+317,10
@@
xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
int __MSG_host_get_file_descriptor_id(msg_host_t host){
msg_host_priv_t priv = sg_host_msg(host);
+ if(!priv->file_descriptor_table){
+ 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.
+ }
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();