A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small cleanups
[simgrid.git]
/
src
/
surf
/
sg_platf.cpp
diff --git
a/src/surf/sg_platf.cpp
b/src/surf/sg_platf.cpp
index
112e185
..
a073a63
100644
(file)
--- a/
src/surf/sg_platf.cpp
+++ b/
src/surf/sg_platf.cpp
@@
-158,6
+158,7
@@
void sg_platf_new_host(sg_platf_host_cbarg_t host)
char *key,*data;
xbt_dict_foreach(host->properties,cursor,key,data)
h->setProperty(key,data);
char *key,*data;
xbt_dict_foreach(host->properties,cursor,key,data)
h->setProperty(key,data);
+ xbt_dict_free(&host->properties);
}
if (host->pstate != 0)
}
if (host->pstate != 0)
@@
-353,6
+354,7
@@
void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
xbt_free(host_id);
rankId++;
}
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
// 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
@@
-541,8
+543,6
@@
void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
void sg_platf_new_process(sg_platf_process_cbarg_t process)
{
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
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
@@
-587,9
+587,9
@@
void sg_platf_new_process(sg_platf_process_cbarg_t process)
arg->name = xbt_strdup(arg->argv[0]);
arg->kill_time = kill_time;
arg->properties = current_property_set;
arg->name = xbt_strdup(arg->argv[0]);
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);
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()) {
xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
if (start_time > SIMIX_get_clock()) {
@@
-603,8
+603,7
@@
void sg_platf_new_process(sg_platf_process_cbarg_t process)
arg->kill_time = kill_time;
arg->properties = current_property_set;
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);
+ 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);
}, arg);
SIMIX_timer_set(start_time, [](void* arg) {
SIMIX_process_create_from_wrapper((smx_process_arg_t) arg);
}, arg);