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
Accept the fact that NS3 timings may vary with the version
[simgrid.git]
/
examples
/
msg
/
token_ring
/
token_bypass.c
diff --git
a/examples/msg/token_ring/token_bypass.c
b/examples/msg/token_ring/token_bypass.c
index
99002a2
..
64e840d
100644
(file)
--- a/
examples/msg/token_ring/token_bypass.c
+++ b/
examples/msg/token_ring/token_bypass.c
@@
-6,8
+6,8
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include "surf/surfxml_parse.h"
#include "simgrid/msg.h"
#include "simgrid/msg.h"
-#include "surf/surf_private.h"
int host(int argc, char *argv[]);
unsigned int task_comp_size = 50000000;
int host(int argc, char *argv[]);
unsigned int task_comp_size = 50000000;
@@
-67,15
+67,17
@@
static int surf_parse_bypass_platform(void)
s_sg_platf_host_cbarg_t bob = SG_PLATF_HOST_INITIALIZER;
bob.id = "bob";
s_sg_platf_host_cbarg_t bob = SG_PLATF_HOST_INITIALIZER;
bob.id = "bob";
- bob.
power
_peak = xbt_dynar_new(sizeof(double), NULL);
- xbt_dynar_push_as(bob.
power
_peak, double, 98095000.0);
+ bob.
speed
_peak = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push_as(bob.
speed
_peak, double, 98095000.0);
sg_platf_new_host(&bob);
sg_platf_new_host(&bob);
+ xbt_dynar_free(&bob.speed_peak);
s_sg_platf_host_cbarg_t alice = SG_PLATF_HOST_INITIALIZER;
alice.id = "alice";
s_sg_platf_host_cbarg_t alice = SG_PLATF_HOST_INITIALIZER;
alice.id = "alice";
- alice.
power
_peak = xbt_dynar_new(sizeof(double), NULL);
- xbt_dynar_push_as(alice.
power
_peak, double, 98095000.0);
+ alice.
speed
_peak = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push_as(alice.
speed
_peak, double, 98095000.0);
sg_platf_new_host(&alice);
sg_platf_new_host(&alice);
+ xbt_dynar_free(&alice.speed_peak);
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
link.id = "link1";
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
link.id = "link1";
@@
-92,7
+94,6
@@
static int surf_parse_bypass_platform(void)
sg_platf_new_AS_end();
sg_platf_end();
sg_platf_new_AS_end();
sg_platf_end();
- sg_platf_exit();
return 0;
}
return 0;
}