X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccc3312e5196a95841eadc252e388d1ee4c05e85..62dcd7bdc99162b0675bbc9100a36b53ebe65f29:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index ef3da4eef7..2006197702 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -23,15 +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 - -/* ***************************************** */ -/* 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 */ @@ -41,36 +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); - - /* ***************************************** */ - /* 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_ASroute_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; } @@ -80,23 +55,22 @@ 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); - RoutingEdge *net = NULL; - As* current_routing = routing_get_current(); + simgrid::surf::RoutingEdge *net = NULL; + simgrid::surf::As* current_routing = routing_get_current(); if (current_routing) net = routing_add_host(current_routing, host); - Cpu *cpu = surf_cpu_model_pm->createCpu( - host->id, - host->power_peak, + sg_host_t h = simgrid::Host::by_name_or_create(host->id); + simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( + h, + host->speed_peak, host->pstate, - host->power_scale, - host->power_trace, + host->speed_scale, + host->speed_trace, host->core_amount, host->initial_state, - host->state_trace, - host->properties); - surf_host_model->createHost(host->id, net, cpu); - + host->state_trace); + surf_host_model->createHost(host->id, net, cpu, host->properties)->attach(h); if (TRACE_is_enabled() && TRACE_needs_platform()) sg_instr_new_host(host); } @@ -106,7 +80,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) */ void sg_platf_new_router(sg_platf_router_cbarg_t router) { - As* current_routing = routing_get_current(); + simgrid::surf::As* current_routing = routing_get_current(); if (current_routing->p_hierarchy == SURF_ROUTING_NULL) current_routing->p_hierarchy = SURF_ROUTING_BASE; @@ -114,14 +88,12 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) "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); + simgrid::surf::RoutingEdge *info = new simgrid::surf::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); + simgrid::surf::routingEdgeCreatedCallbacks(info); if (router->coord && strcmp(router->coord, "")) { unsigned int cursor; @@ -154,7 +126,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) { @@ -165,13 +140,10 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){ 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), - "Reading a storage, processing unit \"%s\" already exists", storage->id); + "Refusing to add a second storage named \"%s\"", storage->id); - // Verification of an existing type_id -#ifndef NDEBUG - void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); -#endif - xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id); + void* stype = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); + xbt_assert(stype,"No storage type '%s'", storage->type_id); XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", storage->id, @@ -183,12 +155,7 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) ROUTING_STORAGE_LEVEL, (void *) xbt_strdup(storage->type_id)); - void* stype = xbt_lib_get_or_null(storage_type_lib, - storage->type_id, - ROUTING_STORAGE_TYPE_LEVEL); - if(!stype) xbt_die("No storage type '%s'",storage->type_id); - - // if storage content is not specified use the content of storage_type if exist + // if storage content is not specified use the content of storage_type if any if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){ storage->content = ((storage_type_t) stype)->content; storage->content_type = ((storage_type_t) stype)->content_type; @@ -205,13 +172,13 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) ((storage_type_t) stype)->type_id, storage->content, storage->content_type, - storage->properties); + storage->properties); surf_storage_model->createStorage(storage->id, ((storage_type_t) stype)->type_id, storage->content, storage->content_type, - storage->properties, + storage->properties, storage->attach); } void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){ @@ -291,11 +258,7 @@ void sg_platf_new_route(sg_platf_route_cbarg_t 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); - } + routing_get_current()->parseASroute(ASroute); } void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) @@ -453,22 +416,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) { @@ -480,9 +427,6 @@ 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_rng_stream_init(unsigned long seed[6]) { RngStream_SetPackageSeed(seed);