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
cosmetics, fix indentation
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
9474cb3
..
ed61f4f
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-4,7
+4,7
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "private.h"
+#include "
smx_
private.h"
#include "xbt/heap.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/heap.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
@@
-203,8
+203,8
@@
void SIMIX_run(void)
xbt_dynar_length(simix_global->process_to_run));
SIMIX_process_runall();
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
xbt_dynar_length(simix_global->process_to_run));
SIMIX_process_runall();
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
- if (process->
request.call != REQ_NO_REQ
) {
- SIMIX_
request_pre(&process->request
, 0);
+ if (process->
simcall.call != SIMCALL_NONE
) {
+ SIMIX_
simcall_pre(&process->simcall
, 0);
}
}
}
}
}
}
@@
-229,10
+229,10
@@
void SIMIX_run(void)
xbt_dynar_foreach(model_list, iter, model) {
set = model->states.failed_action_set;
while ((action = xbt_swag_extract(set)))
xbt_dynar_foreach(model_list, iter, model) {
set = model->states.failed_action_set;
while ((action = xbt_swag_extract(set)))
- SIMIX_
request
_post((smx_action_t) action->data);
+ SIMIX_
simcall
_post((smx_action_t) action->data);
set = model->states.done_action_set;
while ((action = xbt_swag_extract(set)))
set = model->states.done_action_set;
while ((action = xbt_swag_extract(set)))
- SIMIX_
request
_post((smx_action_t) action->data);
+ SIMIX_
simcall
_post((smx_action_t) action->data);
}
/* Clean processes to destroy */
}
/* Clean processes to destroy */
@@
-334,57
+334,57
@@
void SIMIX_display_process_status(void)
const char* action_description = "unknown";
switch (process->waiting_action->type) {
const char* action_description = "unknown";
switch (process->waiting_action->type) {
-
case SIMIX_ACTION_EXECUTE:
-
action_description = "execution";
-
break;
+ case SIMIX_ACTION_EXECUTE:
+ action_description = "execution";
+ break;
-
case SIMIX_ACTION_PARALLEL_EXECUTE:
-
action_description = "parallel execution";
-
break;
+ case SIMIX_ACTION_PARALLEL_EXECUTE:
+ action_description = "parallel execution";
+ break;
-
case SIMIX_ACTION_COMMUNICATE:
-
action_description = "communication";
-
break;
+ case SIMIX_ACTION_COMMUNICATE:
+ action_description = "communication";
+ break;
-
case SIMIX_ACTION_SLEEP:
-
action_description = "sleeping";
-
break;
+ case SIMIX_ACTION_SLEEP:
+ action_description = "sleeping";
+ break;
-
case SIMIX_ACTION_SYNCHRO:
-
action_description = "synchronization";
-
break;
+ case SIMIX_ACTION_SYNCHRO:
+ action_description = "synchronization";
+ break;
-
case SIMIX_ACTION_IO:
-
action_description = "I/O";
-
break;
+ case SIMIX_ACTION_IO:
+ action_description = "I/O";
+ break;
}
}
- XBT_INFO("Process %l
d
(%s@%s): waiting for %s action %p (%s) in state %d to finish",
+ XBT_INFO("Process %l
u
(%s@%s): waiting for %s action %p (%s) in state %d to finish",
process->pid, process->name, process->smx_host->name,
process->pid, process->name, process->smx_host->name,
- action_description, process->waiting_action,
-
process->waiting_action->name,
process->waiting_action->state);
+
action_description, process->waiting_action,
+
process->waiting_action->name, (int)
process->waiting_action->state);
}
else {
}
else {
- XBT_INFO("Process %l
d
(%s@%s)", process->pid, process->name, process->smx_host->name);
+ XBT_INFO("Process %l
u
(%s@%s)", process->pid, process->name, process->smx_host->name);
}
}
}
static void* SIMIX_action_mallocator_new_f(void) {
smx_action_t action = xbt_new(s_smx_action_t, 1);
}
}
}
static void* SIMIX_action_mallocator_new_f(void) {
smx_action_t action = xbt_new(s_smx_action_t, 1);
- action->
request_list
= xbt_fifo_new();
+ action->
simcalls
= xbt_fifo_new();
return action;
}
static void SIMIX_action_mallocator_free_f(void* action) {
return action;
}
static void SIMIX_action_mallocator_free_f(void* action) {
- xbt_fifo_free(((smx_action_t) action)->
request_list
);
+ xbt_fifo_free(((smx_action_t) action)->
simcalls
);
xbt_free(action);
}
static void SIMIX_action_mallocator_reset_f(void* action) {
xbt_free(action);
}
static void SIMIX_action_mallocator_reset_f(void* action) {
- // we also recycle the
request
list
- xbt_fifo_t fifo = ((smx_action_t) action)->
request_list
;
+ // we also recycle the
simcall
list
+ xbt_fifo_t fifo = ((smx_action_t) action)->
simcalls
;
xbt_fifo_reset(fifo);
memset(action, 0, sizeof(s_smx_action_t));
xbt_fifo_reset(fifo);
memset(action, 0, sizeof(s_smx_action_t));
- ((smx_action_t) action)->
request_list
= fifo;
+ ((smx_action_t) action)->
simcalls
= fifo;
}
}