X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e78565ea6b354a0e6250a87b483f909665a0ac3..4365fa8e81736673eae923310a05cdbf78ec88d8:/examples/msg/masterslave/masterslave_bypass.c diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c index a7ab122329..6ba7bc545f 100644 --- a/examples/msg/masterslave/masterslave_bypass.c +++ b/examples/msg/masterslave/masterslave_bypass.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ /* Create a log channel to have nice outputs. */ @@ -35,6 +35,7 @@ static int surf_parse_bypass_platform(void) XBT_DEBUG(""); SURFXML_BUFFER_SET(host_id, "host A"); SURFXML_BUFFER_SET(host_power, "100000000.00"); + SURFXML_BUFFER_SET(host_pstate, "0"); SURFXML_BUFFER_SET(host_availability, "1.0"); SURFXML_BUFFER_SET(host_availability___file, ""); SURFXML_BUFFER_SET(host_core, "1"); @@ -47,6 +48,7 @@ static int surf_parse_bypass_platform(void) XBT_DEBUG(""); SURFXML_BUFFER_SET(host_id, "host B"); SURFXML_BUFFER_SET(host_power, "100000000.00"); + SURFXML_BUFFER_SET(host_pstate, "0"); SURFXML_BUFFER_SET(host_availability, "1.0"); SURFXML_BUFFER_SET(host_availability___file, ""); SURFXML_BUFFER_SET(host_core, "1"); @@ -192,7 +194,7 @@ int master(int argc, char *argv[]) for (i = 4; i < argc; i++) { slaves[i - 4] = MSG_get_host_by_name(argv[i]); if (slaves[i - 4] == NULL) { - XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]); + XBT_INFO("Unknown host %s. Stopping Now!", argv[i]); abort(); } } @@ -238,17 +240,17 @@ int slave(int argc, char *argv[]) int a; a = MSG_task_receive(&task, MSG_host_get_name(MSG_host_self())); if (a == MSG_OK) { - XBT_INFO("Received \"%s\" ", MSG_task_get_name(task)); + XBT_INFO("Received \"%s\"" , MSG_task_get_name(task)); if (MSG_task_get_data(task) == FINALIZE) { MSG_task_destroy(task); break; } - XBT_INFO("Processing \"%s\" ", MSG_task_get_name(task)); + XBT_INFO("Processing \"%s\"", MSG_task_get_name(task)); MSG_task_execute(task); - XBT_INFO("\"%s\" done ", MSG_task_get_name(task)); + XBT_INFO("\"%s\" done", MSG_task_get_name(task)); MSG_task_destroy(task); } else { - XBT_INFO("Hey ?! What's up ? "); + XBT_INFO("Hey ?! What's up ?"); xbt_die( "Unexpected behavior"); } }