more checks on the parameters of addRoute()

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

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index bdf0803..be65755 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) {
 }
@@ -73,7 +70,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
   simgrid::surf::NetCard *netcard =
       new simgrid::surf::NetCardImpl(host->id, SURF_NETWORK_ELEMENT_HOST, current_routing);
 
-  netcard->setId(current_routing->parsePU(netcard));
+  netcard->setId(current_routing->addComponent(netcard));
   sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id);
   h->pimpl_netcard = netcard;
   simgrid::surf::netcardCreatedCallbacks(netcard);
@@ -130,9 +127,9 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
              router->id);
 
   simgrid::surf::NetCard *info = new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
-  info->setId(current_routing->parsePU(info));
+  info->setId(current_routing->addComponent(info));
   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info);
-  XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId());
+  XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->id());
   simgrid::surf::netcardCreatedCallbacks(info);
 
   if (router->coord && strcmp(router->coord, "")) {
@@ -208,13 +205,13 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
   static_cast<AsCluster*>(current_routing)->parse_specific_arguments(cluster);
 
   if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
-      ((AsCluster*)current_routing)->p_nb_links_per_node++;
-      ((AsCluster*)current_routing)->p_has_loopback=1;
+      ((AsCluster*)current_routing)->nb_links_per_node_++;
+      ((AsCluster*)current_routing)->has_loopback_=1;
   }
 
   if(cluster->limiter_link!=0){
-      ((AsCluster*)current_routing)->p_nb_links_per_node++;
-      ((AsCluster*)current_routing)->p_has_limiter=1;
+      ((AsCluster*)current_routing)->nb_links_per_node_++;
+      ((AsCluster*)current_routing)->has_limiter_=1;
   }
 
 
@@ -316,7 +313,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
         info_loop.link_down = info_loop.link_up;
         free(tmp_link);
         xbt_dynar_set(current_routing->upDownLinks,
-          rankId*(static_cast<AsCluster*>(current_routing))->p_nb_links_per_node, &info_loop);
+          rankId*(static_cast<AsCluster*>(current_routing))->nb_links_per_node_, &info_loop);
       }
 
       //add a limiter link (shared link to account for maximal bandwidth of the node)
@@ -338,7 +335,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
         free(tmp_link);
         auto as_cluster = static_cast<AsCluster*>(current_routing);
         xbt_dynar_set(current_routing->upDownLinks,
-            rankId*(as_cluster)->p_nb_links_per_node + as_cluster->p_has_loopback ,
+            rankId*(as_cluster)->nb_links_per_node_ + as_cluster->has_loopback_ ,
             &info_lim);
 
       }
@@ -350,9 +347,9 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
       }
       else {
       static_cast<AsCluster*>(current_routing)->create_links_for_node(cluster, i, rankId, rankId*
-          static_cast<AsCluster*>(current_routing)->p_nb_links_per_node
-          + static_cast<AsCluster*>(current_routing)->p_has_loopback
-          + static_cast<AsCluster*>(current_routing)->p_has_limiter );
+          static_cast<AsCluster*>(current_routing)->nb_links_per_node_
+          + static_cast<AsCluster*>(current_routing)->has_loopback_
+          + static_cast<AsCluster*>(current_routing)->has_limiter_ );
       }
       xbt_free(link_id);
       xbt_free(host_id);
@@ -381,7 +378,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
         bprintf("%s%s_router%s", cluster->prefix, cluster->id,
                 cluster->suffix);
   sg_platf_new_router(&router);
-  ((AsCluster*)current_routing)->p_router = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
+  ((AsCluster*)current_routing)->router_ = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
   free(newid);
 
   //Make the backbone
@@ -516,25 +513,14 @@ 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)
-{
-  routing_get_current()->parseASroute(ASroute);
-}
-
 void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
 {
   routing_get_current()->parseBypassroute(bypassRoute);
 }
 
-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)
 {
-  if (!simix_global)
-    xbt_die("Cannot create process without SIMIX.");
+  xbt_assert(simix_global,"Cannot create process without SIMIX.");
 
   sg_host_t host = sg_host_by_name(process->host);
   if (!host) {
@@ -627,29 +613,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_ASroute_begin (sg_platf_route_cbarg_t ASroute){
-  ASroute->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_ASroute_end (sg_platf_route_cbarg_t ASroute){
-  sg_platf_new_ASroute(ASroute);
-}
-
-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() {
@@ -691,20 +654,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;
-}