X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4ed74ca6d4a744d2956a4f2906c897e1886cefd..cbedb536b5462febbf3ccff143ce5e298a983b87:/src/simdag/sd_workstation.c

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index e7062c2689..7a4a17cecf 100644
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2014. The SimGrid Team.
+/* Copyright (c) 2006-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -17,20 +17,16 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd,
 
 /* Creates a workstation and registers it in SD.
  */
-SD_workstation_t __SD_workstation_create(void *surf_workstation,
-                                         void *data)
+SD_workstation_t __SD_workstation_create(const char *name)
 {
 
   SD_workstation_priv_t workstation;
-  const char *name;
 
   workstation = xbt_new(s_SD_workstation_priv_t, 1);
-  workstation->data = data;     /* user data */
   workstation->access_mode = SD_WORKSTATION_SHARED_ACCESS;      /* default mode is shared */
   workstation->task_fifo = NULL;
   workstation->current_task = NULL;
 
-  name = surf_resource_name(surf_workstation);
   sg_host_t sg_host = sg_host_by_name(name);
   sg_host_sd_set(sg_host,workstation);
   return sg_host;
@@ -72,7 +68,7 @@ void __SD_storage_destroy(void *storage)
  */
 SD_workstation_t SD_workstation_get_by_name(const char *name)
 {
-  return xbt_lib_get_elm_or_null(host_lib, name);
+  return sg_host_by_name(name);
 }
 
 /**
@@ -101,7 +97,7 @@ const SD_workstation_t *SD_workstation_get_list(void) {
  */
 int SD_workstation_get_number(void)
 {
-  return xbt_lib_length(host_lib);
+  return sg_host_count();
 }
 
 /**
@@ -113,7 +109,7 @@ int SD_workstation_get_number(void)
  */
 void *SD_workstation_get_data(SD_workstation_t workstation)
 {
-  return sg_host_sd(workstation)->data;
+  return sg_host_user(workstation);
 }
 
 /**
@@ -128,7 +124,7 @@ void *SD_workstation_get_data(SD_workstation_t workstation)
  */
 void SD_workstation_set_data(SD_workstation_t workstation, void *data)
 {
-	sg_host_sd(workstation)->data = data;
+	sg_host_user_set(workstation, data);
 }
 
 /**
@@ -139,7 +135,7 @@ void SD_workstation_set_data(SD_workstation_t workstation, void *data)
  */
 const char *SD_workstation_get_name(SD_workstation_t workstation)
 {
-  return sg_host_name(workstation);
+  return sg_host_get_name(workstation);
 }
 
 /**
@@ -164,7 +160,7 @@ const char *SD_workstation_get_property_value(SD_workstation_t ws,
  */
 xbt_dict_t SD_workstation_get_properties(SD_workstation_t workstation)
 {
-  return surf_host_get_properties(surf_host_resource_priv(workstation));
+  return sg_host_get_properties(workstation);
 }