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
Energy is now a plugin
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index aa7434acc8892550136be0f3f33bbe625a343b24..0ac19c0df0f9472a5f23ef29bf0a3a4d034278db 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);
@@
-488,7
+492,7
@@
smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
}
} else {
/* FIXME: computation size is zero. Is it okay that bound is zero ? */
}
} else {
/* 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);
+ return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0, 0.0
, 0
);
}
}
}
}
@@
-690,11
+694,9
@@
smx_action_t SIMIX_process_sleep(smx_process_t process, double duration)
{
smx_action_t action;
smx_host_t host = process->smx_host;
{
smx_action_t action;
smx_host_t host = process->smx_host;
- surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL);
/* check if the host is active */
/* check if the host is active */
- if (ws_model->extension.
- workstation.get_state(host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
@@
-708,9
+710,9
@@
smx_action_t SIMIX_process_sleep(smx_process_t process, double duration)
action->sleep.host = host;
action->sleep.surf_sleep =
action->sleep.host = host;
action->sleep.surf_sleep =
-
ws_model->extension.workstation.
sleep(host, duration);
+
surf_workstation_
sleep(host, duration);
-
ws_model->action_data_set
(action->sleep.surf_sleep, action);
+
surf_action_set_data
(action->sleep.surf_sleep, action);
XBT_DEBUG("Create sleep action %p", action);
return action;
XBT_DEBUG("Create sleep action %p", action);
return action;
@@
-722,12
+724,10
@@
void SIMIX_post_process_sleep(smx_action_t action)
e_smx_state_t state;
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
e_smx_state_t state;
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);
while ((simcall = xbt_fifo_shift(action->simcalls))) {
while ((simcall = xbt_fifo_shift(action->simcalls))) {
- switch(
ws_model->action_state_get
(action->sleep.surf_sleep)){
+ switch(
surf_action_get_state
(action->sleep.surf_sleep)){
case SURF_ACTION_FAILED:
simcall->issuer->context->iwannadie = 1;
//SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
case SURF_ACTION_FAILED:
simcall->issuer->context->iwannadie = 1;
//SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
@@
-742,8
+742,7
@@
void SIMIX_post_process_sleep(smx_action_t action)
THROW_IMPOSSIBLE;
break;
}
THROW_IMPOSSIBLE;
break;
}
- if (ws_model->extension.
- workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
+ if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
simcall_process_sleep__set__result(simcall, state);
simcall->issuer->context->iwannadie = 1;
}
simcall_process_sleep__set__result(simcall, state);
@@
-760,27
+759,20
@@
void SIMIX_process_sleep_destroy(smx_action_t action)
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
if (action->sleep.surf_sleep)
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
if (action->sleep.surf_sleep)
-
action->sleep.surf_sleep->model_obj->
action_unref(action->sleep.surf_sleep);
+
surf_
action_unref(action->sleep.surf_sleep);
xbt_mallocator_release(simix_global->action_mallocator, action);
}
void SIMIX_process_sleep_suspend(smx_action_t action)
{
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
xbt_mallocator_release(simix_global->action_mallocator, action);
}
void SIMIX_process_sleep_suspend(smx_action_t 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);
-
- ws_model->suspend(action->sleep.surf_sleep);
+ surf_action_suspend(action->sleep.surf_sleep);
}
void SIMIX_process_sleep_resume(smx_action_t action)
{
xbt_assert(action->type == SIMIX_ACTION_SLEEP);
}
void SIMIX_process_sleep_resume(smx_action_t 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);
- XBT_DEBUG("%p ws_model", ws_model);
-
- ws_model->resume(action->sleep.surf_sleep);
+ surf_action_resume(action->sleep.surf_sleep);
}
/**
}
/**