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
Merge branch 'coverity_scan' of github.com:mquinson/simgrid
[simgrid.git]
/
teshsuite
/
simdag
/
basic
/
basic2.c
diff --git
a/teshsuite/simdag/basic/basic2.c
b/teshsuite/simdag/basic/basic2.c
index
620f47a
..
74edbe7
100644
(file)
--- a/
teshsuite/simdag/basic/basic2.c
+++ b/
teshsuite/simdag/basic/basic2.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-2012, 2014. The SimGrid Team.
+/* Copyright (c) 2007-2012, 2014
-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-27,9
+27,8
@@
int main(int argc, char **argv)
SD_task_t taskInit;
SD_task_t taskA;
SD_task_t taskB;
SD_task_t taskInit;
SD_task_t taskA;
SD_task_t taskB;
- xbt_dynar_t ret;
- const
SD_workstation
_t *workstation;
+ const
sg_host
_t *workstation;
double communication_amount1 = 1e9;
double communication_amount2 = 1e8;
double communication_amount1 = 1e9;
double communication_amount2 = 1e8;
@@
-49,10
+48,10
@@
int main(int argc, char **argv)
/* scheduling parameters */
/* scheduling parameters */
- workstation =
SD_workstation_ge
t_list();
+ workstation =
sg_hos
t_list();
/* let's launch the simulation! */
/* let's launch the simulation! */
- SD_task_schedule(taskInit, 1,
SD_workstation_ge
t_list(), &no_cost,
+ SD_task_schedule(taskInit, 1,
sg_hos
t_list(), &no_cost,
&no_cost, -1.0);
SD_task_schedule(taskA, 1, &workstation[0], &no_cost,
&communication_amount1, -1.0);
&no_cost, -1.0);
SD_task_schedule(taskA, 1, &workstation[0], &no_cost,
&communication_amount1, -1.0);
@@
-62,8
+61,7
@@
int main(int argc, char **argv)
SD_task_dependency_add(NULL, NULL, taskInit, taskA);
SD_task_dependency_add(NULL, NULL, taskInit, taskB);
SD_task_dependency_add(NULL, NULL, taskInit, taskA);
SD_task_dependency_add(NULL, NULL, taskInit, taskB);
- ret = SD_simulate(-1.0);
- xbt_dynar_free(&ret);
+ SD_simulate(-1.0);
SD_task_destroy(taskA);
SD_task_destroy(taskB);
SD_task_destroy(taskInit);
SD_task_destroy(taskA);
SD_task_destroy(taskB);
SD_task_destroy(taskInit);