Last bits of convertion from xbt_error_t to exceptions. Some more cleanups (mainly...

[simgrid.git] / src / msg / host.c

diff --git a/src/msg/host.c b/src/msg/host.c
index eafbe75..17249ba 100644 (file)
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -5,36 +5,52 @@
 /* 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"
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(host, msg,
                                "Logging specific to MSG (host)");
 
+/** \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 <em>location</em> (or <em>host</em>) is any possible place where
+ *  a process may run. Thus it may be represented as a
+ *  <em>physical resource with computing capabilities</em>, some
+ *  <em>mailboxes</em> to enable running process to communicate with
+ *  remote ones, and some <em>private data</em> 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)
 {
-  sim_data_host_t sim_data = xbt_new0(s_sim_data_host_t,1);
+  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 = sim_data;
+  host->simdata = simdata;
   host->data = data;
 
-  sim_data->host = workstation;
+  simdata->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);
+    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;
 }
 
@@ -97,33 +113,36 @@ 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
  */
 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");
 
+  PAJE_HOST_FREE(host);
+ 
   /* Clean Simulator data */
-  sim_data = (host)->simdata;
+  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),
+    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);
 
-  xbt_free(sim_data);
+  free(simdata);
 
   /* Clean host structure */
-  xbt_free(host->name);
-  xbt_free(host);
+  free(host->name);
+  free(host);
 
   return;
 }
@@ -156,3 +175,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));
+}