From 97f3dfe883909ad3f75c9fab7aaaf1ddde0cd7f5 Mon Sep 17 00:00:00 2001 From: navarro Date: Fri, 2 Mar 2012 19:23:42 +0100 Subject: [PATCH 1/1] Set the storage_lib and storage_type_lib from parsing. --- include/surf/surf_routing.h | 5 ++- src/surf/surf.c | 5 ++- src/surf/surf_routing.c | 82 +++++++++++++++++++++++++------------ 3 files changed, 63 insertions(+), 29 deletions(-) diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h index 7de832c5aa..1e355c6f97 100644 --- a/include/surf/surf_routing.h +++ b/include/surf/surf_routing.h @@ -31,8 +31,11 @@ extern int NS3_ASR_LEVEL; //host node for ns3 extern xbt_lib_t storage_lib; extern int ROUTING_STORAGE_LEVEL; //Routing storage level -extern int ROUTING_STORAGE_TYPE_LEVEL; //Routing storage_type level extern int ROUTING_STORAGE_HOST_LEVEL; +extern int SURF_STORAGE_LEVEL; + +extern xbt_lib_t storage_type_lib; +extern int ROUTING_STORAGE_TYPE_LEVEL; //Routing storage_type level /* The callbacks to register for the routing to work */ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type); diff --git a/src/surf/surf.c b/src/surf/surf.c index 95cfaaf167..a4ef05aa17 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -312,18 +312,20 @@ void surf_init(int *argc, char **argv) link_lib = xbt_lib_new(); as_router_lib = xbt_lib_new(); storage_lib = xbt_lib_new(); + storage_type_lib = xbt_lib_new(); XBT_DEBUG("ADD ROUTING LEVEL"); ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free); ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_free); ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free); - ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_type_free); ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free); + ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free); XBT_DEBUG("ADD SURF LEVELS"); SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free); + SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free); /* Connect our log channels: that must be done manually under windows */ XBT_LOG_CONNECT(surf_cpu, surf); @@ -419,6 +421,7 @@ void surf_exit(void) xbt_lib_free(&link_lib); xbt_lib_free(&as_router_lib); xbt_lib_free(&storage_lib); + xbt_lib_free(&storage_type_lib); tmgr_finalize(); surf_parse_lex_destroy(); diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index dc6f29ad04..8cb67c0be3 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; @@ -730,43 +733,65 @@ 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->id); + xbt_free(mnt->name); } + static void routing_parse_mount(sg_platf_mount_cbarg_t mount) { @@ -775,14 +800,17 @@ static void routing_parse_mount(sg_platf_mount_cbarg_t mount) 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); + + mount_t mnt = xbt_new0(s_mount_t, 1); + mnt->id = xbt_strdup(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) -- 2.20.1