routing: get rid of unused strings

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index c9eae8d..75b26ff 100644 (file)
--- a/include/simgrid/platf.h
+++ b/include/simgrid/platf.h
@@ -33,8 +33,6 @@ typedef enum {
 
 
 typedef struct s_model_type {
-  const char *name;
-  const char *desc;
   AS_t (*create) ();
 } s_routing_model_description_t, *routing_model_description_t;
 

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 73a9d74..16bd132 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -85,25 +85,16 @@ typedef enum {
 } e_routing_types;
 
 struct s_model_type routing_models[] = {
-  {"Full",
-   "Full routing data (fast, large memory requirements, fully expressive)",
-   model_full_create},
-  {"Floyd",
-   "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
-   model_floyd_create},
-  {"Dijkstra",
-   "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
-   model_dijkstra_create},
-  {"DijkstraCache",
-   "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
-   model_dijkstracache_create},
-  {"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).",
-   model_none_create},
-  {"Vivaldi", "Vivaldi routing", model_vivaldi_create},
-  {"Cluster", "Cluster routing", model_cluster_create},
-  {"TorusCluster", "Torus Cluster routing", model_torus_cluster_create},
-  {"FatTreeCluster", "Fat Tree Cluster routing", model_fat_tree_cluster_create},
-  {NULL, NULL, NULL}
+  {model_full_create},
+  {model_floyd_create},
+  {model_dijkstra_create},
+  {model_dijkstracache_create},
+  {model_none_create},
+  {model_vivaldi_create},
+  {model_cluster_create},
+  {model_torus_cluster_create},
+  {model_fat_tree_cluster_create},
+  {NULL}
 };
 
 /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index 7f6e4b8..e52beef 100644 (file)
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -34,6 +34,7 @@ namespace surf {
 
 class XBT_PRIVATE AsDijkstra;
 
+/** Dijkstra routing data: fast initialization, slow lookup, small memory requirements, shortest path routing only */
 class AsDijkstra : public AsGeneric {
 public:
   AsDijkstra();

diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp
index c9ab30b..7bca1e1 100644 (file)
--- a/src/surf/surf_routing_floyd.hpp
+++ b/src/surf/surf_routing_floyd.hpp
@@ -20,6 +20,7 @@ namespace surf {
  ***********/
 class XBT_PRIVATE AsFloyd;
 
+/** Floyd routing data: slow initialization, fast lookup, lesser memory requirements, shortest path routing only */
 class AsFloyd: public AsGeneric {
 public:
   AsFloyd();

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index 77debc1..0473e92 100644 (file)
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -19,6 +19,7 @@ namespace surf {
  ***********/
 class XBT_PRIVATE AsFull;
 
+/** Full routing: fast, large memory requirements, fully expressive */
 class AsFull: public AsGeneric {
 public:
 

diff --git a/src/surf/surf_routing_none.hpp b/src/surf/surf_routing_none.hpp
index a81babf..71026a4 100644 (file)
--- a/src/surf/surf_routing_none.hpp
+++ b/src/surf/surf_routing_none.hpp
@@ -14,6 +14,7 @@
 namespace simgrid {
 namespace surf {
 
+/** No specific routing. Mainly useful with the constant network model */
 class XBT_PRIVATE AsNone : public As {
 public:
   AsNone() {}