cpu->setStateTrace(host->state_trace);
if (host->speed_trace)
cpu->setSpeedTrace(host->speed_trace);
- surf_host_model->createHost(host->id, netcard, cpu, host->properties)->attach(h);
+ surf_host_model->createHost(host->id, netcard, cpu)->attach(h);
+
+ if (host->properties) {
+ xbt_dict_cursor_t cursor=NULL;
+ char *key,*data;
+ xbt_dict_foreach(host->properties,cursor,key,data)
+ h->setProperty(key,data);
+ xbt_dict_free(&host->properties);
+ }
if (host->pstate != 0)
cpu->setPState(host->pstate);
xbt_free(host_id);
rankId++;
}
+ delete radicals;
// Add a router. It is magically used thanks to the way in which surf_routing_cluster is written,
// and it's very useful to connect clusters together
}
XBT_DEBUG("</AS>");
- sg_platf_new_AS_end();
+ sg_platf_new_AS_seal();
simgrid::surf::on_cluster(cluster);
}
void sg_platf_new_process(sg_platf_process_cbarg_t process)
{
- xbt_assert(simix_global,"Cannot create process without SIMIX.");
-
sg_host_t host = sg_host_by_name(process->host);
if (!host) {
// The requested host does not exist. Do a nice message to the user
smx_process_arg_t arg = NULL;
smx_process_t process_created = NULL;
- arg = xbt_new0(s_smx_process_arg_t, 1);
+ arg = new simgrid::simix::ProcessArg();
+ arg->name = std::string(process->argv[0]);
arg->code = parse_code;
arg->data = NULL;
arg->hostname = sg_host_get_name(host);
- arg->argc = process->argc;
- arg->argv = xbt_new(char *,process->argc);
- int i;
- for (i=0; i<process->argc; i++)
- arg->argv[i] = xbt_strdup(process->argv[i]);
- arg->name = xbt_strdup(arg->argv[0]);
+ arg->args.assign(process->argc, process->argv);
arg->kill_time = kill_time;
arg->properties = current_property_set;
- if (!sg_host_simix(host)->boot_processes) {
+ if (!sg_host_simix(host)->boot_processes)
sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg);
- }
+
xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
if (start_time > SIMIX_get_clock()) {
- arg = xbt_new0(s_smx_process_arg_t, 1);
- arg->name = (char*)(process->argv)[0];
+ arg = new simgrid::simix::ProcessArg();
+ arg->name = std::string(process->argv[0]);
arg->code = parse_code;
arg->data = NULL;
arg->hostname = sg_host_get_name(host);
- arg->argc = process->argc;
- arg->argv = (char**)(process->argv);
+ arg->args.assign(process->argc, process->argv);
arg->kill_time = kill_time;
arg->properties = current_property_set;
- XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name,
- arg->hostname, start_time);
- SIMIX_timer_set(start_time, [](void* arg) {
- SIMIX_process_create_from_wrapper((smx_process_arg_t) arg);
+ XBT_DEBUG("Process %s(%s) will be started at time %f",
+ arg->name.c_str(), arg->hostname, start_time);
+ SIMIX_timer_set(start_time, [](void* p) {
+ smx_process_arg_t arg = static_cast<smx_process_arg_t>(p);
+ simix_global->create_process_function(
+ arg->name.c_str(),
+ arg->code,
+ arg->data,
+ arg->hostname,
+ arg->kill_time,
+ std::move(arg->args),
+ arg->properties,
+ arg->auto_restart,
+ NULL);
+ delete arg;
}, arg);
} else { // start_time <= SIMIX_get_clock()
- XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host));
+ XBT_DEBUG("Starting Process %s(%s) right now",
+ arg->name.c_str(), sg_host_get_name(host));
if (simix_global->create_process_function)
process_created = simix_global->create_process_function(
- arg->name,
+ arg->name.c_str(),
parse_code,
NULL,
sg_host_get_name(host),
kill_time,
- process->argc,
- (char**)(process->argv),
+ arg->args,
current_property_set,
auto_restart, NULL);
else
- 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);
+ process_created = simcall_process_create(
+ arg->name.c_str(), parse_code, NULL, sg_host_get_name(host), kill_time,
+ arg->args, 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) */
if (!process_created) {
static_cast<AsCluster*>(current_routing)->router_ = static_cast<NetCard*>(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL));
XBT_DEBUG("</AS>");
- sg_platf_new_AS_end();
+ sg_platf_new_AS_seal();
XBT_DEBUG(" ");
free(router_id);
int storage_id = -1;
char *storage_model_name = NULL;
- host_model_name = xbt_cfg_get_string(_sg_cfg_set, "host/model");
- vm_model_name = xbt_cfg_get_string(_sg_cfg_set, "vm/model");
- network_model_name = xbt_cfg_get_string(_sg_cfg_set, "network/model");
- cpu_model_name = xbt_cfg_get_string(_sg_cfg_set, "cpu/model");
- storage_model_name = xbt_cfg_get_string(_sg_cfg_set, "storage/model");
+ host_model_name = xbt_cfg_get_string("host/model");
+ vm_model_name = xbt_cfg_get_string("vm/model");
+ network_model_name = xbt_cfg_get_string("network/model");
+ cpu_model_name = xbt_cfg_get_string("cpu/model");
+ storage_model_name = xbt_cfg_get_string("storage/model");
/* Check whether we use a net/cpu model differing from the default ones, in which case
* we should switch to the "compound" host model to correctly dispatch stuff to
* the right net/cpu models.
*/
- if ((!xbt_cfg_is_default_value(_sg_cfg_set, "network/model") ||
- !xbt_cfg_is_default_value(_sg_cfg_set, "cpu/model")) &&
- xbt_cfg_is_default_value(_sg_cfg_set, "host/model")) {
+ if ((!xbt_cfg_is_default_value("network/model") ||
+ !xbt_cfg_is_default_value("cpu/model")) &&
+ xbt_cfg_is_default_value("host/model")) {
host_model_name = "compound";
- xbt_cfg_set_string(_sg_cfg_set, "host/model", host_model_name);
+ xbt_cfg_set_string("host/model", host_model_name);
}
XBT_DEBUG("host model: %s", host_model_name);
*
* Add a new autonomous system to the platform. Any elements (such as host,
* router or sub-AS) added after this call and before the corresponding call
- * to sg_platf_new_AS_close() will be added to this AS.
+ * to sg_platf_new_AS_seal() will be added to this AS.
*
* Once this function was called, the configuration concerning the used
* models cannot be changed anymore.
*
- * @param AS_id name of this autonomous system. Must be unique in the platform
- * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
+ * @param AS the parameters defining the AS to build.
*/
-void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
+simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
{
if (!surf_parse_models_setup_already_called) {
/* Initialize the surf models. That must be done after we got all config, and before we need the models.
simgrid::surf::asCreatedCallbacks(new_as);
if (TRACE_is_enabled())
sg_instr_AS_begin(AS);
+
+ return new_as;
}
/**
- * \brief Specify that the current description of AS is finished
+ * \brief Specify that the description of the current AS is finished
*
- * Once you've declared all the content of your AS, you have to close
+ * Once you've declared all the content of your AS, you have to seal
* it with this call. Your AS is not usable until you call this function.
*/
-void sg_platf_new_AS_end()
+void sg_platf_new_AS_seal()
{
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->seal();