X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c06c178342da8b6df3c53a91107bae2078b45fb..80f442e05f4079b95d52af88f58374dcbc3a8f72:/src/msg/host.c
diff --git a/src/msg/host.c b/src/msg/host.c
index 3a9b652e00..8e2fd41cdf 100644
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -5,11 +5,22 @@
/* 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 "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
+ * (#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,
@@ -36,6 +47,8 @@ m_host_t __MSG_host_create(const char *name,
xbt_fifo_push(msg_global->host, host);
+ PAJE_HOST_NEW(host);
+
return host;
}
@@ -98,7 +111,7 @@ 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
@@ -110,22 +123,24 @@ void __MSG_host_destroy(m_host_t host)
xbt_assert0((host != NULL), "Invalid parameters");
+ PAJE_HOST_FREE(host);
+
/* 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);
+ 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);
- xbt_free(simdata);
+ free(simdata);
/* Clean host structure */
- xbt_free(host->name);
- xbt_free(host);
+ free(host->name);
+ free(host);
return;
}
@@ -158,3 +173,15 @@ int MSG_get_host_msgload(m_host_t h)
return(0);
/* return(surf_workstation_resource->extension_public->get_load(h->simdata->host)); */
}
+
+/** \ingroup m_host_management
+ * \brief Return the speed of the processor (in Mflop/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(surf_workstation_resource->
+ extension_public->get_speed(h->simdata->host,1.0));
+}