X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8cd62135619ad52e05ae1c929ef07e166e4260..e68d03f1f2c0206497381c7ef3b91bd5d46f1964:/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 a5690e7b2d..99002a2ee6 100644 --- 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 #include -#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 * * - token_ring/token_bypass.c: 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;