[surf] Move the basic cluster creation logic out of the callbacks

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 77aa1d5..40ae60e 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -23,19 +23,6 @@ xbt_dynar_t sg_platf_link_cb_list = NULL;   // of sg_platf_link_cb_t
 xbt_dynar_t sg_platf_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t
 xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t
 
-xbt_dynar_t sg_platf_ASroute_cb_list = NULL; // of sg_platf_ASroute_cb_t
-xbt_dynar_t sg_platf_bypassRoute_cb_list = NULL; // of sg_platf_bypassRoute_cb_t
-xbt_dynar_t sg_platf_bypassASroute_cb_list = NULL; // of sg_platf_bypassASroute_cb_t
-
-xbt_dynar_t sg_platf_trace_cb_list = NULL;
-
-/* ***************************************** */
-/* TUTORIAL: New TAG                         */
-
-xbt_dynar_t sg_platf_gpu_cb_list = NULL;
-/* ***************************************** */
-
-
 static int surf_parse_models_setup_already_called = 0;
 
 /* one RngStream for the platform, to respect some statistic rules */
@@ -45,44 +32,20 @@ static RngStream sg_platf_rng_stream = NULL;
 void sg_platf_init(void) {
 
   //FIXME : Ugly, but useful...
-  if (sg_platf_gpu_cb_list)
+  if (sg_platf_postparse_cb_list)
     return; //Already initialized, so do nothing...
 
   sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL);
   sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL);
   sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL);
-
-  sg_platf_ASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
-  sg_platf_bypassRoute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
-  sg_platf_bypassASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
-
-  sg_platf_trace_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_cb_t), NULL);
-
-  /* ***************************************** */
-  /* TUTORIAL: New TAG                         */
-
-  sg_platf_gpu_cb_list = xbt_dynar_new(sizeof(sg_platf_gpu_cb_t), NULL);
-  /* ***************************************** */
 }
+
 /** Module management function: frees all internal data structures */
 void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_link_cb_list);
   xbt_dynar_free(&sg_platf_postparse_cb_list);
   xbt_dynar_free(&sg_platf_cluster_cb_list);
 
-  xbt_dynar_free(&sg_platf_trace_cb_list);
-
-  xbt_dynar_free(&sg_platf_ASroute_cb_list);
-  xbt_dynar_free(&sg_platf_bypassRoute_cb_list);
-  xbt_dynar_free(&sg_platf_bypassASroute_cb_list);
-
-  /* ***************************************** */
-  /* TUTORIAL: New TAG                         */
-
-  xbt_dynar_free(&sg_platf_gpu_cb_list);
-
-  /* ***************************************** */
-
   /* make sure that we will reinit the models while loading the platf once reinited */
   surf_parse_models_setup_already_called = 0;
 }
@@ -166,7 +129,10 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){
   }
 }
 
-void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){
+void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
+{
+  routing_new_cluster(cluster);
+
   unsigned int iterator;
   sg_platf_cluster_cb_t fun;
   xbt_dynar_foreach(sg_platf_cluster_cb_list, iterator, fun) {
@@ -301,33 +267,19 @@ void sg_platf_new_route(sg_platf_route_cbarg_t route)
   routing_get_current()->parseRoute(route);
 }
 
-void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute) {
-  unsigned int iterator;
-  sg_platf_route_cb_t fun;
-  xbt_dynar_foreach(sg_platf_ASroute_cb_list, iterator, fun) {
-    fun(ASroute);
-  }
-}
-void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) {
-  unsigned int iterator;
-  sg_platf_route_cb_t fun;
-  xbt_dynar_foreach(sg_platf_bypassRoute_cb_list, iterator, fun) {
-    fun(bypassRoute);
-  }
+void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute)
+{
+  routing_get_current()->parseASroute(ASroute);
 }
-void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) {
-  unsigned int iterator;
-  sg_platf_route_cb_t fun;
-  xbt_dynar_foreach(sg_platf_bypassASroute_cb_list, iterator, fun) {
-    fun(bypassASroute);
-  }
+
+void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
+{
+  routing_get_current()->parseBypassroute(bypassRoute);
 }
-void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) {
-  unsigned int iterator;
-  sg_platf_trace_cb_t fun;
-  xbt_dynar_foreach(sg_platf_trace_cb_list, iterator, fun) {
-    fun(trace);
-  }
+
+void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute)
+{
+  routing_get_current()->parseBypassroute(bypassASroute);
 }
 
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
@@ -475,22 +427,6 @@ void sg_platf_new_AS_end()
   if (TRACE_is_enabled())
     sg_instr_AS_end();
 }
-
-/* ***************************************** */
-/* TUTORIAL: New TAG                         */
-
-void sg_platf_new_gpu(sg_platf_gpu_cbarg_t gpu) {
-  unsigned int iterator;
-  void_f_void_t fun;
-  xbt_dynar_foreach(sg_platf_gpu_cb_list, iterator, fun) {
-    fun();
-  }
-}
-
-void sg_platf_gpu_add_cb(sg_platf_gpu_cb_t fct) {
-  xbt_dynar_push(sg_platf_gpu_cb_list, &fct);
-}
-
 /* ***************************************** */
 
 void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
@@ -502,18 +438,7 @@ void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) {
 void sg_platf_postparse_add_cb(void_f_void_t fct) {
   xbt_dynar_push(sg_platf_postparse_cb_list, &fct);
 }
-void sg_platf_ASroute_add_cb(sg_platf_route_cb_t fct) {
-  xbt_dynar_push(sg_platf_ASroute_cb_list, &fct);
-}
-void sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t fct) {
-  xbt_dynar_push(sg_platf_bypassRoute_cb_list, &fct);
-}
-void sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t fct) {
-  xbt_dynar_push(sg_platf_bypassASroute_cb_list, &fct);
-}
-void sg_platf_trace_add_cb(sg_platf_trace_cb_t fct) {
-  xbt_dynar_push(sg_platf_trace_cb_list, &fct);
-}
+
 void sg_platf_rng_stream_init(unsigned long seed[6]) {
   RngStream_SetPackageSeed(seed);
   sg_platf_rng_stream = RngStream_CreateStream(NULL);