X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d2aa6e9e465c245ca42cb93f88906c401fa9f1f..6e8589d6a8476d3d6dd2453d933ed9759cd215b0:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 6772e4fc5a..c64ce9d095 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -11,6 +11,7 @@ #include "xbt/RngStream.h" #include "simgrid/platf_interface.h" #include "surf/surf_routing.h" +#include "surf/surf.h" #include "src/simix/smx_private.h" @@ -18,19 +19,10 @@ #include "host_interface.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -xbt_dynar_t sg_platf_host_cb_list = NULL; // of sg_platf_host_cb_t -xbt_dynar_t sg_platf_host_link_cb_list = NULL; // of sg_platf_host_link_cb_t xbt_dynar_t sg_platf_link_cb_list = NULL; // of sg_platf_link_cb_t -xbt_dynar_t sg_platf_router_cb_list = NULL; // of sg_platf_router_cb_t -xbt_dynar_t sg_platf_peer_cb_list = NULL; // of sg_platf_peer_cb_t xbt_dynar_t sg_platf_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t -xbt_dynar_t sg_platf_cabinet_cb_list = NULL; // of sg_platf_cluster_cb_t -xbt_dynar_t sg_platf_AS_begin_cb_list = NULL; //of sg_platf_AS_begin_cb_t -xbt_dynar_t sg_platf_AS_end_cb_list = NULL; //of void_f_void_t xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t -xbt_dynar_t sg_platf_prop_cb_list = NULL; // of sg_platf_prop_cb_t -xbt_dynar_t sg_platf_route_cb_list = NULL; // of sg_platf_route_cb_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 @@ -54,22 +46,13 @@ static RngStream sg_platf_rng_stream = NULL; void sg_platf_init(void) { //FIXME : Ugly, but useful... - if(sg_platf_host_cb_list) + if (sg_platf_gpu_cb_list) return; //Already initialized, so do nothing... - sg_platf_host_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL); - sg_platf_host_link_cb_list = xbt_dynar_new(sizeof(sg_platf_host_link_cb_t), NULL); - sg_platf_router_cb_list = xbt_dynar_new(sizeof(sg_platf_router_cb_t), NULL); sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL); - sg_platf_peer_cb_list = xbt_dynar_new(sizeof(sg_platf_peer_cb_t), NULL); sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL); - sg_platf_cabinet_cb_list = xbt_dynar_new(sizeof(sg_platf_cabinet_cb_t), NULL); sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL); - sg_platf_AS_begin_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_cb_t),NULL); - sg_platf_AS_end_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_cb_t),NULL); - sg_platf_prop_cb_list = xbt_dynar_new(sizeof(sg_platf_prop_cb_t),NULL); - sg_platf_route_cb_list = xbt_dynar_new(sizeof(sg_platf_route_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); @@ -85,22 +68,13 @@ void sg_platf_init(void) { } /** Module management function: frees all internal data structures */ void sg_platf_exit(void) { - xbt_dynar_free(&sg_platf_host_cb_list); - xbt_dynar_free(&sg_platf_host_link_cb_list); - xbt_dynar_free(&sg_platf_router_cb_list); xbt_dynar_free(&sg_platf_link_cb_list); xbt_dynar_free(&sg_platf_postparse_cb_list); - xbt_dynar_free(&sg_platf_peer_cb_list); xbt_dynar_free(&sg_platf_cluster_cb_list); - xbt_dynar_free(&sg_platf_cabinet_cb_list); - xbt_dynar_free(&sg_platf_AS_begin_cb_list); - xbt_dynar_free(&sg_platf_AS_end_cb_list); - xbt_dynar_free(&sg_platf_prop_cb_list); xbt_dynar_free(&sg_platf_trace_cb_list); xbt_dynar_free(&sg_platf_trace_connect_cb_list); - xbt_dynar_free(&sg_platf_route_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); @@ -118,7 +92,6 @@ void sg_platf_exit(void) { void sg_platf_new_host(sg_platf_host_cbarg_t host) { - xbt_assert(! sg_host_by_name(host->id), "Refusing to create a second host named '%s'.", host->id); @@ -139,18 +112,53 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) host->properties); surf_host_model->createHost(host->id, net, cpu); - unsigned int iterator; - sg_platf_host_cb_t fun; - xbt_dynar_foreach(sg_platf_host_cb_list, iterator, fun) { - fun(host); - } + if (TRACE_is_enabled() && TRACE_needs_platform()) + sg_instr_new_host(host); } -void sg_platf_new_host_link(sg_platf_host_link_cbarg_t h){ - unsigned int iterator; - sg_platf_host_link_cb_t fun; - xbt_dynar_foreach(sg_platf_host_link_cb_list, iterator, fun) { - fun(h); + +/** + * \brief Add a "router" to the network element list + */ +void sg_platf_new_router(sg_platf_router_cbarg_t router) +{ + As* current_routing = routing_get_current(); + + if (current_routing->p_hierarchy == SURF_ROUTING_NULL) + current_routing->p_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); + + RoutingEdge *info = new RoutingEdgeImpl(xbt_strdup(router->id), + -1, + SURF_NETWORK_ELEMENT_ROUTER, + current_routing); + info->setId(current_routing->parsePU(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()); + routingEdgeCreatedCallbacks(info); + + if (router->coord && strcmp(router->coord, "")) { + unsigned int cursor; + char*str; + + if (!COORD_ASR_LEVEL) + xbt_die ("To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); + /* Pre-parse the host coordinates */ + xbt_dynar_t ctn_str = xbt_str_split_str(router->coord, " "); + xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); + xbt_dynar_foreach(ctn_str,cursor, str) { + double val = atof(str); + xbt_dynar_push(ctn,&val); + } + xbt_dynar_shrink(ctn, 0); + xbt_dynar_free(&ctn_str); + xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn); + XBT_DEBUG("Having set router coordinates for '%s'",router->id); } + + if (TRACE_is_enabled()) + sg_instr_new_router(router); } void sg_platf_new_link(sg_platf_link_cbarg_t link){ @@ -161,13 +169,6 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ } } -void sg_platf_new_peer(sg_platf_peer_cbarg_t peer){ - unsigned int iterator; - sg_platf_peer_cb_t fun; - xbt_dynar_foreach(sg_platf_peer_cb_list, iterator, fun) { - fun(peer); - } -} void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){ unsigned int iterator; sg_platf_cluster_cb_t fun; @@ -175,13 +176,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){ fun(cluster); } } -void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet){ - unsigned int iterator; - sg_platf_cabinet_cb_t fun; - xbt_dynar_foreach(sg_platf_cabinet_cb_list, iterator, fun) { - fun(cabinet); - } -} + void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) { xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL), @@ -304,13 +299,11 @@ void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ xbt_dynar_push(mount_list, &mnt); } -void sg_platf_new_route(sg_platf_route_cbarg_t route) { - unsigned int iterator; - sg_platf_route_cb_t fun; - xbt_dynar_foreach(sg_platf_route_cb_list, iterator, fun) { - fun(route); - } +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; @@ -332,13 +325,6 @@ void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) { fun(bypassASroute); } } -void sg_platf_new_prop(sg_platf_prop_cbarg_t prop) { - unsigned int iterator; - sg_platf_prop_cb_t fun; - xbt_dynar_foreach(sg_platf_prop_cb_list, iterator, fun) { - fun(prop); - } -} void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) { unsigned int iterator; sg_platf_trace_cb_t fun; @@ -464,11 +450,9 @@ void sg_platf_end() { } } -void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) { - unsigned int iterator; - sg_platf_AS_cb_t fun; - - if (!surf_parse_models_setup_already_called && !xbt_dynar_is_empty(sg_platf_AS_begin_cb_list)) { +void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) +{ + if (!surf_parse_models_setup_already_called) { /* Initialize the surf models. That must be done after we got all config, and before we need the models. * That is, after the last tag, if any, and before the first of cluster|peer|AS|trace|trace_connect * @@ -476,26 +460,30 @@ void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) { * (FIXME: check it out by creating a file beginning with one of these tags) * but cluster and peer create ASes internally, so putting the code in there is ok. * - * We are also guarding against xbt_dynar_length(sg_platf_AS_begin_cb_list) because we don't - * want to initialize the models if we are parsing the file to get the deployment. That could happen if - * the same file would be used for platf and deploy: it'd contain AS tags even during the deploy parsing. - * Removing that guard would result of the models to get re-inited when parsing for deploy. + * TODO, There used to be a guard protecting here against + * xbt_dynar_length(sg_platf_AS_begin_cb_list) because we don't want to + * initialize the models if we are parsing the file to get the deployment. + * That could happen if the same file would be used for platf and deploy: + * it'd contain AS tags even during the deploy parsing. Removing that guard + * would result of the models to get re-inited when parsing for deploy. + * Currently using the same file for platform and deployment is broken + * however. This guard will have to ba adapted in order to make this feature + * work again. */ surf_parse_models_setup_already_called = 1; surf_config_models_setup(); } - xbt_dynar_foreach(sg_platf_AS_begin_cb_list, iterator, fun) { - fun(AS); - } + routing_AS_begin(AS); + if (TRACE_is_enabled()) + sg_instr_AS_begin(AS); } -void sg_platf_new_AS_end() { - unsigned int iterator; - void_f_void_t fun; - xbt_dynar_foreach(sg_platf_AS_end_cb_list, iterator, fun) { - fun(); - } +void sg_platf_new_AS_end() +{ + routing_AS_end(); + if (TRACE_is_enabled()) + sg_instr_AS_end(); } /* ***************************************** */ @@ -515,40 +503,15 @@ void sg_platf_gpu_add_cb(sg_platf_gpu_cb_t fct) { /* ***************************************** */ - -void sg_platf_host_add_cb(sg_platf_host_cb_t fct) { - xbt_dynar_push(sg_platf_host_cb_list, &fct); -} -void sg_platf_host_link_add_cb(sg_platf_host_link_cb_t fct) { - xbt_dynar_push(sg_platf_host_link_cb_list, &fct); -} void sg_platf_link_add_cb(sg_platf_link_cb_t fct) { xbt_dynar_push(sg_platf_link_cb_list, &fct); } -void sg_platf_router_add_cb(sg_platf_router_cb_t fct) { - xbt_dynar_push(sg_platf_router_cb_list, &fct); -} -void sg_platf_peer_add_cb(sg_platf_peer_cb_t fct) { - xbt_dynar_push(sg_platf_peer_cb_list, &fct); -} void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) { xbt_dynar_push(sg_platf_cluster_cb_list, &fct); } -void sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct) { - xbt_dynar_push(sg_platf_cabinet_cb_list, &fct); -} void sg_platf_postparse_add_cb(void_f_void_t fct) { xbt_dynar_push(sg_platf_postparse_cb_list, &fct); } -void sg_platf_AS_begin_add_cb(sg_platf_AS_cb_t fct) { - xbt_dynar_push(sg_platf_AS_begin_cb_list, &fct); -} -void sg_platf_AS_end_add_cb(sg_platf_AS_cb_t fct) { - xbt_dynar_push(sg_platf_AS_end_cb_list, &fct); -} -void sg_platf_route_add_cb(sg_platf_route_cb_t fct) { - xbt_dynar_push(sg_platf_route_cb_list, &fct); -} void sg_platf_ASroute_add_cb(sg_platf_route_cb_t fct) { xbt_dynar_push(sg_platf_ASroute_cb_list, &fct); } @@ -558,9 +521,6 @@ void sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t 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_prop_add_cb(sg_platf_prop_cb_t fct) { - xbt_dynar_push(sg_platf_prop_cb_list, &fct); -} void sg_platf_trace_add_cb(sg_platf_trace_cb_t fct) { xbt_dynar_push(sg_platf_trace_cb_list, &fct); }