X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5b155e2a4b1773e2e294b834cc368d13a866148..3afb7fcd5847dbd9cf2005e28d45eadcf96a399b:/src/surf/sg_platf.c diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c index e08135d6e4..0af5c72f57 100644 --- a/src/surf/sg_platf.c +++ b/src/surf/sg_platf.c @@ -39,6 +39,13 @@ xbt_dynar_t sg_platf_mount_cb_list = NULL; // of sg_platf_storage_cb_t xbt_dynar_t sg_platf_process_cb_list = NULL; +/* ***************************************** */ +/* TUTORIAL: New TAG */ + +xbt_dynar_t sg_platf_gpu_cb_list = NULL; +/* ***************************************** */ + + static int surf_parse_models_setup_already_called; /* one RngStream for the platform, to respect some statistic rules */ @@ -59,8 +66,8 @@ void sg_platf_init(void) { 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_begin_cb_t),NULL); - sg_platf_AS_end_cb_list = xbt_dynar_new(sizeof(void_f_void_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); @@ -77,6 +84,12 @@ void sg_platf_init(void) { sg_platf_mount_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL); sg_platf_process_cb_list = xbt_dynar_new(sizeof(sg_platf_process_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) { @@ -107,6 +120,13 @@ void sg_platf_exit(void) { xbt_dynar_free(&sg_platf_process_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; } @@ -279,9 +299,9 @@ void sg_platf_end() { static int surf_parse_models_setup_already_called = 0; -void sg_platf_new_AS_begin(const char *id, int routing) { +void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) { unsigned int iterator; - sg_platf_AS_begin_cb_t fun; + sg_platf_AS_cb_t fun; if (!surf_parse_models_setup_already_called && !xbt_dynar_is_empty(sg_platf_AS_begin_cb_list)) { /* Initialize the surf models. That must be done after we got all config, and before we need the models. @@ -301,7 +321,7 @@ void sg_platf_new_AS_begin(const char *id, int routing) { } xbt_dynar_foreach(sg_platf_AS_begin_cb_list, iterator, fun) { - fun(id, routing); + fun(AS); } } @@ -313,6 +333,23 @@ void sg_platf_new_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); @@ -338,10 +375,10 @@ void sg_platf_cabinet_add_cb(sg_platf_cabinet_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_AS_begin_add_cb(sg_platf_AS_begin_cb_t 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(void_f_void_t 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_storage_add_cb(sg_platf_storage_cb_t fct) {