X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149eacb246aabe7926f62376466d558a102e7c24..4bc35687e386d159ae0fe9e1c8565d644ff6667c:/src/simdag/sd_link.c

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index 3ab7818b95..58e97365d8 100644
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -7,14 +7,22 @@
 /* Creates a link and registers it in SD.
  */
 SD_link_t __SD_link_create(void *surf_link, void *data) {
+
+  SD_link_t link;
+  const char *name;
+
   SD_CHECK_INIT_DONE();
   xbt_assert0(surf_link != NULL, "surf_link is NULL !");
 
-  SD_link_t link = xbt_new0(s_SD_link_t, 1);
+  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(link))
+    link->sharing_policy=SD_LINK_SHARED;
+  else
+    link->sharing_policy=SD_LINK_FATPIPE;
 
-  const char *name = SD_link_get_name(link);
+  name = SD_link_get_name(link);
   xbt_dict_set(sd_global->links, name, link, __SD_link_destroy); /* add the link to the dictionary */
   sd_global->link_count++;
 
@@ -29,24 +37,24 @@ SD_link_t __SD_link_create(void *surf_link, void *data) {
  * \see SD_link_get_number()
  */
 const SD_link_t*  SD_link_get_list(void) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(SD_link_get_number() > 0, "There is no link!");
 
-  SD_link_t *array = sd_global->link_list;
   xbt_dict_cursor_t cursor;
   char *key;
   void *data;
   int i;
+  
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(SD_link_get_number() > 0, "There is no link!");
 
-  if (array == NULL) { /* this is the first time the function is called */
-    array = xbt_new0(SD_link_t, sd_global->link_count);
+  if (sd_global->link_list == NULL) { /* this is the first time the function is called */
+    sd_global->link_list = xbt_new(SD_link_t, sd_global->link_count);
   
     i = 0;
     xbt_dict_foreach(sd_global->links, cursor, key, data) {
-      array[i++] = (SD_link_t) data;
+      sd_global->link_list[i++] = (SD_link_t) data;
     }
   }
-  return array;
+  return sd_global->link_list;
 }
 
 /**
@@ -98,7 +106,7 @@ void SD_link_set_data(SD_link_t link, void *data) {
 const char* SD_link_get_name(SD_link_t link) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
-  return surf_workstation_resource->extension_public->get_link_name(link->surf_link);
+  return surf_workstation_model->extension_public->get_link_name(link->surf_link);
 }
 
 /**
@@ -110,7 +118,34 @@ const char* SD_link_get_name(SD_link_t link) {
 double SD_link_get_current_bandwidth(SD_link_t link) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
-  return surf_workstation_resource->extension_public->get_link_bandwidth(link->surf_link);
+  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));
+
 }
 
 /**
@@ -122,9 +157,24 @@ double SD_link_get_current_bandwidth(SD_link_t link) {
 double SD_link_get_current_latency(SD_link_t link) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
-  return surf_workstation_resource->extension_public->get_link_latency(link->surf_link);
+  return surf_workstation_model->extension_public->get_link_latency(link->surf_link);
+}
+
+/**
+ * \brief Returns the sharing policy of this workstation.
+ *
+ * \param link a link
+ * \return the sharing policyfor the flows going through this link:
+ * SD_LINK_SHARED or SD_LINK_FATPIPE
+ *
+ */
+e_SD_link_sharing_policy_t SD_link_get_sharing_policy (SD_link_t link) {
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(link != NULL, "Invalid parameter");
+  return link->sharing_policy;
 }
 
+ 
 /* Destroys a link.
  */
 void __SD_link_destroy(void *link) {