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
Fixed some issues in logs logic due to recent changes [Cristian]
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
642a698
..
c04067b
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-18,6
+18,7
@@
XBT_LOG_EXTERNAL_CATEGORY(simix_environment);
XBT_LOG_EXTERNAL_CATEGORY(simix_host);
XBT_LOG_EXTERNAL_CATEGORY(simix_process);
XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
XBT_LOG_EXTERNAL_CATEGORY(simix_host);
XBT_LOG_EXTERNAL_CATEGORY(simix_process);
XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
+XBT_LOG_EXTERNAL_CATEGORY(simix_context);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
"Logging specific to SIMIX (kernel)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
"Logging specific to SIMIX (kernel)");
@@
-55,6
+56,7
@@
void SIMIX_global_init(int *argc, char **argv)
XBT_LOG_CONNECT(simix_kernel, simix);
XBT_LOG_CONNECT(simix_process, simix);
XBT_LOG_CONNECT(simix_synchro, simix);
XBT_LOG_CONNECT(simix_kernel, simix);
XBT_LOG_CONNECT(simix_process, simix);
XBT_LOG_CONNECT(simix_synchro, simix);
+ XBT_LOG_CONNECT(simix_context, simix);
simix_global = xbt_new0(s_SIMIX_Global_t, 1);
simix_global = xbt_new0(s_SIMIX_Global_t, 1);
@@
-212,7
+214,7
@@
void SIMIX_process_killall()
SIMIX_process_empty_trash();
if (self != simix_global->maestro_process) {
SIMIX_process_empty_trash();
if (self != simix_global->maestro_process) {
-
SIMIX_context
_yield();
+
__SIMIX_process
_yield();
}
return;
}
return;
@@
-237,8
+239,8
@@
void SIMIX_clean(void)
xbt_dict_free(&(simix_global->host));
/* Let's free maestro now */
xbt_dict_free(&(simix_global->host));
/* Let's free maestro now */
- SIMIX_context_free(simix_global->maestro_process);
- free(simix_global->maestro_process);
+ SIMIX_context_free(simix_global->maestro_process
->context
);
+ free(simix_global->maestro_process);
/* Finish context module and SURF */
SIMIX_context_mod_exit();
/* Finish context module and SURF */
SIMIX_context_mod_exit();
@@
-294,7
+296,7
@@
double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
while ((process = xbt_swag_extract(simix_global->process_to_run))) {
DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
while ((process = xbt_swag_extract(simix_global->process_to_run))) {
DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
-
SIMIX_context
_schedule(process);
+
__SIMIX_process
_schedule(process);
}
{
}
{