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

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index 3ab7818b95..9a6d4c75ad 100644
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -6,20 +6,30 @@
 
 /* Creates a link and registers it in SD.
  */
-SD_link_t __SD_link_create(void *surf_link, void *data) {
+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 */
+  link->data = data;            /* user data */
+  if (surf_workstation_model->extension.workstation.link_shared(surf_link))
+    link->sharing_policy = SD_LINK_SHARED;
+  else
+    link->sharing_policy = SD_LINK_FATPIPE;
 
-  const char *name = SD_link_get_name(link);
-  xbt_dict_set(sd_global->links, name, link, __SD_link_destroy); /* add the link to the dictionary */
+  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++;
 
   return link;
 }
+
 /**
  * \brief Returns the link list
  *
@@ -28,25 +38,26 @@ SD_link_t __SD_link_create(void *surf_link, void *data) {
  * \return an array of \ref SD_link_t containing all links
  * \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!");
+const SD_link_t *SD_link_get_list(void)
+{
 
-  SD_link_t *array = sd_global->link_list;
   xbt_dict_cursor_t cursor;
   char *key;
   void *data;
   int i;
 
-  if (array == NULL) { /* this is the first time the function is called */
-    array = xbt_new0(SD_link_t, sd_global->link_count);
-  
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(SD_link_get_number() > 0, "There is no link!");
+
+  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;
 }
 
 /**
@@ -55,7 +66,8 @@ const SD_link_t*  SD_link_get_list(void) {
  * \return the number of existing links
  * \see SD_link_get_list()
  */
-int SD_link_get_number(void) {
+int SD_link_get_number(void)
+{
   SD_CHECK_INIT_DONE();
   return sd_global->link_count;
 }
@@ -67,7 +79,8 @@ int SD_link_get_number(void) {
  * \return the user data associated with this link (can be \c NULL)
  * \see SD_link_set_data()
  */
-void* SD_link_get_data(SD_link_t link) {
+void *SD_link_get_data(SD_link_t link)
+{
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
   return link->data;
@@ -83,7 +96,8 @@ void* SD_link_get_data(SD_link_t link) {
  * \param data the new data you want to associate with this link
  * \see SD_link_get_data()
  */
-void SD_link_set_data(SD_link_t link, void *data) {
+void SD_link_set_data(SD_link_t link, void *data)
+{
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
   link->data = data;
@@ -95,22 +109,25 @@ void SD_link_set_data(SD_link_t link, void *data) {
  * \param link a link
  * \return the name of this link (cannot be \c NULL)
  */
-const char* SD_link_get_name(SD_link_t link) {
+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_resource_name(link->surf_link);
 }
 
 /**
  * \brief Returns the current bandwidth of a link
  *
  * \param link a link
- * \return the current bandwidth of this link, in Flops
+ * \return the current bandwidth of this link, in bytes per second
  */
-double SD_link_get_current_bandwidth(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.workstation.
+    get_link_bandwidth(link->surf_link);
 }
 
 /**
@@ -119,18 +136,36 @@ double SD_link_get_current_bandwidth(SD_link_t link) {
  * \param link a link
  * \return the current latency of this link, in seconds
  */
-double SD_link_get_current_latency(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_model->extension.workstation.
+    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 surf_workstation_resource->extension_public->get_link_latency(link->surf_link);
+  return link->sharing_policy;
 }
 
+
 /* Destroys a link.
  */
-void __SD_link_destroy(void *link) {
+void __SD_link_destroy(void *link)
+{
   SD_CHECK_INIT_DONE();
   xbt_assert0(link != NULL, "Invalid parameter");
   /* link->surf_link is freed by surf_exit and link->data is freed by the user */
   xbt_free(link);
 }
-