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
Update copyright notices
[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
a5690e7
..
c36d023
100644
(file)
--- a/
examples/msg/token_ring/token_bypass.c
+++ b/
examples/msg/token_ring/token_bypass.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008
, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2008
-2010, 2012-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
@@
-6,7
+6,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "
msg
/msg.h"
+#include "
simgrid
/msg.h"
#include "surf/surf_private.h"
int host(int argc, char *argv[]);
#include "surf/surf_private.h"
int host(int argc, char *argv[]);
@@
-19,8
+19,6
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(ring,
"Messages specific for this msg example");
/** @addtogroup MSG_examples
"Messages specific for this msg example");
/** @addtogroup MSG_examples
- *
- * @section MSG_ex_apps Examples of full applications
*
* - <b>token_ring/token_bypass.c</b>: Classical token ring with a bypass deployment.
* A token is exchanged along a ring to reach every participant.
*
* - <b>token_ring/token_bypass.c</b>: Classical token ring with a bypass deployment.
* A token is exchanged along a ring to reach every participant.
@@
-69,12
+67,14
@@
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 = 98095000;
+ bob.power_peak = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push_as(bob.power_peak, double, 98095000.0);
sg_platf_new_host(&bob);
s_sg_platf_host_cbarg_t alice = SG_PLATF_HOST_INITIALIZER;
alice.id = "alice";
sg_platf_new_host(&bob);
s_sg_platf_host_cbarg_t alice = SG_PLATF_HOST_INITIALIZER;
alice.id = "alice";
- alice.power_peak = 98095000;
+ alice.power_peak = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push_as(alice.power_peak, double, 98095000.0);
sg_platf_new_host(&alice);
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
sg_platf_new_host(&alice);
s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;