X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4bc35687e386d159ae0fe9e1c8565d644ff6667c..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/simdag/sd_link.c

diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index 58e97365d8..6ee5e6f788 100644
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -1,33 +1,16 @@
+/* Copyright (c) 2006-2015. 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 "simgrid/simdag.h"
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
 #include "surf/surf.h"
+#include "simgrid/link.h"
 
-/* Creates a link and registers it in SD.
- */
-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 */
-  if(surf_workstation_model->extension_public->link_shared(link))
-    link->sharing_policy=SD_LINK_SHARED;
-  else
-    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++;
-
-  return link;
-}
 /**
  * \brief Returns the link list
  *
@@ -36,151 +19,14 @@ 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) {
-
-  xbt_dict_cursor_t cursor;
-  char *key;
-  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);
-  
-    i = 0;
-    xbt_dict_foreach(sd_global->links, cursor, key, data) {
-      sd_global->link_list[i++] = (SD_link_t) data;
-    }
-  }
-  return sd_global->link_list;
-}
-
-/**
- * \brief Returns the number of links
- *
- * \return the number of existing links
- * \see SD_link_get_list()
- */
-int SD_link_get_number(void) {
-  SD_CHECK_INIT_DONE();
-  return sd_global->link_count;
-}
-
-/**
- * \brief Returns the user data of a link
- *
- * \param link a link
- * \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) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(link != NULL, "Invalid parameter");
-  return link->data;
-}
-
-/**
- * \brief Sets the user data of a link
- *
- * The new data can be \c NULL. The old data should have been freed first
- * if it was not \c NULL.
- *
- * \param link a 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) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(link != NULL, "Invalid parameter");
-  link->data = data;
-}
-
-/**
- * \brief Returns the name of a link
- *
- * \param link a link
- * \return the name of this link (cannot be \c NULL)
- */
-const char* SD_link_get_name(SD_link_t link) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(link != NULL, "Invalid parameter");
-  return surf_workstation_model->extension_public->get_link_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
- */
-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_public->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)
+const SD_link_t *SD_link_get_list(void)
 {
-  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->common_public->get_properties(link->surf_link));
+  if (sd_global->link_list == NULL)    /* this is the first time the function is called */
+    sd_global->link_list = sg_link_list();
 
+  return sd_global->link_list;
 }
 
-/**
- * \brief Returns the current latency of a link
- *
- * \param link a link
- * \return the current latency of this link, in seconds
- */
-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_public->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 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);
-}