X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/010ea2bb6479947b8488541f925d8cda99fc72af..f254fadb0d35cf8dbf727769ea4bf6b99a7d5efb:/src/simix/smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index 6b851bc4da..9a19d0886d 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -1,7 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * 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. */
@@ -18,24 +16,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
 smx_host_t __SIMIX_host_create(const char *name,
                                void *workstation, void *data)
 {
-  smx_simdata_host_t simdata = xbt_new0(s_smx_simdata_host_t, 1);
-  smx_host_t host = xbt_new0(s_smx_host_t, 1);
+  smx_host_t smx_host = xbt_new0(s_smx_host_t, 1);
   s_smx_process_t proc;
 
   /* Host structure */
-  host->name = xbt_strdup(name);
-  host->simdata = simdata;
-  host->data = data;
-
-  simdata->host = workstation;
+  smx_host->name = xbt_strdup(name);
+  smx_host->data = data;
+  smx_host->host = workstation;
+  smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
 
-  simdata->process_list =
-    xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
   /* Update global variables */
+  xbt_dict_set(simix_global->host, smx_host->name, smx_host, &__SIMIX_host_destroy);
 
-  xbt_dict_set(simix_global->host, host->name, host, &__SIMIX_host_destroy);
-
-  return host;
+  return smx_host;
 }
 
 /**
@@ -46,7 +39,7 @@ smx_host_t __SIMIX_host_create(const char *name,
  *	\param data User data
  *
  */
-void SIMIX_host_set_data(smx_host_t host, void *data)
+XBT_INLINE void SIMIX_host_set_data(smx_host_t host, void *data)
 {
   xbt_assert0((host != NULL), "Invalid parameters");
   xbt_assert0((host->data == NULL), "Data already set");
@@ -63,12 +56,12 @@ void SIMIX_host_set_data(smx_host_t host, void *data)
  * This functions checks whether \a host is a valid pointer or not and return the user data associated to \a host if it is possible.
  * \param host SIMIX host
  */
-void *SIMIX_host_get_data(smx_host_t host)
+XBT_INLINE void *SIMIX_host_get_data(smx_host_t host)
 {
   xbt_assert0((host != NULL), "Invalid parameters");
 
   /* Return data */
-  return (host->data);
+  return host->data;
 }
 
 /**
@@ -77,14 +70,13 @@ void *SIMIX_host_get_data(smx_host_t host)
  * This functions checks whether \a host is a valid pointer or not and return its name.
  * \param host SIMIX host
  */
-const char *SIMIX_host_get_name(smx_host_t host)
+XBT_INLINE const char *SIMIX_host_get_name(smx_host_t host)
 {
 
-  xbt_assert0((host != NULL)
-              && (host->simdata != NULL), "Invalid parameters");
+  xbt_assert0((host != NULL), "Invalid parameters");
 
   /* Return data */
-  return (host->name);
+  return host->name;
 }
 
 /**
@@ -93,7 +85,7 @@ const char *SIMIX_host_get_name(smx_host_t host)
  * Return the host,  more details in #SIMIX_process_get_host
  * \return SIMIX host
  */
-smx_host_t SIMIX_host_self(void)
+XBT_INLINE smx_host_t SIMIX_host_self(void)
 {
   return SIMIX_process_get_host(SIMIX_process_self());
 }
@@ -106,21 +98,16 @@ smx_host_t SIMIX_host_self(void)
 void __SIMIX_host_destroy(void *h)
 {
   smx_host_t host = (smx_host_t) h;
-  smx_simdata_host_t simdata = NULL;
 
   xbt_assert0((host != NULL), "Invalid parameters");
 
-
   /* Clean Simulator data */
-  simdata = host->simdata;
-
-  if (xbt_swag_size(simdata->process_list) != 0) {
-    char *msg =
-      bprintf("Shutting down host %s, but it's not empty:", host->name);
+  if (xbt_swag_size(host->process_list) != 0) {
+    char *msg = bprintf("Shutting down host %s, but it's not empty:", host->name);
     char *tmp;
     smx_process_t process = NULL;
 
-    xbt_swag_foreach(process, simdata->process_list) {
+    xbt_swag_foreach(process, host->process_list) {
       tmp = bprintf("%s\n\t%s", msg, process->name);
       free(msg);
       msg = tmp;
@@ -128,9 +115,7 @@ void __SIMIX_host_destroy(void *h)
     THROW1(arg_error, 0, "%s", msg);
   }
 
-  xbt_swag_free(simdata->process_list);
-
-  free(simdata);
+  xbt_swag_free(host->process_list);
 
   /* Clean host structure */
   free(host->name);
@@ -144,7 +129,7 @@ void __SIMIX_host_destroy(void *h)
  *
  * \return Number of hosts
  */
-int SIMIX_host_get_number(void)
+XBT_INLINE int SIMIX_host_get_number(void)
 {
   return (xbt_dict_size(simix_global->host));
 }
@@ -174,7 +159,7 @@ smx_host_t *SIMIX_host_get_table(void)
  *
  * \return List of all hosts (as a #xbt_dict_t)
  */
-xbt_dict_t SIMIX_host_get_dict(void)
+XBT_INLINE xbt_dict_t SIMIX_host_get_dict(void)
 {
   return simix_global->host;
 }
@@ -186,12 +171,12 @@ xbt_dict_t SIMIX_host_get_dict(void)
  * \param host SIMIX host
  * \return Speed
  */
-double SIMIX_host_get_speed(smx_host_t host)
+XBT_INLINE double SIMIX_host_get_speed(smx_host_t host)
 {
   xbt_assert0((host != NULL), "Invalid parameters");
 
   return (surf_workstation_model->extension.workstation.
-          get_speed(host->simdata->host, 1.0));
+          get_speed(host->host, 1.0));
 }
 
 /**
@@ -200,12 +185,12 @@ double SIMIX_host_get_speed(smx_host_t host)
  * Return the available speed (in Mflop/s).
  * \return Speed
  */
-double SIMIX_host_get_available_speed(smx_host_t host)
+XBT_INLINE double SIMIX_host_get_available_speed(smx_host_t host)
 {
   xbt_assert0((host != NULL), "Invalid parameters");
 
   return (surf_workstation_model->extension.workstation.
-          get_available_speed(host->simdata->host));
+          get_available_speed(host->host));
 }
 
 /**
@@ -215,7 +200,7 @@ double SIMIX_host_get_available_speed(smx_host_t host)
  * \param name The name of an host.
  * \return The corresponding host
  */
-smx_host_t SIMIX_host_get_by_name(const char *name)
+XBT_INLINE smx_host_t SIMIX_host_get_by_name(const char *name)
 {
   xbt_assert0(((simix_global != NULL)
                && (simix_global->host != NULL)), "Environment not set yet");
@@ -229,12 +214,11 @@ smx_host_t SIMIX_host_get_by_name(const char *name)
  * \param host a host
  * \return the dynamic array consisting of property names
  */
-xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
+XBT_INLINE xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
-
-  return surf_workstation_model->extension.workstation.get_properties(host->simdata->host);
+  xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
 
+  return surf_workstation_model->extension.workstation.get_properties(host->host);
 }
 
 
@@ -245,11 +229,10 @@ xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
  * \param host The SIMIX host
  * \return 1 if host is available or 0 if not.
  */
-int SIMIX_host_get_state(smx_host_t host)
+XBT_INLINE int SIMIX_host_get_state(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
+  xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
 
   return (surf_workstation_model->extension.workstation.
-          get_state(host->simdata->host));
-
+          get_state(host->host));
 }