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 9e1c14b..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
@@ -6,7 +6,7 @@
 
 #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[]);
@@ -19,8 +19,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(ring,
                              "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.
@@ -62,16 +60,21 @@ int host(int argc, char *argv[])
 static int surf_parse_bypass_platform(void)
 {
   sg_platf_begin();
-  sg_platf_new_AS_begin("AS0", A_surfxml_AS_routing_Full);
+  s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+  AS.id = "AS0";
+  AS.routing = A_surfxml_AS_routing_Full;
+  sg_platf_new_AS_begin(&AS);
 
   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";
-  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;
@@ -118,7 +121,7 @@ int main(int argc, char **argv)
 
   res = MSG_main();
   XBT_INFO("Simulation time %g", MSG_get_clock());
-  MSG_clean();
+
   if (res == MSG_OK)
     return 0;
   else