Remove field name from strucure SD_link_t.

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

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index 424ebc3..971d45a 100644 (file)
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -1,22 +1,24 @@
 #include "private.h"
 #include "simdag/simdag.h"
-#include "xbt/sysdep.h" /* xbt_new0 */
+#include "xbt/dict.h"
+#include "xbt/sysdep.h"
+#include "surf/surf.h"
 
 /* Creates a link.
  */
-SD_link_t __SD_link_create(const char *name, void *surf_link, void *data) {
+SD_link_t __SD_link_create(void *surf_link, void *data) {
+  CHECK_INIT_DONE();
   xbt_assert0(surf_link != NULL, "surf_link is NULL !");
+
   SD_link_data_t sd_data = xbt_new0(s_SD_link_data_t, 1); /* link private data */
   sd_data->surf_link = surf_link;
 
   SD_link_t link = xbt_new0(s_SD_link_t, 1);
-  link->name = xbt_strdup(name);
-  link->data = data;
-  link->sd_data = sd_data;
+  link->sd_data = sd_data; /* private data */
+  link->data = data; /* user data */
 
-  /*link->capacity = capacity;*/
-  /* link->current_bandwidth = bandwidth;
-     link->current_latency = latency;*/
+  const char *name = SD_link_get_name(link);
+  xbt_dict_set(sd_global->links, name, link, __SD_link_destroy); /* add the workstation to the dictionary */
 
   return link;
 }
@@ -24,22 +26,25 @@ SD_link_t __SD_link_create(const char *name, void *surf_link, void *data) {
 /* Returns the user data of a link. The user data can be NULL.
  */
 void* SD_link_get_data(SD_link_t link) {
-  xbt_assert0(link, "Invalid parameter");
+  CHECK_INIT_DONE();
+  xbt_assert0(link != NULL, "Invalid parameter");
   return link->data;
 }
 
 /* Sets the user data of a link. The new data can be NULL. The old data should have been freed first if it was not NULL.
  */
 void SD_link_set_data(SD_link_t link, void *data) {
-  xbt_assert0(link, "Invalid parameter");
+  CHECK_INIT_DONE();
+  xbt_assert0(link != NULL, "Invalid parameter");
   link->data = data;
 }
 
-/* Returns the name of a link. The name can be NULL.
+/* Returns the name of a link. The name cannot be NULL.
  */
 const char* SD_link_get_name(SD_link_t link) {
-  xbt_assert0(link, "Invalid parameter");
-  return link->name;
+  CHECK_INIT_DONE();
+  xbt_assert0(link != NULL, "Invalid parameter");
+  return surf_workstation_resource->extension_public->get_link_name(link->sd_data->surf_link);
 }
 
 /* Returns the capacity of a link.
@@ -53,33 +58,30 @@ double SD_link_get_capacity(SD_link_t link) {
 /* Return the current bandwidth of a link.
  */
 double SD_link_get_current_bandwidth(SD_link_t link) {
-  xbt_assert0(link, "Invalid parameter");
-
-  /* TODO */
-  return 0;
-  /*  return link->current_bandwidth;*/
+  CHECK_INIT_DONE();
+  xbt_assert0(link != NULL, "Invalid parameter");
+  return surf_workstation_resource->extension_public->get_link_bandwidth(link->sd_data->surf_link);
 }
 
 /* Return the current latency of a link.
  */
 double SD_link_get_current_latency(SD_link_t link) {
-  xbt_assert0(link, "Invalid parameter");
-
-  /* TODO */
-  return 0;
-  /*  return link->current_latency;*/
+  CHECK_INIT_DONE();
+  xbt_assert0(link != NULL, "Invalid parameter");
+  return surf_workstation_resource->extension_public->get_link_latency(link->sd_data->surf_link);
 }
 
 /* Destroys a link. The user data (if any) should have been destroyed first.
  */
-void __SD_link_destroy(SD_link_t link) {
-  xbt_assert0(link, "Invalid parameter");
+void __SD_link_destroy(void *link) {
+  CHECK_INIT_DONE();
+  xbt_assert0(link != NULL, "Invalid parameter");
 
-  if (link->sd_data != NULL)
-    xbt_free(link->sd_data);
-  
-  if (link->name != NULL)
-    xbt_free(link->name);
+  SD_link_data_t sd_data = ((SD_link_t) link)->data;
+  if (sd_data != NULL) {
+    xbt_free(sd_data);
+  }
 
   xbt_free(link);
 }
+