[trace] cosmetics, remove TRACE_is_active, use TRACE_is_enabled instead

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

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index 27b2d8b..c69d93c 100644 (file)
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. 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. */
+
 #include "private.h"
 #include "simdag/simdag.h"
 #include "xbt/dict.h"
@@ -13,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;
@@ -24,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;
 }
@@ -41,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;
@@ -69,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;
 }
 
 /**
@@ -82,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;
 }
 
@@ -99,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;
 }
 
@@ -112,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);
 }
 
@@ -125,36 +130,9 @@ 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);
-}
-
-/**
- * \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->get_properties(link->surf_link));
-
+      get_link_bandwidth(link->surf_link);
 }
 
 /**
@@ -166,9 +144,9 @@ xbt_dict_t SD_link_get_properties(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);
+      get_link_latency(link->surf_link);
 }
 
 /**
@@ -182,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;
 }
 
@@ -192,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);
 }