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
Remove xbt_dict_t workstations from SD_global.
[simgrid.git]
/
src
/
simix
/
smx_host.c
diff --git
a/src/simix/smx_host.c
b/src/simix/smx_host.c
index
afc406c
..
b655087
100644
(file)
--- a/
src/simix/smx_host.c
+++ b/
src/simix/smx_host.c
@@
-36,8
+36,7
@@
smx_host_t SIMIX_host_create(const char *name,
xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
- xbt_dict_set(simix_global->host, smx_host->name, smx_host,
- &SIMIX_host_destroy);
+ xbt_lib_set(host_lib,smx_host->name,SIMIX_HOST_LEVEL,smx_host);
return smx_host;
}
return smx_host;
}
@@
-78,23
+77,13
@@
void SIMIX_host_destroy(void *h)
return;
}
return;
}
-/**
- * \brief Returns a dict of all hosts.
- *
- * \return List of all hosts (as a #xbt_dict_t)
- */
-xbt_dict_t SIMIX_host_get_dict(void)
-{
- return simix_global->host;
-}
-
smx_host_t SIMIX_host_get_by_name(const char *name)
{
xbt_assert0(((simix_global != NULL)
smx_host_t SIMIX_host_get_by_name(const char *name)
{
xbt_assert0(((simix_global != NULL)
- && (
simix_global->host
!= NULL)),
+ && (
host_lib
!= NULL)),
"Environment not set yet");
"Environment not set yet");
- return xbt_
dict_get_or_null(simix_global->host, name
);
+ return xbt_
lib_get_or_null(host_lib, name, SIMIX_HOST_LEVEL
);
}
smx_host_t SIMIX_host_self(void)
}
smx_host_t SIMIX_host_self(void)
@@
-178,13
+167,13
@@
void SIMIX_host_set_data(smx_host_t host, void *data)
}
smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
}
smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
- double computation_amount)
+ double computation_amount,
+ double priority)
{
/* alloc structures and initialize */
{
/* alloc structures and initialize */
- smx_action_t action = xbt_
new0(s_smx_action_t, 1
);
+ smx_action_t action = xbt_
mallocator_get(simix_global->action_mallocator
);
action->type = SIMIX_ACTION_EXECUTE;
action->name = xbt_strdup(name);
action->type = SIMIX_ACTION_EXECUTE;
action->name = xbt_strdup(name);
- action->request_list = xbt_fifo_new();
action->state = SIMIX_RUNNING;
action->execution.host = host;
action->state = SIMIX_RUNNING;
action->execution.host = host;
@@
-198,13
+187,14
@@
smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
surf_workstation_model->extension.workstation.execute(host->host,
computation_amount);
surf_workstation_model->action_data_set(action->execution.surf_exec, action);
surf_workstation_model->extension.workstation.execute(host->host,
computation_amount);
surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+ surf_workstation_model->set_priority(action->execution.surf_exec, priority);
}
#ifdef HAVE_TRACING
TRACE_smx_host_execute(action);
#endif
}
#ifdef HAVE_TRACING
TRACE_smx_host_execute(action);
#endif
-
DEBUG1
("Create execute action %p", action);
+
XBT_DEBUG
("Create execute action %p", action);
return action;
}
return action;
}
@@
-218,10
+208,9
@@
smx_action_t SIMIX_host_parallel_execute( const char *name,
int i;
/* alloc structures and initialize */
int i;
/* alloc structures and initialize */
- smx_action_t action = xbt_
new0(s_smx_action_t, 1
);
+ smx_action_t action = xbt_
mallocator_get(simix_global->action_mallocator
);
action->type = SIMIX_ACTION_PARALLEL_EXECUTE;
action->name = xbt_strdup(name);
action->type = SIMIX_ACTION_PARALLEL_EXECUTE;
action->name = xbt_strdup(name);
- action->request_list = xbt_fifo_new();
action->state = SIMIX_RUNNING;
action->execution.host = NULL; /* FIXME: do we need the list of hosts? */
action->state = SIMIX_RUNNING;
action->execution.host = NULL; /* FIXME: do we need the list of hosts? */
@@
-243,19
+232,16
@@
smx_action_t SIMIX_host_parallel_execute( const char *name,
surf_workstation_model->action_data_set(action->execution.surf_exec, action);
}
surf_workstation_model->action_data_set(action->execution.surf_exec, action);
}
-
DEBUG1
("Create parallel execute action %p", action);
+
XBT_DEBUG
("Create parallel execute action %p", action);
return action;
}
void SIMIX_host_execution_destroy(smx_action_t action)
{
return action;
}
void SIMIX_host_execution_destroy(smx_action_t action)
{
-
DEBUG1
("Destroy action %p", action);
+
XBT_DEBUG
("Destroy action %p", action);
- if (action->name)
- xbt_free(action->name);
-
- xbt_fifo_free(action->request_list);
+ xbt_free(action->name);
if (action->execution.surf_exec) {
surf_workstation_model->action_unref(action->execution.surf_exec);
if (action->execution.surf_exec) {
surf_workstation_model->action_unref(action->execution.surf_exec);
@@
-265,12
+251,12
@@
void SIMIX_host_execution_destroy(smx_action_t action)
#ifdef HAVE_TRACING
TRACE_smx_action_destroy(action);
#endif
#ifdef HAVE_TRACING
TRACE_smx_action_destroy(action);
#endif
- xbt_
free(
action);
+ xbt_
mallocator_release(simix_global->action_mallocator,
action);
}
void SIMIX_host_execution_cancel(smx_action_t action)
{
}
void SIMIX_host_execution_cancel(smx_action_t action)
{
-
DEBUG1
("Cancel action %p", action);
+
XBT_DEBUG
("Cancel action %p", action);
if (action->execution.surf_exec)
surf_workstation_model->action_cancel(action->execution.surf_exec);
if (action->execution.surf_exec)
surf_workstation_model->action_cancel(action->execution.surf_exec);
@@
-301,7
+287,7
@@
void SIMIX_pre_host_execution_wait(smx_req_t req)
{
smx_action_t action = req->host_execution_wait.execution;
{
smx_action_t action = req->host_execution_wait.execution;
-
DEBUG2
("Wait for execution of action %p, state %d", action, action->state);
+
XBT_DEBUG
("Wait for execution of action %p, state %d", action, action->state);
/* Associate this request to the action */
xbt_fifo_push(action->request_list, req);
/* Associate this request to the action */
xbt_fifo_push(action->request_list, req);
@@
-311,6
+297,7
@@
void SIMIX_pre_host_execution_wait(smx_req_t req)
if (MC_IS_ENABLED){
action->state = SIMIX_DONE;
SIMIX_execution_finish(action);
if (MC_IS_ENABLED){
action->state = SIMIX_DONE;
SIMIX_execution_finish(action);
+ return;
}
/* If the action is already finished then perform the error handling */
}
/* If the action is already finished then perform the error handling */
@@
-341,12
+328,12
@@
void SIMIX_execution_finish(smx_action_t action)
case SIMIX_DONE:
/* do nothing, action done*/
case SIMIX_DONE:
/* do nothing, action done*/
-
DEBUG0
("SIMIX_execution_finished: execution successful");
+
XBT_DEBUG
("SIMIX_execution_finished: execution successful");
break;
case SIMIX_FAILED:
TRY {
break;
case SIMIX_FAILED:
TRY {
-
DEBUG1
("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
+
XBT_DEBUG
("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
THROW0(host_error, 0, "Host failed");
}
CATCH(req->issuer->running_ctx->exception) {
THROW0(host_error, 0, "Host failed");
}
CATCH(req->issuer->running_ctx->exception) {
@@
-356,7
+343,7
@@
void SIMIX_execution_finish(smx_action_t action)
case SIMIX_CANCELED:
TRY {
case SIMIX_CANCELED:
TRY {
-
DEBUG0
("SIMIX_execution_finished: execution canceled");
+
XBT_DEBUG
("SIMIX_execution_finished: execution canceled");
THROW0(cancel_error, 0, "Canceled");
}
CATCH(req->issuer->running_ctx->exception) {
THROW0(cancel_error, 0, "Canceled");
}
CATCH(req->issuer->running_ctx->exception) {
@@
-368,8
+355,12
@@
void SIMIX_execution_finish(smx_action_t action)
THROW_IMPOSSIBLE;
}
req->issuer->waiting_action = NULL;
THROW_IMPOSSIBLE;
}
req->issuer->waiting_action = NULL;
+ req->host_execution_wait.result = action->state;
SIMIX_request_answer(req);
}
SIMIX_request_answer(req);
}
+
+ /* We no longer need it */
+ SIMIX_host_execution_destroy(action);
}
void SIMIX_post_host_execute(smx_action_t action)
}
void SIMIX_post_host_execute(smx_action_t action)