X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9b94bc9be0c3ad5b5f816bf343152a3617a1bc2..cf32c9356ac20e42528e2d1ce2f718cc5bd82730:/src/msg/host.c

diff --git a/src/msg/host.c b/src/msg/host.c
index c2d6a76acf..87644778a0 100644
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -5,14 +5,14 @@
 /* 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
+ * 
+ *     \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Hosts" --> \endhtmlonly
  * (#m_host_t) and the functions for managing it.
  *  
  *  A <em>location</em> (or <em>host</em>) is any possible place where
@@ -47,7 +47,7 @@ m_host_t __MSG_host_create(const char *name,
   simdata->process_list = xbt_fifo_new();
   /* Update global variables */
 
-  xbt_fifo_push(msg_global->host, host);
+  xbt_fifo_unshift(msg_global->host, host);
 
   PAJE_HOST_NEW(host);
 
@@ -132,17 +132,17 @@ void __MSG_host_destroy(m_host_t host)
 
   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;
 }
@@ -175,3 +175,34 @@ 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 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(surf_workstation_resource->
+	 extension_public->get_speed(h->simdata->host,1.0));
+}
+
+/** \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)
+{
+  e_surf_cpu_state_t cpustate;
+  xbt_assert0((h!= NULL), "Invalid parameters");
+
+  cpustate =
+    surf_workstation_resource->extension_public->get_state(h->simdata->host);
+
+  xbt_assert0((cpustate == SURF_CPU_ON || cpustate == SURF_CPU_OFF),
+	      "Invalid cpu state");
+
+  return (cpustate==SURF_CPU_ON);
+}