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
Merge branch 'hypervisor' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid...
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index
d3fd685
..
62943b9
100644
(file)
--- a/
src/simix/smx_process.c
+++ b/
src/simix/smx_process.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
2
. The SimGrid Team.
+/* Copyright (c) 2007-201
3
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-122,8
+122,8
@@
void SIMIX_process_empty_trash(void)
xbt_dynar_free(&process->on_exit);
xbt_dynar_free(&process->on_exit);
- free(process->name);
- free(process);
+
xbt_
free(process->name);
+
xbt_
free(process);
}
}
}
}
@@
-239,8
+239,12
@@
void SIMIX_process_create(smx_process_t *process,
XBT_DEBUG("Start process %s on host '%s'", name, hostname);
if (!SIMIX_host_get_state(host)) {
XBT_DEBUG("Start process %s on host '%s'", name, hostname);
if (!SIMIX_host_get_state(host)) {
+ int i;
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
hostname);
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
hostname);
+ for (i = 0; i < argc; i++)
+ xbt_free(argv[i]);
+ xbt_free(argv);
}
else {
*process = xbt_new0(s_smx_process_t, 1);
}
else {
*process = xbt_new0(s_smx_process_t, 1);
@@
-487,7
+491,8
@@
smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
return NULL;
}
} else {
return NULL;
}
} else {
- return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
+ /* FIXME: computation size is zero. Is it okay that bound is zero ? */
+ return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0, 0.0, 0);
}
}
}
}
@@
-757,8
+762,6
@@
void SIMIX_process_sleep_destroy(smx_action_t action)
{
XBT_DEBUG("Destroy action %p", action);
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
{
XBT_DEBUG("Destroy action %p", action);
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
- smx_host_t host = action->sleep.host;
- surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL);
if (action->sleep.surf_sleep)
action->sleep.surf_sleep->model_obj->action_unref(action->sleep.surf_sleep);
if (action->sleep.surf_sleep)
action->sleep.surf_sleep->model_obj->action_unref(action->sleep.surf_sleep);