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
fullduplex support
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
d747459
..
481afb2
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-1,7
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
- All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* 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. */
@@
-318,10
+316,10
@@
double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
int actions_on_system = 0;
SIMIX_process_empty_trash();
int actions_on_system = 0;
SIMIX_process_empty_trash();
- if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
+ if (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_debug) &&
+ xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
DEBUG0("**************************************************");
}
DEBUG0("**************************************************");
}
- DEBUG1("%d processes in the to_run list",xbt_swag_size(simix_global->process_to_run));
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);
@@
-434,10
+432,6
@@
double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
while ((action = xbt_swag_extract(model->states.done_action_set))) {
smx_action = action->data;
if (smx_action) {
while ((action = xbt_swag_extract(model->states.done_action_set))) {
smx_action = action->data;
if (smx_action) {
- /* Copy the transfered data of the completed communication actions */
- /* FIXME: find a better way to determine if its a comm action */
- if(smx_action->data != NULL)
- SIMIX_network_copy_data((smx_comm_t)smx_action->data);
SIMIX_action_signal_all(smx_action);
}
}
SIMIX_action_signal_all(smx_action);
}
}