Merge pull request #193 from Takishipp/signals

get sg_instr_new_router through a signal

diff --combined src/instr/instr_paje_types.cpp
index 9fd1dfe,d43f48a..50df528
--- 1/src/instr/instr_paje_types.cpp
--- 2/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@@ -19,6 -19,7 +19,7 @@@ void PJ_type_release (
    rootType = nullptr;
  }
  
+ 
  type_t PJ_type_get_root ()
  {
    return rootType;
@@@ -130,20 -131,20 +131,20 @@@ type_t PJ_type_container_new (const cha
  
    if(father){
      XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
 -    new DefineContainerEvent(ret);
 +    DefineContainerEvent(ret);
    }
    return ret;
  }
  
  type_t PJ_type_event_new (const char *name, type_t father)
 -{ 
 +{
    if (name == nullptr){
      THROWF (tracing_error, 0, "can't create an event type with a nullptr name");
    }
  
    type_t ret = newType (name, name, nullptr, TYPE_EVENT, father);
    XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
 -  new DefineEventTypeEvent(ret);
 +  LogDefineEventType(ret);
    return ret;
  }
  
@@@ -162,7 -163,7 +163,7 @@@ type_t PJ_type_variable_new (const cha
      ret = newType (name, name, color, TYPE_VARIABLE, father);
    }
    XBT_DEBUG("VariableType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
 -  new DefineVariableTypeEvent (ret);
 +  LogVariableTypeDefinition (ret);
    return ret;
  }
  
@@@ -179,7 -180,7 +180,7 @@@ type_t PJ_type_link_new (const char *na
    ret = newType (name, key, nullptr, TYPE_LINK, father);
    XBT_DEBUG("LinkType %s(%s), child of %s(%s)  %s(%s)->%s(%s)", ret->name, ret->id, father->name, father->id,
              source->name, source->id, dest->name, dest->id);
 -  new DefineLinkTypeEvent(ret, source, dest);
 +  LogLinkTypeDefinition(ret, source, dest);
    return ret;
  }
  
@@@ -193,6 -194,6 +194,6 @@@ type_t PJ_type_state_new (const char *n
  
    ret = newType (name, name, nullptr, TYPE_STATE, father);
    XBT_DEBUG("StateType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
 -  new DefineStateTypeEvent(ret);
 +  LogStateTypeDefinition(ret);
    return ret;
  }

diff --combined src/surf/sg_platf.cpp
index 75db20e,288fef0..79883f4
--- 1/src/surf/sg_platf.cpp
--- 2/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@@ -4,7 -4,6 +4,7 @@@
   * under the terms of the license (GNU LGPL) which comes with this package. */
  
  #include "simgrid/s4u/Engine.hpp"
 +#include "simgrid/s4u/Storage.hpp"
  
  #include "src/kernel/EngineImpl.hpp"
  #include "src/simix/smx_private.h"
@@@ -100,7 -99,7 +100,7 @@@ void sg_platf_new_host(sg_platf_host_cb
      host->pimpl_cpu->setPState(args->pstate);
    if (args->coord && strcmp(args->coord, ""))
      new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
 -    
 +
  }
  
  /** @brief Add a "router" to the network element list */
@@@ -120,7 -119,6 +120,6 @@@ simgrid::kernel::routing::NetPoint* sg_
    if (coords && strcmp(coords, ""))
      new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
  
-   sg_instr_new_router(name);
  
    return netpoint;
  }
@@@ -425,7 -423,8 +424,7 @@@ void sg_platf_new_mount(sg_platf_mount_
  
    if (mount_list.empty())
      XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id);
 -  mount_list.insert(
 -      {std::string(mount->name), surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId))});
 +  mount_list.insert({std::string(mount->name), simgrid::surf::StorageImpl::byName(mount->storageId)});
  }
  
  void sg_platf_new_route(sg_platf_route_cbarg_t route)
@@@ -648,7 -647,7 +647,7 @@@ simgrid::s4u::NetZone* sg_platf_new_AS_
  
    if (current_routing == nullptr) { /* it is the first one */
      xbt_assert(simgrid::s4u::Engine::instance()->pimpl->netRoot_ == nullptr,
 -               "All defined components must belong to a AS");
 +               "All defined components must belong to a networking zone.");
      simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as;
  
    } else {
@@@ -678,7 -677,7 +677,7 @@@ void sg_platf_new_AS_seal(
    xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
    current_routing->seal();
    simgrid::s4u::NetZone::onSeal(*current_routing);
 -  current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->father()); 
 +  current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->father());
  }
  
  /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */

diff --combined src/surf/xml/platf_private.hpp
index 931f78a,ca6daa0..d6b4dd8
--- 1/src/surf/xml/platf_private.hpp
--- 2/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@@ -238,9 -238,12 +238,7 @@@ XBT_PUBLIC(int) surf_parse_get_debug()
  XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
  XBT_PUBLIC(int) surf_parse_lex_destroy();
  
 -/* To include files (?) */
 -XBT_PRIVATE void surfxml_bufferstack_push(int _new);
 -XBT_PRIVATE void surfxml_bufferstack_pop(int _new);
 -XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
 -
  XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
- /********** Instr. **********/
- XBT_PRIVATE void sg_instr_new_router(const char* name);
  
  SG_END_DECL()