surfxml: better error checking, and less include of internal headers

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

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 4a31798..2c4dd11 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) {
 }
@@ -58,6 +55,7 @@ void sg_platf_exit(void) {
 
   /* make sure that we will reinit the models while loading the platf once reinited */
   surf_parse_models_setup_already_called = 0;
+  surf_parse_lex_destroy();
 }
 
 /** @brief Add an "host" to the current AS */
@@ -125,15 +123,14 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
 
   if (current_routing->hierarchy_ == SURF_ROUTING_NULL)
     current_routing->hierarchy_ = SURF_ROUTING_BASE;
-  xbt_assert(!xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL),
-             "Reading a router, processing unit \"%s\" already exists",
-             router->id);
+  xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL),
+             "Refusing to create a router named '%s': this name already describes a node.", router->id);
 
-  simgrid::surf::NetCard *info = new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
-  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->id());
-  simgrid::surf::netcardCreatedCallbacks(info);
+  simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
+  netcard->setId(current_routing->addComponent(netcard));
+  xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) netcard);
+  XBT_DEBUG("Having set name '%s' id '%d'", router->id, netcard->id());
+  simgrid::surf::netcardCreatedCallbacks(netcard);
 
   if (router->coord && strcmp(router->coord, "")) {
     unsigned int cursor;
@@ -513,18 +510,17 @@ void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){
 
 void sg_platf_new_route(sg_platf_route_cbarg_t route)
 {
-  routing_get_current()->parseRoute(route);
+  routing_get_current()->addRoute(route);
 }
 
 void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
 {
-  routing_get_current()->parseBypassroute(bypassRoute);
+  routing_get_current()->addBypassRoute(bypassRoute);
 }
 
 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) {
@@ -617,23 +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_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 +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;
-}