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
fix linkage warning
[simgrid.git]
/
src
/
msg
/
msg_host.cpp
diff --git
a/src/msg/msg_host.cpp
b/src/msg/msg_host.cpp
index
e50f818
..
d9bf83d
100644
(file)
--- a/
src/msg/msg_host.cpp
+++ b/
src/msg/msg_host.cpp
@@
-12,6
+12,8
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
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.
*
/** @addtogroup m_host_management
* (#msg_host_t) and the functions for managing it.
*
@@
-31,10
+33,8
@@
msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our paramete
priv->dp_updated_by_deleted_tasks = 0;
priv->is_migrating = 0;
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);
priv->file_descriptor_table = xbt_dynar_new(sizeof(int), nullptr);
- for (int i=
1023
; i>=0;i--)
+ for (int i=
sg_storage_max_file_descriptors-1
; i>=0;i--)
xbt_dynar_push_as(priv->file_descriptor_table, int, i);
sg_host_msg_set(host,priv);
xbt_dynar_push_as(priv->file_descriptor_table, int, i);
sg_host_msg_set(host,priv);
@@
-79,7
+79,7
@@
void *MSG_host_get_data(msg_host_t host) {
*
* \brief Return the location on which the current process is executed.
*/
*
* \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);
}
{
return MSG_process_get_host(nullptr);
}
@@
-119,7
+119,6
@@
void __MSG_host_priv_free(msg_host_priv_t priv)
if (size > 0)
XBT_WARN("dp_objs: %u pending task?", size);
xbt_dict_free(&priv->dp_objs);
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);
free(priv);
xbt_dynar_free(&priv->file_descriptor_table);
free(priv);
@@
-128,7
+127,7
@@
void __MSG_host_priv_free(msg_host_priv_t priv)
/** \ingroup m_host_management
* \brief Return the current number MSG hosts.
*/
/** \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 xbt_dict_length(host_list);
}
@@
-138,7
+137,7
@@
int MSG_get_host_number(void)
* \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)
*/
* \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 sg_hosts_as_dynar();
}
@@
-190,7
+189,7
@@
xbt_swag_t MSG_host_get_process_list(msg_host_t host)
*/
const char *MSG_host_get_property_value(msg_host_t host, const char *name)
{
*/
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
}
/** \ingroup m_host_management
@@
-333,7
+332,7
@@
xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
xbt_dict_t storage_list = host->mountedStoragesAsDict();
xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
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);
}
xbt_dict_t content = simcall_storage_get_content(storage);
xbt_dict_set(contents,mount_name, content,nullptr);
}