X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..7ad4d29624370296a9e4683136f8f64147790ead:/src/simdag/sd_link.c

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index 9533ca4e3a..c69d93c745 100644
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -19,7 +19,7 @@ SD_link_t __SD_link_create(void *surf_link, void *data)
   const char *name;
 
   SD_CHECK_INIT_DONE();
-  xbt_assert0(surf_link != NULL, "surf_link is NULL !");
+  xbt_assert(surf_link != NULL, "surf_link is NULL !");
 
   link = xbt_new(s_SD_link_t, 1);
   link->surf_link = surf_link;
@@ -30,8 +30,7 @@ SD_link_t __SD_link_create(void *surf_link, void *data)
     link->sharing_policy = SD_LINK_FATPIPE;
 
   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++;
+  xbt_lib_set(link_lib,name,SD_LINK_LEVEL,link);
 
   return link;
 }
@@ -47,20 +46,20 @@ SD_link_t __SD_link_create(void *surf_link, void *data)
 const SD_link_t *SD_link_get_list(void)
 {
 
-  xbt_dict_cursor_t cursor;
+  xbt_lib_cursor_t cursor;
   char *key;
-  void *data;
+  void **data;
   int i;
 
   SD_CHECK_INIT_DONE();
-  xbt_assert0(SD_link_get_number() > 0, "There is no link!");
+  xbt_assert(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);
+    sd_global->link_list = xbt_new(SD_link_t, link_lib->count);
 
     i = 0;
-    xbt_dict_foreach(sd_global->links, cursor, key, data) {
-      sd_global->link_list[i++] = (SD_link_t) data;
+    xbt_lib_foreach(link_lib, cursor, key, data) {
+    		sd_global->link_list[i++] = (SD_link_t) data[SD_LINK_LEVEL];
     }
   }
   return sd_global->link_list;
@@ -75,7 +74,7 @@ const SD_link_t *SD_link_get_list(void)
 int SD_link_get_number(void)
 {
   SD_CHECK_INIT_DONE();
-  return sd_global->link_count;
+  return link_lib->count;
 }
 
 /**
@@ -88,7 +87,7 @@ int SD_link_get_number(void)
 void *SD_link_get_data(SD_link_t link)
 {
   SD_CHECK_INIT_DONE();
-  xbt_assert0(link != NULL, "Invalid parameter");
+  xbt_assert(link != NULL, "Invalid parameter");
   return link->data;
 }
 
@@ -105,7 +104,7 @@ void *SD_link_get_data(SD_link_t link)
 void SD_link_set_data(SD_link_t link, void *data)
 {
   SD_CHECK_INIT_DONE();
-  xbt_assert0(link != NULL, "Invalid parameter");
+  xbt_assert(link != NULL, "Invalid parameter");
   link->data = data;
 }
 
@@ -118,7 +117,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");
+  xbt_assert(link != NULL, "Invalid parameter");
   return surf_resource_name(link->surf_link);
 }
 
@@ -131,7 +130,7 @@ 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");
+  xbt_assert(link != NULL, "Invalid parameter");
   return surf_workstation_model->extension.workstation.
       get_link_bandwidth(link->surf_link);
 }
@@ -145,7 +144,7 @@ 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");
+  xbt_assert(link != NULL, "Invalid parameter");
   return surf_workstation_model->extension.workstation.
       get_link_latency(link->surf_link);
 }
@@ -161,7 +160,7 @@ double SD_link_get_current_latency(SD_link_t link)
 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");
+  xbt_assert(link != NULL, "Invalid parameter");
   return link->sharing_policy;
 }
 
@@ -171,7 +170,7 @@ e_SD_link_sharing_policy_t SD_link_get_sharing_policy(SD_link_t link)
 void __SD_link_destroy(void *link)
 {
   SD_CHECK_INIT_DONE();
-  xbt_assert0(link != NULL, "Invalid parameter");
+  xbt_assert(link != NULL, "Invalid parameter");
   /* link->surf_link is freed by surf_exit and link->data is freed by the user */
   xbt_free(link);
 }