SD_link_get_list -> sd_link_list

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index 0b4e263..f29c9a8 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -98,23 +98,6 @@ typedef enum {
     @see SD_storage_management */
 typedef xbt_dictelm_t SD_storage_t;
 
-/************************** Link handling ***********************************/
-/** @defgroup SD_link_management Links
- *  @brief Functions for managing the network links
- *
- *  This section describes the functions for managing the network links.
- *
- *  A link is a network node represented as a <em>name</em>, a <em>current
- *  bandwidth</em> and a <em>current latency</em>. The links are created
- *  when you call the function SD_create_environment.
- *
- *  @see SD_link_t
- *  @{
- */
-XBT_PUBLIC(const SD_link_t *) SD_link_get_list(void);
-
-/** @} */
-
 /************************** Workstation handling ****************************/
 
 /** @defgroup SD_workstation_management Workstations

diff --git a/src/simdag/sd_link.cpp b/src/simdag/sd_link.cpp
deleted file mode 100644 (file)
index 3d4e4cf..0000000
--- a/src/simdag/sd_link.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (c) 2006-2016. 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 "src/simdag/simdag_private.h"
-#include "simgrid/simdag.h"
-#include "xbt/dict.h"
-#include "xbt/sysdep.h"
-#include "surf/surf.h"
-#include "simgrid/link.h"
-
-/**
- * \brief Returns the link list
- *
- * Use SD_link_get_number() to know the array size.
- *
- * \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)
-{
-  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;
-}
-
-
-
-

diff --git a/src/simdag/simdag_private.h b/src/simdag/simdag_private.h
index f6e4b26..5bbf028 100644 (file)
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -23,8 +23,7 @@ SG_BEGIN_DECL()
 typedef struct SD_global {
   SD_workstation_t *workstation_list;   /* array of workstations, created only if
                                            necessary in SD_workstation_get_list */
-  SD_link_t *link_list;         /* array of links, created only if
-                                   necessary in SD_link_get_list */
+  SD_link_t *link_list;         /* array of links */
   SD_link_t *recyclable_route;  /* array returned by SD_route_get_list
                                    and mallocated only once */
 

diff --git a/teshsuite/simdag/platforms/basic_link_test.c b/teshsuite/simdag/platforms/basic_link_test.c
index 67e2b42..173fd65 100644 (file)
--- a/teshsuite/simdag/platforms/basic_link_test.c
+++ b/teshsuite/simdag/platforms/basic_link_test.c
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
 
   /* creation of the environment */
   SD_create_environment(argv[1]);
-  links = SD_link_get_list();
+  links = sg_link_list();
   int count = sg_link_count();
   XBT_INFO("Link count: %d", count);
   qsort((void *)links, count, sizeof(SD_link_t), cmp_link);

diff --git a/teshsuite/simdag/platforms/flatifier.cpp b/teshsuite/simdag/platforms/flatifier.cpp
index 408876f..28c340f 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.cpp
+++ b/teshsuite/simdag/platforms/flatifier.cpp
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
 
     // Links
     totalLinks = sg_link_count();
-    links = SD_link_get_list();
+    links = sg_link_list();
 
     qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 23c5e95..9a416d1 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -440,7 +440,6 @@ set(SIMDAG_SRC
   src/simdag/instr_sd_task.cpp
   src/simdag/sd_daxloader.cpp
   src/simdag/sd_global.cpp
-  src/simdag/sd_link.cpp
   src/simdag/sd_task.cpp
   src/simdag/sd_workstation.cpp
   )