Kill SD_link_get_properties: hard to maintain and makes very little sense (Shout...

[simgrid.git] / src / simdag / sd_link.c

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index e01a100..9a6d4c7 100644 (file)
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -18,7 +18,7 @@ SD_link_t __SD_link_create(void *surf_link, void *data)
   link = xbt_new(s_SD_link_t, 1);
   link->surf_link = surf_link;
   link->data = data;            /* user data */
-  if (surf_workstation_model->extension_public->link_shared(surf_link))
+  if (surf_workstation_model->extension.workstation.link_shared(surf_link))
     link->sharing_policy = SD_LINK_SHARED;
   else
     link->sharing_policy = SD_LINK_FATPIPE;
@@ -113,8 +113,7 @@ const char *SD_link_get_name(SD_link_t link)
 {
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
-  return surf_workstation_model->extension_public->get_link_name(link->
-                                                                 surf_link);
+  return surf_resource_name(link->surf_link);
 }
 
 /**
@@ -127,36 +126,8 @@ double SD_link_get_current_bandwidth(SD_link_t link)
 {
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
-  return surf_workstation_model->extension_public->get_link_bandwidth(link->
-                                                                      surf_link);
-}
-
-/**
- * \brief Returns the value of a given link property
- *
- * \param link the inspected link
- * \param name a property name
- * \return value of a property (or NULL if property not set)
- */
-const char *SD_link_get_property_value(SD_link_t link, const char *name)
-{
-  return xbt_dict_get_or_null(SD_link_get_properties(link), name);
-}
-
-/**
- * \brief Returns a #xbt_dict_t consisting of the list of properties assigned to a link
- *
- * \param link a link
- * \return the dictionary containing the properties associated with the link
- */
-xbt_dict_t SD_link_get_properties(SD_link_t link)
-{
-  SD_CHECK_INIT_DONE();
-  xbt_assert0((link != NULL), "Invalid parameters");
-
-  return (surf_workstation_model->common_public->
-          get_properties(link->surf_link));
-
+  return surf_workstation_model->extension.workstation.
+    get_link_bandwidth(link->surf_link);
 }
 
 /**
@@ -169,8 +140,8 @@ double SD_link_get_current_latency(SD_link_t link)
 {
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
-  return surf_workstation_model->extension_public->get_link_latency(link->
-                                                                    surf_link);
+  return surf_workstation_model->extension.workstation.
+    get_link_latency(link->surf_link);
 }
 
 /**