X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8cd62135619ad52e05ae1c929ef07e166e4260..5367d14cee11f6e79168382bb14cbd873675a681:/examples/msg/masterslave/masterslave_platfgen.c diff --git a/examples/msg/masterslave/masterslave_platfgen.c b/examples/msg/masterslave/masterslave_platfgen.c index 88b1010fb3..733420747f 100644 --- a/examples/msg/masterslave/masterslave_platfgen.c +++ b/examples/msg/masterslave/masterslave_platfgen.c @@ -1,7 +1,12 @@ +/* Copyright (c) 2012-2015. 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 "simgrid/platf_generator.h" #include "xbt.h" -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_CATEGORY(test_generation, @@ -23,8 +28,8 @@ void promoter_1(context_node_t node) { s_sg_platf_host_cbarg_t host_parameters; host_parameters.id = NULL; - host_parameters.power_peak = 1000000; - + host_parameters.power_peak = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push_as(host_parameters.power_peak, double, 1000000.0); host_parameters.core_amount = 1; host_parameters.power_scale = 1; host_parameters.power_trace = NULL; @@ -69,12 +74,12 @@ int master(int argc, char *argv[]) task_comp_size = 2400000*argc; task_comm_size = 1000000; - { /* Process organisation */ + { /* Process organization */ slaves_count = argc; slaves = xbt_new0(msg_host_t, slaves_count); for (i = 0; i < argc; i++) { - slaves[i] = MSG_get_host_by_name(argv[i]); + slaves[i] = MSG_host_by_name(argv[i]); if (slaves[i] == NULL) { XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]); abort(); @@ -169,7 +174,7 @@ int main(int argc, char **argv) { int connected; int max_tries = 10; - //MSG initialisation + //MSG initialization MSG_init(&argc, argv); //Set up the seed for the platform generation