cleanups: there is no random in the platforms since a while

+ kill some dead code
+ remove some useless #include

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 2c8c022..bd7f982 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -11,7 +11,6 @@
 #include "xbt/lib.h"
 #include "simgrid/forward.h"
 #include "simgrid/simix.h"
-#include "simgrid/platf.h"
 
 SG_BEGIN_DECL()
 

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index 1bd0067..bc195bc 100644 (file)
--- a/include/simgrid/platf.h
+++ b/include/simgrid/platf.h
@@ -279,13 +279,6 @@ XBT_PUBLIC(void) sg_platf_new_mount(sg_platf_mount_cbarg_t mount);
 
 XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process);
 
-// Add route and Asroute without xml file with those functions
-XBT_PUBLIC(void) sg_platf_route_begin (sg_platf_route_cbarg_t route); // Initialize route FIXME:KILLME
-XBT_PUBLIC(void) sg_platf_route_end (sg_platf_route_cbarg_t route); // Finalize and add a route
-
-XBT_PUBLIC(void) sg_platf_route_add_link (const char* link_id, sg_platf_route_cbarg_t route); // Add a link to link list
-XBT_PUBLIC(void) sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_cbarg_t ASroute); // Add a link to link list
-
 SG_END_DECL()
 
 #endif                          /* SG_PLATF_H */

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 984f1c4..c1b403c 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -13,7 +13,6 @@
 #include "xbt/function_types.h"
 #include "xbt/parmap.h"
 #include "xbt/swag.h"
-#include "simgrid/platf.h"
 #include "simgrid/datatypes.h"
 #include "simgrid/host.h"
 

diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h
index 00a5fd6..6ed6cef 100644 (file)
--- a/src/include/simgrid/platf_interface.h
+++ b/src/include/simgrid/platf_interface.h
@@ -28,10 +28,6 @@ XBT_PUBLIC(void) sg_platf_exit(void);
  */
 XBT_PUBLIC(void) surf_config_models_setup(void);
 
-/* RngStream management functions */
-XBT_PUBLIC(void) sg_platf_rng_stream_init(unsigned long seed[6]);
-XBT_PUBLIC(RngStream) sg_platf_rng_stream_get(const char* id);
-
 SG_END_DECL()
 
 #endif                          /* SG_PLATF_INTERFACE_H */

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 4a31798..33b714a 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -43,9 +43,6 @@ simgrid::xbt::signal<void(void)> on_postparse;
 
 static int surf_parse_models_setup_already_called = 0;
 
-/* one RngStream for the platform, to respect some statistic rules */
-static RngStream sg_platf_rng_stream = NULL;
-
 /** Module management function: creates all internal data structures */
 void sg_platf_init(void) {
 }
@@ -617,23 +614,6 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   current_property_set = NULL;
 }
 
-void sg_platf_route_begin (sg_platf_route_cbarg_t route){
-  route->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
-}
-
-void sg_platf_route_end (sg_platf_route_cbarg_t route){
-  sg_platf_new_route(route);
-}
-
-void sg_platf_route_add_link (const char* link_id, sg_platf_route_cbarg_t route){
-  char *link_name = xbt_strdup(link_id);
-  xbt_dynar_push(route->link_list, &link_name);
-}
-void sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_cbarg_t ASroute){
-  char *link_name = xbt_strdup(link_id);
-  xbt_dynar_push(ASroute->link_list, &link_name);
-}
-
 void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
 
 void sg_platf_end() {
@@ -675,20 +655,3 @@ void sg_platf_new_AS_end()
   if (TRACE_is_enabled())
     sg_instr_AS_end();
 }
-/* ***************************************** */
-
-void sg_platf_rng_stream_init(unsigned long seed[6]) {
-  RngStream_SetPackageSeed(seed);
-  sg_platf_rng_stream = RngStream_CreateStream(NULL);
-}
-
-RngStream sg_platf_rng_stream_get(const char* id) {
-  RngStream stream = NULL;
-  unsigned int id_hash;
-
-  stream = RngStream_CopyStream(sg_platf_rng_stream);
-  id_hash = xbt_str_hash(id);
-  RngStream_AdvanceState(stream, 0, (long)id_hash);
-
-  return stream;
-}