-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. 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 "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "simgrid/simix.h"
priv->affinity_mask_db = xbt_dict_new_homogeneous(NULL);
+ priv->file_descriptor_table = xbt_dynar_new(sizeof(int), NULL);
+ for (int i=1023; i>=0;i--)
+ xbt_dynar_push_as(priv->file_descriptor_table, int, i);
+
sg_host_msg_set(host,priv);
return host;
* \param name the name of an host.
* \return the corresponding host
*/
-msg_host_t MSG_host_get_by_name(const char *name)
+msg_host_t MSG_host_by_name(const char *name)
{
return (msg_host_t) xbt_lib_get_elm_or_null(host_lib,name);
}
-static const char *msg_data = "data";
/** \ingroup m_host_management
*
* \brief Set the user data of a #msg_host_t.
* This functions checks whether some data has already been associated to \a host
or not and attach \a data to \a host if it is possible.
*/
-msg_error_t MSG_host_set_data(msg_host_t host, void *data)
-{
- MSG_host_set_property_value(host, msg_data, data, NULL);
+msg_error_t MSG_host_set_data(msg_host_t host, void *data) {
+ sg_host_user_set(host, data);
return MSG_OK;
}
* This functions checks whether \a host is a valid pointer or not and return
the user data associated to \a host if it is possible.
*/
-void *MSG_host_get_data(msg_host_t host)
-{
- return (void *)MSG_host_get_property_value(host, msg_data);
+void *MSG_host_get_data(msg_host_t host) {
+ return sg_host_user(host);
}
/** \ingroup m_host_management
*/
void __MSG_host_priv_free(msg_host_priv_t priv)
{
+
+ if (priv == NULL)
+ return;
unsigned int size = xbt_dict_size(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);
#ifdef MSG_USE_DEPRECATED
free(priv->mailboxes);
#endif
/*
* \brief Destroys a host (internal call only)
*/
-void __MSG_host_destroy(msg_host_t host)
+void __MSG_host_destroy(msg_host_t host) //FIXME: killme?
{
/* TODO:
* What happens if VMs still remain on this host?
* \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_lib_cursor_t cursor;
- char *key;
- void **data;
- xbt_dynar_t res = xbt_dynar_new(sizeof(msg_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);
- }
- }
- return res;
+ return sg_hosts_as_dynar();
}
/** \ingroup m_host_management
{
xbt_assert((h != NULL), "Invalid parameters");
- return (simcall_host_get_speed(h));
+ return sg_host_get_speed(h);
}
{
xbt_assert((host != NULL), "Invalid parameters");
- return (simcall_host_get_core(host));
+ return sg_host_get_core(host);
}
/** \ingroup m_host_management
int MSG_host_is_on(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return (simcall_host_get_state(host));
+ return sg_host_get_state(host);
}
/** @ingroup m_host_management
*
int MSG_host_is_off(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return !(simcall_host_get_state(host));
+ return !(sg_host_get_state(host));
}
/** \ingroup m_host_management
* \param host a host
* \param params a prameter object
*/
-void MSG_host_set_params(msg_host_t host, ws_params_t params)
+void MSG_host_set_params(msg_host_t host, vm_params_t params)
{
simcall_host_set_params(host, params);
}
* \param host a host
* \param params a prameter object
*/
-void MSG_host_get_params(msg_host_t host, ws_params_t params)
+void MSG_host_get_params(msg_host_t host, vm_params_t params)
{
simcall_host_get_params(host, params);
}
* \param host host to test
*/
int MSG_host_get_nb_pstates(msg_host_t host) {
-
- xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return (simcall_host_get_nb_pstates(host));
+ return sg_host_get_nb_pstates(host);
}
/** \ingroup m_host_management
* \param host host to test
*/
int MSG_host_get_pstate(msg_host_t host) {
- return simcall_host_get_pstate(host);
+ return sg_host_get_pstate(host);
}
/** \ingroup m_host_management
*/
double MSG_host_get_consumed_energy(msg_host_t host) {
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return simcall_host_get_consumed_energy(host);
+ return sg_host_get_consumed_energy(host);
}
/** \ingroup m_host_management
* \brief Returns the amount of watt dissipated at the given pstate when the host is idling
double MSG_host_get_wattmax_at(msg_host_t host, int pstate){
return simcall_host_get_wattmax_at(host, pstate);
}
-/** \ingroup m_host_management
- * \brief Set the parameters of a given host
- *
- * \param host a host
- * \param params a prameter object
- */
/** \ingroup m_host_management
* \brief Return the list of mount point names on an host.
xbt_dict_free(&storage_list);
return contents;
}
+
+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);
+}
+
+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);
+}