X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7252fa251634f51cf28f3b286b20b9d55fbc2702..6f96af1403cf082547c5a77abaf61d1ceddf3057:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index dc6f29ad04..96d36345c7 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -36,8 +36,11 @@ static xbt_dict_t random_value = NULL; xbt_lib_t storage_lib; int ROUTING_STORAGE_LEVEL; //Routing for storagelevel -int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level int ROUTING_STORAGE_HOST_LEVEL; +int SURF_STORAGE_LEVEL; + +xbt_lib_t storage_type_lib; +int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level /* Global vars */ routing_global_t global_routing = NULL; @@ -501,8 +504,6 @@ static void elements_father(const char *src, const char *dst, static void _get_route_and_latency(const char *src, const char *dst, xbt_dynar_t * links, double *latency) { - void *link; - unsigned int cpt; s_route_t route; memset(&route,0,sizeof(route)); @@ -537,10 +538,7 @@ static void _get_route_and_latency(const char *src, const char *dst, // // FIXME this path is never tested. I need examples to check the bypass mechanism... // THROW_UNIMPLEMENTED; // let's warn the users of the problem - xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) { - xbt_dynar_push(*links, &link); - } - + xbt_dynar_merge(links,&(e_route_bypass->link_list)); generic_free_route(e_route_bypass); return; } @@ -561,21 +559,12 @@ static void _get_route_and_latency(const char *src, const char *dst, if (strcmp(src, src_gateway)) _get_route_and_latency(src, src_gateway, links, latency); - xbt_dynar_foreach(route.link_list, cpt, link) { - xbt_dynar_push(*links, &link); - } + xbt_dynar_merge(links,&(route.link_list)); /* If dest gateway is not our destination, we have to recursively find our way from this point */ // FIXME why can't I factorize it the same way than [src;src_gw] without breaking the examples?? if (strcmp(dst_gateway, dst)) { - xbt_dynar_t route_dst = xbt_dynar_new(global_routing->size_of_link,NULL); - - _get_route_and_latency(dst_gateway, dst, &route_dst, latency); - - xbt_dynar_foreach(route_dst, cpt, link) { - xbt_dynar_push(*links, &link); - } - xbt_dynar_free(&route_dst); + _get_route_and_latency(dst_gateway, dst, links, latency); } xbt_free(src_gateway); @@ -616,25 +605,18 @@ static xbt_dynar_t recursive_get_onelink_routes(AS_t rc) xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); //adding my one link routes - unsigned int cpt; - void *link; xbt_dynar_t onelink_mine = rc->get_onelink_routes(rc); - if (onelink_mine) { - xbt_dynar_foreach(onelink_mine, cpt, link) { - xbt_dynar_push(ret, &link); - } - } + if (onelink_mine) + xbt_dynar_merge(&ret,&onelink_mine); + //recursing char *key; xbt_dict_cursor_t cursor = NULL; AS_t rc_child; xbt_dict_foreach(rc->routing_sons, cursor, key, rc_child) { xbt_dynar_t onelink_child = recursive_get_onelink_routes(rc_child); - if (onelink_child) { - xbt_dynar_foreach(onelink_child, cpt, link) { - xbt_dynar_push(ret, &link); - } - } + if (onelink_child) + xbt_dynar_merge(&ret,&onelink_child); } return ret; } @@ -730,59 +712,81 @@ static void routing_parse_storage(sg_platf_storage_cbarg_t storage) "Reading a storage, processing unit \"%s\" already exists", storage->id); // Verification of an existing type_id - void* storage_type = xbt_lib_get_or_null(storage_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); + void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id); - XBT_INFO("ROUTING Create a storage name '%s' with type_id '%s'",storage->id,storage->type_id); + XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s'", + storage->id, + storage->type_id); - xbt_lib_set(storage_lib,storage->id,ROUTING_STORAGE_LEVEL,(void *) xbt_strdup(storage->type_id)); + xbt_lib_set(storage_lib, + storage->id, + ROUTING_STORAGE_LEVEL, + (void *) xbt_strdup(storage->type_id)); } static void routing_parse_storage_type(sg_platf_storage_type_cbarg_t storage_type) { - xbt_assert(!xbt_lib_get_or_null(storage_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL), + xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL), "Reading a storage type, processing unit \"%s\" already exists", storage_type->id); - XBT_INFO("ROUTING Create a storage type_id '%s' with model '%s'",storage_type->id,storage_type->model); storage_type_t stype = xbt_new0(s_storage_type_t, 1); stype->model = xbt_strdup(storage_type->model); stype->properties = storage_type->properties; stype->content = xbt_strdup(storage_type->content); stype->type_id = xbt_strdup(storage_type->id); - xbt_lib_set(storage_lib,storage_type->id,ROUTING_STORAGE_TYPE_LEVEL,(void *) stype); + XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s' content '%s' and properties '%p'", + stype->type_id, + stype->model, + stype->content, + stype->properties); + + xbt_lib_set(storage_type_lib, + stype->type_id, + ROUTING_STORAGE_TYPE_LEVEL, + (void *) stype); } static void routing_parse_mstorage(sg_platf_mstorage_cbarg_t mstorage) { - mount_t mnt = xbt_new0(s_mount_t, 1); - mnt->type_id = xbt_strdup(mstorage->type_id); - mnt->name = xbt_strdup(mstorage->name); + THROW_UNIMPLEMENTED; +// mount_t mnt = xbt_new0(s_mount_t, 1); +// mnt->id = xbt_strdup(mstorage->type_id); +// mnt->name = xbt_strdup(mstorage->name); +// +// if(!mount_list){ +// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id); +// mount_list = xbt_dynar_new(sizeof(char *), NULL); +// } +// xbt_dynar_push(mount_list,(void *) mnt); +// free(mnt->id); +// free(mnt->name); +// xbt_free(mnt); +// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id); +} - if(!mount_list){ - XBT_INFO("Creata a Mount list for %s",A_surfxml_host_id); - mount_list = xbt_dynar_new(sizeof(char *), NULL); - } - xbt_dynar_push(mount_list,(void *) mnt); - free(mnt->type_id); - free(mnt->name); - xbt_free(mnt); - XBT_INFO("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->type_id); +static void mount_free(void *p) +{ + mount_t mnt = p; + xbt_free(mnt->name); } + static void routing_parse_mount(sg_platf_mount_cbarg_t mount) { - // Verification of an existing storage void* storage = xbt_lib_get_or_null(storage_lib, mount->id,ROUTING_STORAGE_LEVEL); xbt_assert(storage,"Disk id \"%s\" does not exists", mount->id); XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name); - sg_platf_mstorage_cbarg_t mstorage = xbt_new0(s_sg_platf_mstorage_cbarg_t, 1); - mstorage->name = xbt_strdup(mount->name); - mstorage->type_id = xbt_strdup((const char*)storage); - - routing_parse_mstorage(mstorage); - free(mstorage->name); - free(mstorage->type_id); - xbt_free(mstorage); + + s_mount_t mnt; + mnt.id = surf_storage_resource_by_name(mount->id); + mnt.name = xbt_strdup(mount->name); + + if(!mount_list){ + XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id); + mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free); + } + xbt_dynar_push(mount_list,&mnt); } static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster)