X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae7bffe6655b934fc4a09ca1a34e10de5d8dd366..59edffecb0a76e4bc29b38a7562e7179a59a8c4a:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 0471dc9834..40ae60ea81 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -19,28 +19,9 @@ #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_link_cb_list = NULL; // of sg_platf_link_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_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 - -xbt_dynar_t sg_platf_trace_cb_list = NULL; -xbt_dynar_t sg_platf_trace_connect_cb_list = NULL; - -/* ***************************************** */ -/* TUTORIAL: New TAG */ - -xbt_dynar_t sg_platf_gpu_cb_list = NULL; -/* ***************************************** */ - static int surf_parse_models_setup_already_called = 0; @@ -51,55 +32,19 @@ 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_postparse_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_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_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); - - sg_platf_trace_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_cb_t), NULL); - sg_platf_trace_connect_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_connect_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_host_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_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); - - /* ***************************************** */ - /* 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; @@ -107,7 +52,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); @@ -128,11 +72,8 @@ 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); } /** @@ -188,27 +129,17 @@ 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){ +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) { 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), @@ -331,54 +262,24 @@ 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_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); - } -} -void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) { - unsigned int iterator; - sg_platf_route_cb_t fun; - xbt_dynar_foreach(sg_platf_bypassRoute_cb_list, iterator, fun) { - fun(bypassRoute); - } -} -void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) { - unsigned int iterator; - sg_platf_route_cb_t fun; - xbt_dynar_foreach(sg_platf_bypassASroute_cb_list, iterator, fun) { - fun(bypassASroute); - } +void sg_platf_new_route(sg_platf_route_cbarg_t route) +{ + routing_get_current()->parseRoute(route); } -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_ASroute(sg_platf_route_cbarg_t ASroute) +{ + routing_get_current()->parseASroute(ASroute); } -void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) { - unsigned int iterator; - sg_platf_trace_cb_t fun; - xbt_dynar_foreach(sg_platf_trace_cb_list, iterator, fun) { - fun(trace); - } + +void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) +{ + routing_get_current()->parseBypassroute(bypassRoute); } -void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) { - unsigned int iterator; - sg_platf_trace_connect_cb_t fun; - xbt_dynar_foreach(sg_platf_trace_connect_cb_list, iterator, fun) { - fun(trace_connect); - } + +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) @@ -526,64 +427,18 @@ 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_host_add_cb(sg_platf_host_cb_t fct) { - xbt_dynar_push(sg_platf_host_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_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_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); -} -void sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t fct) { - xbt_dynar_push(sg_platf_bypassRoute_cb_list, &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); -} -void sg_platf_trace_connect_add_cb(sg_platf_trace_connect_cb_t fct) { - xbt_dynar_push(sg_platf_trace_connect_cb_list, &fct); -} + void sg_platf_rng_stream_init(unsigned long seed[6]) { RngStream_SetPackageSeed(seed); sg_platf_rng_stream = RngStream_CreateStream(NULL);