X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43307e6167f4be7aa7016e16df4e55f6f1973188..2c5c14ffd2b2af540f201434bd4d32f9c197507f:/src/simdag/sd_link.c

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index 9938c71d9b..da64d74cd9 100644
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2007-2009 Da SimGrid Team.  All rights reserved.           */
+/* Copyright (c) 2006-2011. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,6 +9,8 @@
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
 #include "surf/surf.h"
+#include "surf/surf_resource.h"
+
 
 /* Creates a link and registers it in SD.
  */
@@ -17,9 +20,6 @@ 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 !");
-
   link = xbt_new(s_SD_link_t, 1);
   link->surf_link = surf_link;
   link->data = data;            /* user data */
@@ -29,8 +29,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;
 }
@@ -46,20 +45,17 @@ 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!");
-
   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, xbt_lib_length(link_lib));
 
     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;
@@ -73,8 +69,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 xbt_lib_length(link_lib);
 }
 
 /**
@@ -86,8 +81,6 @@ 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");
   return link->data;
 }
 
@@ -103,8 +96,6 @@ 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");
   link->data = data;
 }
 
@@ -116,8 +107,6 @@ 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_resource_name(link->surf_link);
 }
 
@@ -129,10 +118,8 @@ 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_model->extension.workstation.
-    get_link_bandwidth(link->surf_link);
+      get_link_bandwidth(link->surf_link);
 }
 
 /**
@@ -143,10 +130,8 @@ 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_model->extension.workstation.
-    get_link_latency(link->surf_link);
+      get_link_latency(link->surf_link);
 }
 
 /**
@@ -159,18 +144,5 @@ 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");
   return link->sharing_policy;
 }
-
-
-/* Destroys a 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);
-}