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
SIMIX: clean the processes trash after each scheduling round.
[simgrid.git]
/
testsuite
/
surf
/
surf_usage2.c
diff --git
a/testsuite/surf/surf_usage2.c
b/testsuite/surf/surf_usage2.c
index
4c9e416
..
3dcab96
100644
(file)
--- a/
testsuite/surf/surf_usage2.c
+++ b/
testsuite/surf/surf_usage2.c
@@
-42,10
+42,6
@@
void test(char *platform)
{
void *workstationA = NULL;
void *workstationB = NULL;
- surf_action_t actionA = NULL;
- surf_action_t actionB = NULL;
- surf_action_t actionC = NULL;
- surf_action_t commAB = NULL;
double now = -1.0;
int running;
@@
-62,27
+58,20
@@
void test(char *platform)
/*********************** WORKSTATION ***********************************/
workstationA =
- surf_
model_resource_by_name(surf_workstation_model,
"Cpu A");
+ surf_
workstation_resource_by_name(
"Cpu A");
workstationB =
- surf_
model_resource_by_name(surf_workstation_model,
"Cpu B");
+ surf_
workstation_resource_by_name(
"Cpu B");
/* Let's check that those two processors exist */
-
DEBUG2
("%s : %p", surf_resource_name(workstationA), workstationA);
-
DEBUG2
("%s : %p", surf_resource_name(workstationB), workstationB);
+
XBT_DEBUG
("%s : %p", surf_resource_name(workstationA), workstationA);
+
XBT_DEBUG
("%s : %p", surf_resource_name(workstationB), workstationB);
/* Let's do something on it */
- actionA =
- surf_workstation_model->extension.workstation.execute(workstationA,
- 1000.0);
- actionB =
- surf_workstation_model->extension.workstation.execute(workstationB,
- 1000.0);
- actionC =
- surf_workstation_model->extension.workstation.sleep(workstationB,
- 7.32);
-
- commAB =
- surf_workstation_model->extension.workstation.
+ surf_workstation_model->extension.workstation.execute(workstationA, 1000.0);
+ surf_workstation_model->extension.workstation.execute(workstationB, 1000.0);
+ surf_workstation_model->extension.workstation.sleep(workstationB, 7.32);
+
+ surf_workstation_model->extension.workstation.
communicate(workstationA, workstationB, 150.0, -1.0);
surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
@@
-93,26
+82,26
@@
void test(char *platform)
running = 0;
now = surf_get_clock();
-
DEBUG1
("Next Event : %g", now);
+
XBT_DEBUG
("Next Event : %g", now);
xbt_dynar_foreach(model_list, iter, model) {
-
DEBUG1
("\t %s actions", model->name);
+
XBT_DEBUG
("\t %s actions", model->name);
while ((action = xbt_swag_extract(model->states.failed_action_set))) {
-
DEBUG1
("\t * Failed : %p", action);
+
XBT_DEBUG
("\t * Failed : %p", action);
model->action_unref(action);
}
while ((action = xbt_swag_extract(model->states.done_action_set))) {
-
DEBUG1
("\t * Done : %p", action);
+
XBT_DEBUG
("\t * Done : %p", action);
model->action_unref(action);
}
if (xbt_swag_size(model->states.running_action_set)) {
-
DEBUG1
("running %s", model->name);
+
XBT_DEBUG
("running %s", model->name);
running = 1;
}
}
} while (running && surf_solve(-1.0) >= 0.0);
-
DEBUG0
("Simulation Terminated");
+
XBT_DEBUG
("Simulation Terminated");
}