X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..b3b356352e87ae00a20f737c48e19b0c8413455a:/examples/msg/cloud/bound.c diff --git a/examples/msg/cloud/bound.c b/examples/msg/cloud/bound.c index ee5fc4971a..6b78e7fbd6 100644 --- a/examples/msg/cloud/bound.c +++ b/examples/msg/cloud/bound.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2007-2014. The SimGrid Team. +/* Copyright (c) 2007-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 -#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 "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ @@ -92,8 +92,8 @@ static void test_dynamic_change(void) msg_process_t pr1 = MSG_process_create("worker1", worker_busy_loop_main, &task1, vm1); - double task0_remain_prev = MSG_task_get_remaining_computation(task0); - double task1_remain_prev = MSG_task_get_remaining_computation(task1); + double task0_remain_prev = MSG_task_get_flops_amount(task0); + double task1_remain_prev = MSG_task_get_flops_amount(task1); { const double cpu_speed = MSG_get_host_speed(pm0); @@ -104,8 +104,8 @@ static void test_dynamic_change(void) MSG_vm_set_bound(vm1, new_bound); MSG_process_sleep(100); - double task0_remain_now = MSG_task_get_remaining_computation(task0); - double task1_remain_now = MSG_task_get_remaining_computation(task1); + double task0_remain_now = MSG_task_get_flops_amount(task0); + double task1_remain_now = MSG_task_get_flops_amount(task1); double task0_flops_per_sec = task0_remain_prev - task0_remain_now; double task1_flops_per_sec = task1_remain_prev - task1_remain_now; @@ -344,7 +344,7 @@ static int master_main(int argc, char *argv[]) { msg_host_t vm0 = MSG_vm_create_core(pm0, "VM0"); - s_ws_params_t params; + s_vm_params_t params; memset(¶ms, 0, sizeof(params)); params.ramsize = 1L * 1000 * 1000 * 1000; // 1Gbytes MSG_host_set_params(vm0, ¶ms);