X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6692e68ddfe1ef3234cacab53edb44277ae4405..6443d4868c5974225d792156daf319775234b087:/src/msg/host.c
diff --git a/src/msg/host.c b/src/msg/host.c
index 11aa69a61b..d1425a2cba 100644
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -1,40 +1,61 @@
-/* $Id$ */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(host, msg,
- "Logging specific to MSG (host)");
+#include "msg/private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "mailbox.h"
+
+/** \defgroup m_host_management Management functions of Hosts
+ * \brief This section describes the host structure of MSG
+ */
+/** @addtogroup m_host_management
+ * \htmlonly \endhtmlonly
+ * (#m_host_t) and the functions for managing it.
+ *
+ * A location (or host) is any possible place where
+ * a process may run. Thus it may be represented as a
+ * physical resource with computing capabilities, some
+ * mailboxes to enable running process to communicate with
+ * remote ones, and some private data that can be only
+ * accessed by local process.
+ * \see m_host_t
+ */
/********************************* Host **************************************/
-m_host_t __MSG_host_create(const char *name,
- void *workstation,
- void *data)
+m_host_t __MSG_host_create(smx_host_t workstation, void *data)
{
- simdata_host_t simdata = xbt_new0(s_simdata_host_t,1);
- m_host_t host = xbt_new0(s_m_host_t,1);
+ const char *name;
+ simdata_host_t simdata = xbt_new0(s_simdata_host_t, 1);
+ m_host_t host = xbt_new0(s_m_host_t, 1);
int i;
+ char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
+
+ name = SIMIX_host_get_name(workstation);
/* Host structure */
host->name = xbt_strdup(name);
host->simdata = simdata;
host->data = data;
- simdata->host = workstation;
+ simdata->smx_host = workstation;
- simdata->mbox = xbt_new0(xbt_fifo_t, msg_global->max_channel);
- for (i = 0; i < msg_global->max_channel; i++)
- simdata->mbox[i] = xbt_fifo_new();
- simdata->sleeping = xbt_new0(m_process_t, msg_global->max_channel);
- simdata->process_list = xbt_fifo_new();
- /* Update global variables */
+ if (msg_global->max_channel > 0)
+ simdata->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel);
- xbt_fifo_push(msg_global->host, host);
+ for (i = 0; i < msg_global->max_channel; i++) {
+ sprintf(alias, "%s:%d", name, i);
+
+ /* the key of the mailbox (in this case) is build from the name of the host and the channel number */
+ simdata->mailboxes[i] = MSG_mailbox_new(alias);
+ memset(alias, 0, MAX_ALIAS_NAME + 1);
+ }
+
+ SIMIX_req_host_set_data(workstation, host);
+ xbt_lib_set(host_lib,name,MSG_HOST_LEVEL,host);
return host;
}
@@ -48,8 +69,8 @@ m_host_t __MSG_host_create(const char *name,
*/
MSG_error_t MSG_host_set_data(m_host_t host, void *data)
{
- xbt_assert0((host!=NULL), "Invalid parameters");
- xbt_assert0((host->data == NULL), "Data already set");
+ xbt_assert((host != NULL), "Invalid parameters");
+ xbt_assert((host->data == NULL), "Data already set");
/* Assign data */
host->data = data;
@@ -67,7 +88,7 @@ MSG_error_t MSG_host_set_data(m_host_t host, void *data)
void *MSG_host_get_data(m_host_t host)
{
- xbt_assert0((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
/* Return data */
return (host->data);
@@ -83,7 +104,8 @@ void *MSG_host_get_data(m_host_t host)
const char *MSG_host_get_name(m_host_t host)
{
- xbt_assert0((host != NULL) && (host->simdata != NULL), "Invalid parameters");
+ xbt_assert((host != NULL)
+ && (host->simdata != NULL), "Invalid parameters");
/* Return data */
return (host->name);
@@ -98,36 +120,27 @@ m_host_t MSG_host_self(void)
return MSG_process_get_host(MSG_process_self());
}
-/*
- * Real function for destroy a host.
- * MSG_host_destroy is just a front_end that also removes it from
- * msg_global->host
+/** \ingroup m_host_management
+ *
+ * \brief Destroys a host
*/
void __MSG_host_destroy(m_host_t host)
{
simdata_host_t simdata = NULL;
- int i = 0;
- xbt_assert0((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
- /* Clean Simulator data */
+ /* Clean simulator data */
simdata = (host)->simdata;
- for (i = 0; i < msg_global->max_channel; i++)
- xbt_fifo_free(simdata->mbox[i]);
- xbt_free(simdata->mbox);
- xbt_free(simdata->sleeping);
- xbt_assert0((xbt_fifo_size(simdata->process_list)==0),
- "Some process are still running on this host");
- xbt_fifo_free(simdata->process_list);
+ if (msg_global->max_channel > 0)
+ free(simdata->mailboxes);
- xbt_free(simdata);
+ free(simdata);
/* Clean host structure */
- xbt_free(host->name);
- xbt_free(host);
-
- return;
+ free(host->name);
+ free(host);
}
/** \ingroup m_host_management
@@ -135,7 +148,7 @@ void __MSG_host_destroy(m_host_t host)
*/
int MSG_get_host_number(void)
{
- return (xbt_fifo_size(msg_global->host));
+ return host_lib->count;
}
/** \ingroup m_host_management
@@ -143,7 +156,23 @@ int MSG_get_host_number(void)
*/
m_host_t *MSG_get_host_table(void)
{
- return ((m_host_t *)xbt_fifo_to_array(msg_global->host));
+ void **array;
+ int i = 0;
+ xbt_lib_cursor_t cursor;
+ char *key;
+ void **data;
+
+ if (host_lib->count == 0)
+ return NULL;
+ else
+ array = xbt_new0(void *, host_lib->count);
+
+ xbt_lib_foreach(host_lib, cursor, key, data) {
+ if(get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST)
+ array[i++] = data[MSG_HOST_LEVEL];
+ }
+
+ return (m_host_t *)array;
}
/** \ingroup m_host_management
@@ -152,9 +181,56 @@ m_host_t *MSG_get_host_table(void)
*/
int MSG_get_host_msgload(m_host_t h)
{
- xbt_assert0((h!= NULL), "Invalid parameters");
- xbt_assert0(0, "Not implemented yet");
+ xbt_assert((h != NULL), "Invalid parameters");
+ xbt_die( "Not implemented yet");
+
+ return (0);
+}
+
+/** \ingroup m_host_management
+ * \brief Return the speed of the processor (in flop/s), regardless of
+ the current load on the machine.
+ */
+double MSG_get_host_speed(m_host_t h)
+{
+ xbt_assert((h != NULL), "Invalid parameters");
+
+ return (SIMIX_req_host_get_speed(h->simdata->smx_host));
+}
- return(0);
-/* return(surf_workstation_resource->extension_public->get_load(h->simdata->host)); */
+/** \ingroup m_host_management
+ * \brief Returns the value of a given host property
+ *
+ * \param host a host
+ * \param name a property name
+ * \return value of a property (or NULL if property not set)
+ */
+const char *MSG_host_get_property_value(m_host_t host, const char *name)
+{
+ return xbt_dict_get_or_null(MSG_host_get_properties(host), name);
+}
+
+/** \ingroup m_host_management
+ * \brief Returns a xbt_dynar_t consisting of the list of properties assigned to this host
+ *
+ * \param host a host
+ * \return a dict containing the properties
+ */
+xbt_dict_t MSG_host_get_properties(m_host_t host)
+{
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+
+ return (SIMIX_req_host_get_properties(host->simdata->smx_host));
+}
+
+
+/** \ingroup msg_gos_functions
+ * \brief Determine if a host is available.
+ *
+ * \param h host to test
+ */
+int MSG_host_is_avail(m_host_t h)
+{
+ xbt_assert((h != NULL), "Invalid parameters (host is NULL)");
+ return (SIMIX_req_host_get_state(h->simdata->smx_host));
}