X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/142a2b7199760634b6874308c862657bf5dd6cf1..f1b86374a5c9d3f40f72910eaa68ad5ff7bd5a93:/src/msg/host.c
diff --git a/src/msg/host.c b/src/msg/host.c
index cb042bf386..98668736fa 100644
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -1,16 +1,22 @@
-/* $Id$ */
+/* $Id$ */
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2002-2007 Arnaud Legrand. */
+/* Copyright (c) 2007 Bruno Donassolo. */
+/* 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 "msg/private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
+#include "msg_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
@@ -23,33 +29,46 @@
*/
/********************************* 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);
- int i;
-
- /* Host structure */
- host->name = xbt_strdup(name);
- host->simdata = simdata;
- host->data = data;
-
- simdata->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 */
-
- xbt_fifo_push(msg_global->host, host);
-
- PAJE_HOST_NEW(host);
-
- return host;
+ 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 */
+ msg_mailbox_t mailbox;
+
+ name = SIMIX_host_get_name(workstation);
+ /* Host structure */
+ host->name = xbt_strdup(name);
+ host->simdata = simdata;
+ host->data = data;
+
+ simdata->smx_host = workstation;
+
+ simdata->mbox = xbt_new0(xbt_fifo_t, msg_global->max_channel);
+
+ 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 */
+ mailbox = MSG_mailbox_new(alias);
+ MSG_mailbox_set_hostname(mailbox,name);
+ memset(alias,0,MAX_ALIAS_NAME +1);
+
+ simdata->mbox[i] = xbt_fifo_new();
+ }
+
+ simdata->sleeping = xbt_new0(smx_cond_t, msg_global->max_channel);
+ simdata->mutex = SIMIX_mutex_init();
+ SIMIX_host_set_data(workstation, host);
+
+ /* Update global variables */
+ xbt_fifo_unshift(msg_global->host, host);
+
+ return host;
}
/** \ingroup m_host_management
@@ -61,7 +80,7 @@ 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 != NULL), "Invalid parameters");
xbt_assert0((host->data == NULL), "Data already set");
/* Assign data */
@@ -96,7 +115,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_assert0((host != NULL)
+ && (host->simdata != NULL), "Invalid parameters");
/* Return data */
return (host->name);
@@ -112,7 +132,7 @@ m_host_t MSG_host_self(void)
}
/*
- * Real function for destroy a host.
+ * Real function to destroy a host.
* MSG_host_destroy is just a front_end that also removes it from
* msg_global->host
*/
@@ -120,22 +140,26 @@ void __MSG_host_destroy(m_host_t host)
{
simdata_host_t simdata = NULL;
int i = 0;
+ char alias[MAX_ALIAS_NAME +1] = {0}; /* buffer used to build the key of the mailbox */
xbt_assert0((host != NULL), "Invalid parameters");
- PAJE_HOST_FREE(host);
-
/* Clean Simulator data */
+ /* SIMIX host will be cleaned when MSG_clean calls SIMIX_clean */
simdata = (host)->simdata;
for (i = 0; i < msg_global->max_channel; i++)
+ {
+ sprintf(alias,"%s:%d",host->name,i);
+ xbt_dict_remove(MSG_get_mailboxes(),alias);
+ memset(alias,0,MAX_ALIAS_NAME +1);
+
xbt_fifo_free(simdata->mbox[i]);
+ }
+
free(simdata->mbox);
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);
-
+ SIMIX_mutex_destroy(simdata->mutex);
free(simdata);
/* Clean host structure */
@@ -158,7 +182,7 @@ 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));
+ return ((m_host_t *) xbt_fifo_to_array(msg_global->host));
}
/** \ingroup m_host_management
@@ -167,39 +191,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((h != NULL), "Invalid parameters");
xbt_assert0(0, "Not implemented yet");
- return(0);
-/* return(surf_workstation_resource->extension_public->get_load(h->simdata->host)); */
+ return (0);
}
/** \ingroup m_host_management
- * \brief Return the speed of the processor (in Mflop/s), regardless of
+ * \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_assert0((h!= NULL), "Invalid parameters");
+ xbt_assert0((h != NULL), "Invalid parameters");
- return(surf_workstation_resource->
- extension_public->get_speed(h->simdata->host,1.0));
+ return (SIMIX_host_get_speed(h->simdata->smx_host));
}
-/** \ingroup msg_gos_functions
- * \brief Determine if a host is available.
+/** \ingroup m_host_management
+ * \brief Returns the value of a given host property
*
- * \param h host to test
+ * \param host a host
+ * \param name a property name
+ * \return value of a property (or NULL if property not set)
*/
-int MSG_host_is_avail (m_host_t h)
+const char* MSG_host_get_property_value(m_host_t host, const char* name)
{
- xbt_assert0((h!= NULL), "Invalid parameters");
+ return xbt_dict_get_or_null(MSG_host_get_properties(host), name);
+}
- e_surf_cpu_state_t cpustate =
- surf_workstation_resource->extension_public->get_state(h->simdata->host);
+/** \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_assert0((host != NULL), "Invalid parameters");
- xbt_assert0((cpustate == SURF_CPU_ON || cpustate == SURF_CPU_OFF),
- "Invalid cpu state");
+ return (SIMIX_host_get_properties(host->simdata->smx_host));
+}
- return (cpustate==SURF_CPU_ON);
+
+/** \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_assert0((h != NULL), "Invalid parameters");
+ return (SIMIX_host_get_state(h->simdata->smx_host));
}