Add doc for new models and simcall

[simgrid.git] / src / msg / msg_host.c

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index 9e45fce..627b1e6 100644 (file)
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2013. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -35,8 +35,8 @@ msg_host_t __MSG_host_create(smx_host_t workstation)
   int i;
   char alias[MAX_ALIAS_NAME + 1] = { 0 };       /* buffer used to build the key of the mailbox */
 
-  if (msg_global->max_channel > 0)
-    priv->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel);
+  priv->mailboxes = (msg_global->max_channel > 0) ?
+    xbt_new0(msg_mailbox_t, msg_global->max_channel) : NULL;
 
   for (i = 0; i < msg_global->max_channel; i++) {
     sprintf(alias, "%s:%d", name, i);
@@ -72,32 +72,6 @@ msg_host_t MSG_get_host_by_name(const char *name)
   return (msg_host_t) xbt_lib_get_elm_or_null(host_lib,name);
 }
 
-/** \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)
-{
-  SIMIX_host_set_data(host,data);
-
-  return MSG_OK;
-}
-
-/** \ingroup m_host_management
- *
- * \brief Return the user data of a #msg_host_t.
- *
- * 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 SIMIX_host_get_data(host);
-}
-
 /** \ingroup m_host_management
  *
  * \brief Return the name of the #msg_host_t.
@@ -147,8 +121,7 @@ void __MSG_host_priv_free(msg_host_priv_t priv)
   xbt_dict_free(&priv->affinity_mask_db);
 
 #ifdef MSG_USE_DEPRECATED
-  if (msg_global->max_channel > 0)
-    free(priv->mailboxes);
+  free(priv->mailboxes);
 #endif
 
   free(priv);
@@ -318,15 +291,16 @@ int MSG_host_is_avail(msg_host_t host)
   xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
   return (simcall_host_get_state(host));
 }
+
 /** \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 ind_pm, ws_params_t params)
+void MSG_host_set_params(msg_host_t host, ws_params_t params)
 {
-  simcall_host_set_params(ind_pm, params);
+  simcall_host_set_params(host, params);
 }
 
 /** \ingroup m_host_management
@@ -335,9 +309,9 @@ void MSG_host_set_params(msg_host_t ind_pm, ws_params_t params)
  * \param host a host
  * \param params a prameter object
  */
-void MSG_host_get_params(msg_host_t ind_pm, ws_params_t params)
+void MSG_host_get_params(msg_host_t host, ws_params_t params)
 {
-  simcall_host_get_params(ind_pm, params);
+  simcall_host_get_params(host, params);
 }
 
 /** \ingroup m_host_management