}
static int surf_parse_models_setup_already_called = 0;
-std::map<std::string, storage_type_t> storage_types;
+std::map<std::string, simgrid::surf::StorageType*> storage_types;
/** The current AS in the parsing */
static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
/** @brief Add an host to the current AS */
void sg_platf_new_host(sg_platf_host_cbarg_t args)
{
- std::unordered_map<std::string, std::string> props;
+ std::map<std::string, std::string> props;
if (args->properties) {
- xbt_dict_cursor_t cursor=nullptr;
- char *key;
- char* data;
- xbt_dict_foreach (args->properties, cursor, key, data)
- props[key] = data;
- xbt_dict_free(&args->properties);
+ for (auto elm : *args->properties)
+ props.insert({elm.first, elm.second});
+ delete args->properties;
}
simgrid::s4u::Host* host =
host->pimpl_cpu->setPState(args->pstate);
if (args->coord && strcmp(args->coord, ""))
new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
-
}
/** @brief Add a "router" to the network element list */
simgrid::kernel::routing::NetPoint* netpoint =
new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
- XBT_DEBUG("Router '%s' has the id %d", name, netpoint->id());
+ XBT_DEBUG("Router '%s' has the id %u", name, netpoint->id());
if (coords && strcmp(coords, ""))
new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
surf_network_model->createLink(link_name.c_str(), link->bandwidth, link->latency, link->policy);
if (link->properties) {
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- char* data;
- xbt_dict_foreach (link->properties, cursor, key, data)
- l->setProperty(key, data);
- xbt_dict_free(&link->properties);
+ for (auto elm : *link->properties)
+ l->setProperty(elm.first, elm.second);
+ delete link->properties;
}
if (link->latency_trace)
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.id = host_id;
- if ((cluster->properties != nullptr) && (not xbt_dict_is_empty(cluster->properties))) {
- xbt_dict_cursor_t cursor=nullptr;
- char *key;
- char* data;
- host.properties = xbt_dict_new_homogeneous(free);
-
- xbt_dict_foreach(cluster->properties,cursor,key,data) {
- xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr);
- }
+ if ((cluster->properties != nullptr) && (not cluster->properties->empty())) {
+ host.properties = new std::map<std::string, std::string>;
+
+ for (auto elm : *cluster->properties)
+ host.properties->insert({elm.first, elm.second});
}
host.speed_per_pstate = cluster->speeds;
xbt_free(host_id);
rankId++;
}
- xbt_dict_free(&cluster->properties);
+ delete cluster->properties;
// Add a router.
XBT_DEBUG(" ");
xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(),
"Refusing to add a second storage named \"%s\"", storage->id.c_str());
- storage_type_t stype;
- try {
- stype = storage_types.at(storage->type_id);
- } catch (std::out_of_range& unfound) {
+ simgrid::surf::StorageType* stype;
+ auto st = storage_types.find(storage->type_id);
+ if (st != storage_types.end()) {
+ stype = st->second;
+ } else {
xbt_die("No storage type '%s'", storage->type_id.c_str());
}
known_storages.push_back(storage->id);
// if storage content is not specified use the content of storage_type if any
- if (storage->content.empty() && strcmp(stype->content, "")) {
- storage->content = std::string(stype->content);
- XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id.c_str(), stype->type_id);
+ if (storage->content.empty() && not stype->content.empty()) {
+ storage->content = stype->content;
+ XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id.c_str(),
+ stype->id.c_str());
}
XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' "
"\n\t\tmodel '%s' \n\t\tcontent '%s' "
"\n\t\tproperties '%p''\n",
- storage->id.c_str(), stype->model, stype->type_id, storage->content.c_str(), storage->properties);
+ storage->id.c_str(), stype->model.c_str(), stype->id.c_str(), storage->content.c_str(),
+ storage->properties);
- auto s = surf_storage_model->createStorage(storage->id, stype->type_id, storage->content, storage->attach);
+ auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach);
if (storage->properties) {
- xbt_dict_cursor_t cursor = nullptr;
- char *key;
- char* data;
- xbt_dict_foreach (storage->properties, cursor, key, data)
- s->setProperty(key, data);
- xbt_dict_free(&storage->properties);
+ for (auto elm : *storage->properties)
+ s->setProperty(elm.first, elm.second);
+ delete storage->properties;
}
}
-void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type)
+void sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type)
{
xbt_assert(storage_types.find(storage_type->id) == storage_types.end(),
- "Reading a storage type, processing unit \"%s\" already exists", storage_type->id);
+ "Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str());
- 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);
- stype->size = storage_type->size;
- stype->model_properties = storage_type->model_properties;
+ simgrid::surf::StorageType* stype =
+ new simgrid::surf::StorageType(storage_type->id, storage_type->model, storage_type->content,
+ storage_type->properties, storage_type->model_properties, storage_type->size);
- XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", stype->type_id, stype->model,
- storage_type->content);
+ XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", storage_type->id.c_str(),
+ storage_type->model.c_str(), storage_type->content.c_str());
- storage_types.insert({std::string(stype->type_id), stype});
+ storage_types[storage_type->id] = stype;
}
void sg_platf_new_mount(MountCreationArgs* mount)
void sg_platf_new_process(sg_platf_process_cbarg_t process)
{
+ std::map<std::string, std::string> props;
+ if (process->properties) {
+ for (auto elm : *process->properties)
+ props.insert({elm.first, elm.second});
+ delete process->properties;
+ }
sg_host_t host = sg_host_by_name(process->host);
if (not host) {
// The requested host does not exist. Do a nice message to the user
arg->data = nullptr;
arg->host = host;
arg->kill_time = kill_time;
- arg->properties = current_property_set;
+ arg->properties = &props;
host->extension<simgrid::simix::Host>()->boot_processes.push_back(arg);
arg->data = nullptr;
arg->host = host;
arg->kill_time = kill_time;
- arg->properties = current_property_set;
+ arg->properties = &props;
XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->getCname(), start_time);
SIMIX_timer_set(start_time, [arg, auto_restart]() {
XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname());
smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host,
- current_property_set, nullptr);
+ arg->properties, nullptr);
/* The actor creation will fail if the host is currently dead, but that's fine */
if (actor != nullptr) {
auto as_cluster = static_cast<simgrid::kernel::routing::ClusterZone*>(current_routing);
if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end())
- surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
+ surf_parse_error(std::string("Host_link for '") + hostlink->id + "' is already defined!");
- XBT_DEBUG("Push Host_link for host '%s' to position %d", netpoint->cname(), netpoint->id());
+ XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->cname(), netpoint->id());
as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}});
}
