Reduce the amount of implicit include directories

[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..c25f43d 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,8 +6,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "msg/msg.h"
-#include "surf/surf_private.h"
+#include "surf/surfxml_parse.h"
+#include "simgrid/msg.h"
 
 int host(int argc, char *argv[]);
 unsigned int task_comp_size = 50000000;
@@ -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.
@@ -32,7 +30,7 @@ int host(int argc, char *argv[])
   int host_number = atoi(MSG_process_get_name(MSG_process_self()));
   char mailbox[256];
   msg_task_t task = NULL;
-  _XBT_GNUC_UNUSED int res;
+  XBT_ATTRIB_UNUSED int res;
   if (host_number == 0){ //master  send then receive
     sprintf(mailbox, "%d", host_number+1);
     task = MSG_task_create("Token", task_comp_size, task_comm_size, NULL);
@@ -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";
-  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;
@@ -92,7 +92,6 @@ static int surf_parse_bypass_platform(void)
 
   sg_platf_new_AS_end();
   sg_platf_end();
-  sg_platf_exit();
   return 0;
 }