X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7db7b59e316e1b7e892fa60cca48bd6f857bb819..504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779:/src/msg/host.c
diff --git a/src/msg/host.c b/src/msg/host.c
index eafbe75794..2b933f9ee0 100644
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -1,39 +1,58 @@
-/* $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"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"
+
+/** \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)
{
- sim_data_host_t sim_data = xbt_new0(s_sim_data_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;
+ name = SIMIX_host_get_name(workstation);
/* Host structure */
host->name = xbt_strdup(name);
- host->simdata = sim_data;
+ host->simdata = simdata;
host->data = data;
- sim_data->host = workstation;
+ simdata->smx_host = workstation;
- sim_data->mbox = xbt_new0(xbt_fifo_t, msg_global->max_channel);
+ simdata->mbox = xbt_new0(xbt_fifo_t, msg_global->max_channel);
for (i = 0; i < msg_global->max_channel; i++)
- sim_data->mbox[i] = xbt_fifo_new();
- sim_data->sleeping = xbt_new0(m_process_t, msg_global->max_channel);
- /* Update global variables */
+ simdata->mbox[i] = xbt_fifo_new();
- xbt_fifo_push(msg_global->host, host);
+ 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;
}
@@ -47,7 +66,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 */
@@ -82,7 +101,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);
@@ -97,33 +117,32 @@ m_host_t MSG_host_self(void)
return MSG_process_get_host(MSG_process_self());
}
-/**
- * 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
*/
void __MSG_host_destroy(m_host_t host)
{
- sim_data_host_t sim_data = NULL;
+ simdata_host_t simdata = NULL;
int i = 0;
xbt_assert0((host != NULL), "Invalid parameters");
/* Clean Simulator data */
- sim_data = (host)->simdata;
+ /* SIMIX host will be cleaned when MSG_clean calls SIMIX_clean */
+ simdata = (host)->simdata;
for (i = 0; i < msg_global->max_channel; i++)
- xbt_fifo_free(sim_data->mbox[i]);
- xbt_free(sim_data->mbox);
- xbt_free(sim_data->sleeping);
- xbt_assert0((xbt_swag_size(&(sim_data->process_list))==0),
- "Some process are still running on this host");
-
- xbt_free(sim_data);
+ xbt_fifo_free(simdata->mbox[i]);
+ free(simdata->mbox);
+ free(simdata->sleeping);
+ SIMIX_mutex_destroy(simdata->mutex);
+ free(simdata);
/* Clean host structure */
- xbt_free(host->name);
- xbt_free(host);
+ free(host->name);
+ free(host);
return;
}
@@ -141,7 +160,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
@@ -150,9 +169,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 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");
+
+ return (SIMIX_host_get_speed(h->simdata->smx_host));
+}
+
+/** \ingroup m_host_management
+ * \brief Returns the value of a certain host property
+ *
+ * \param host a host
+ * \param name a property name
+ * \return value of a property
+ */
+const char* MSG_host_get_property_value(m_host_t host, 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_assert0((host != NULL), "Invalid parameters");
+
+ return (SIMIX_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_assert0((h != NULL), "Invalid parameters");
+ return (SIMIX_host_get_state(h->simdata->smx_host));
}