X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c85e43e7cc3034aefc758257a387d32026c05ef4..b23e1eb029a107cdc16abd13f0f4d3f0650f642a:/examples/msg/masterslave/masterslave_platfgen.c

diff --git a/examples/msg/masterslave/masterslave_platfgen.c b/examples/msg/masterslave/masterslave_platfgen.c
index ef94493611..06db03e3e9 100644
--- a/examples/msg/masterslave/masterslave_platfgen.c
+++ b/examples/msg/masterslave/masterslave_platfgen.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -28,11 +28,11 @@ void promoter_1(context_node_t node) {
   s_sg_platf_host_cbarg_t host_parameters;
 
   host_parameters.id = NULL;
-  host_parameters.power_peak = xbt_dynar_new(sizeof(double), NULL);
-  xbt_dynar_push_as(host_parameters.power_peak, double, 1000000.0);
+  host_parameters.speed_peak = xbt_dynar_new(sizeof(double), NULL);
+  xbt_dynar_push_as(host_parameters.speed_peak, double, 1000000.0);
   host_parameters.core_amount = 1;
-  host_parameters.power_scale = 1;
-  host_parameters.power_trace = NULL;
+  host_parameters.speed_scale = 1;
+  host_parameters.speed_trace = NULL;
   host_parameters.initial_state = SURF_RESOURCE_ON;
   host_parameters.state_trace = NULL;
   host_parameters.coord = NULL;
@@ -74,7 +74,7 @@ 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);
 
@@ -174,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