#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);
-static simgrid::xbt::signal<void(sg_platf_link_cbarg_t)> on_link;
-static simgrid::xbt::signal<void(sg_platf_cluster_cbarg_t)> on_cluster;
-static simgrid::xbt::signal<void(void)> on_postparse;
+
+namespace simgrid {
+namespace surf {
+
+simgrid::xbt::signal<void(sg_platf_link_cbarg_t)> on_link;
+simgrid::xbt::signal<void(sg_platf_cluster_cbarg_t)> on_cluster;
+simgrid::xbt::signal<void(void)> on_postparse;
+
+}
+}
static int surf_parse_models_setup_already_called = 0;
/** Module management function: frees all internal data structures */
void sg_platf_exit(void) {
- on_link.disconnect_all_slots();
- on_cluster.disconnect_all_slots();
- on_postparse.disconnect_all_slots();
+ 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::NetCard *net = NULL;
simgrid::surf::As* current_routing = routing_get_current();
- if (current_routing)
- net = routing_add_host(current_routing, host);
+ 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);
- 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, net, cpu, host->properties)->attach(h);
+ 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())
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);
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){
- on_link(link);
+ simgrid::surf::on_link(link);
}
void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
{
routing_new_cluster(cluster);
- on_cluster(cluster);
+ simgrid::surf::on_cluster(cluster);
}
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){
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);
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),
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) */
void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
void sg_platf_end() {
- on_postparse();
+ simgrid::surf::on_postparse();
}
void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
}
/* ***************************************** */
-void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
- on_link.connect(fct);
-}
-void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) {
- on_cluster.connect(fct);
-}
-void sg_platf_postparse_add_cb(void_f_void_t fct) {
- on_postparse.connect(fct);
-}
-
void sg_platf_rng_stream_init(unsigned long seed[6]) {
RngStream_SetPackageSeed(seed);
sg_platf_rng_stream = RngStream_CreateStream(NULL);
