X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..5e9ecc268a45db21daf49b37edb7df76987f798b:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 206a1ee60c..0c7df96202 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -9,19 +9,28 @@ #include "xbt/str.h" #include "xbt/dict.h" #include "xbt/RngStream.h" +#include #include "simgrid/platf_interface.h" #include "surf/surf_routing.h" #include "surf/surf.h" #include "src/simix/smx_private.h" +#include "src/surf/platform.hpp" #include "cpu_interface.hpp" #include "host_interface.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -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 + +namespace simgrid { +namespace surf { + +simgrid::xbt::signal on_link; +simgrid::xbt::signal on_cluster; +simgrid::xbt::signal on_postparse; + +} +} static int surf_parse_models_setup_already_called = 0; @@ -30,47 +39,69 @@ static RngStream sg_platf_rng_stream = NULL; /** Module management function: creates all internal data structures */ void sg_platf_init(void) { - - //FIXME : Ugly, but useful... - 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); } /** 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); + simgrid::surf::on_link.disconnect_all_slots(); + simgrid::surf::on_cluster.disconnect_all_slots(); + simgrid::surf::on_postparse.disconnect_all_slots(); /* make sure that we will reinit the models while loading the platf once reinited */ surf_parse_models_setup_already_called = 0; } +/** @brief Add an "host" to the current AS */ 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); + "Refusing to create a second host named '%s'.", host->id); - simgrid::surf::RoutingEdge *net = NULL; simgrid::surf::As* current_routing = routing_get_current(); - if (current_routing) - net = routing_add_host(current_routing, host); - - simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( - host->id, - host->speed_peak, - host->pstate, - 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); + if (current_routing->p_hierarchy == SURF_ROUTING_NULL) + current_routing->p_hierarchy = SURF_ROUTING_BASE; + + simgrid::surf::NetCard *netcard = + new simgrid::surf::NetCardImpl(xbt_strdup(host->id), -1, SURF_NETWORK_ELEMENT_HOST, current_routing); + + netcard->setId(current_routing->parsePU(netcard)); + sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id); + h->pimpl_netcard = netcard; + simgrid::surf::netcardCreatedCallbacks(netcard); + + if(mount_list){ + xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); + mount_list = NULL; + } + + if (host->coord && strcmp(host->coord, "")) { + unsigned int cursor; + char*str; + + if (!COORD_HOST_LEVEL) + xbt_die ("To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); + /* Pre-parse the host coordinates -- FIXME factorize with routers by overloading the routing->parse_PU function*/ + xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " "); + xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); + xbt_dynar_foreach(ctn_str,cursor, str) { + double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); + xbt_dynar_push(ctn,&val); + } + xbt_dynar_shrink(ctn, 0); + xbt_dynar_free(&ctn_str); + h->extension_set(COORD_HOST_LEVEL, (void *) ctn); + XBT_DEBUG("Having set host coordinates for '%s'",host->id); + } + + + simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, + host->speed_peak, + host->pstate, + host->speed_scale, host->speed_trace, + host->core_amount, + host->initiallyOn, host->state_trace); + surf_host_model->createHost(host->id, netcard, cpu, host->properties)->attach(h); + simgrid::s4u::Host::onCreation(*h); if (TRACE_is_enabled() && TRACE_needs_platform()) sg_instr_new_host(host); @@ -89,12 +120,12 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) "Reading a router, processing unit \"%s\" already exists", router->id); - simgrid::surf::RoutingEdge *info = new simgrid::surf::RoutingEdgeImpl( + simgrid::surf::NetCard *info = new simgrid::surf::NetCardImpl( 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()); - simgrid::surf::routingEdgeCreatedCallbacks(info); + simgrid::surf::netcardCreatedCallbacks(info); if (router->coord && strcmp(router->coord, "")) { unsigned int cursor; @@ -106,7 +137,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) xbt_dynar_t ctn_str = xbt_str_split_str(router->coord, " "); xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); xbt_dynar_foreach(ctn_str,cursor, str) { - double val = atof(str); + double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); xbt_dynar_push(ctn,&val); } xbt_dynar_shrink(ctn, 0); @@ -115,39 +146,27 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) XBT_DEBUG("Having set router coordinates for '%s'",router->id); } - if (TRACE_is_enabled()) + if (TRACE_is_enabled() && TRACE_needs_platform()) sg_instr_new_router(router); } void sg_platf_new_link(sg_platf_link_cbarg_t link){ - unsigned int iterator; - sg_platf_link_cb_t fun; - xbt_dynar_foreach(sg_platf_link_cb_list, iterator, fun) { - fun(link); - } + simgrid::surf::on_link(link); } 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); - } + simgrid::surf::on_cluster(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, @@ -159,12 +178,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; @@ -181,13 +195,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){ @@ -286,8 +300,27 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) xbt_die("Cannot create process without SIMIX."); sg_host_t host = sg_host_by_name(process->host); - if (!host) - THROWF(arg_error, 0, "Host '%s' unknown", process->host); + if (!host) { + // The requested host does not exist. Do a nice message to the user + char *tmp = bprintf("Cannot create process '%s': host '%s' does not exist\nExisting hosts: '",process->function, process->host); + xbt_strbuff_t msg = xbt_strbuff_new_from(tmp); + free(tmp); + xbt_dynar_t all_hosts = xbt_dynar_sort_strings(sg_hosts_as_dynar()); + simgrid::s4u::Host* host; + unsigned int cursor; + xbt_dynar_foreach(all_hosts,cursor, host) { + xbt_strbuff_append(msg,host->name().c_str()); + xbt_strbuff_append(msg,"', '"); + if (msg->used > 1024) { + msg->data[msg->used-3]='\0'; + msg->used -= 3; + + xbt_strbuff_append(msg," ...(list truncated)......");// That will be shortened by 3 chars when existing the loop + } + } + msg->data[msg->used-3]='\0'; + xbt_die("%s", msg->data); + } xbt_main_func_t parse_code = SIMIX_get_registered_function(process->function); xbt_assert(parse_code, "Function '%s' unknown", process->function); @@ -332,11 +365,11 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) SIMIX_process_create_from_wrapper((smx_process_arg_t) arg); }, arg); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", process->argv[0], sg_host_get_name(host)); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host)); if (simix_global->create_process_function) process_created = simix_global->create_process_function( - (char*)(process->argv)[0], + arg->name, parse_code, NULL, sg_host_get_name(host), @@ -346,7 +379,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) current_property_set, auto_restart, NULL); else - process_created = simcall_process_create((char*)(process->argv)[0], parse_code, NULL, sg_host_get_name(host), kill_time, process->argc, + process_created = simcall_process_create(arg->name, parse_code, NULL, sg_host_get_name(host), kill_time, process->argc, (char**)process->argv, current_property_set,auto_restart); /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */ @@ -383,11 +416,7 @@ void sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_cbarg_t ASro void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } void sg_platf_end() { - unsigned int iterator; - void_f_void_t fun; - xbt_dynar_foreach(sg_platf_postparse_cb_list, iterator, fun) { - fun(); - } + simgrid::surf::on_postparse(); } void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) @@ -427,16 +456,6 @@ void sg_platf_new_AS_end() } /* ***************************************** */ -void sg_platf_link_add_cb(sg_platf_link_cb_t fct) { - xbt_dynar_push(sg_platf_link_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_postparse_add_cb(void_f_void_t fct) { - xbt_dynar_push(sg_platf_postparse_cb_list, &fct); -} - void sg_platf_rng_stream_init(unsigned long seed[6]) { RngStream_SetPackageSeed(seed); sg_platf_rng_stream = RngStream_CreateStream(NULL);