-/* 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 <stdio.h>
-#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. */
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);
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;
XBT_INFO("### Test: with/without MSG_task_set_bound");
-#if 0
- /* Easy-to-understand code (without calling MSG_task_set_bound) */
- {
- double clock_sta = MSG_get_clock();
-
- msg_task_t task = MSG_task_create("Task", computation_amount, 0, NULL);
- MSG_task_execute(task);
- MSG_task_destroy(task);
-
- double clock_end = MSG_get_clock();
- double duration = clock_end - clock_sta;
- double flops_per_sec = computation_amount / duration;
-
- XBT_INFO("not bound => duration %f (%f flops/s)", duration, flops_per_sec);
- }
-
- /* Easy-to-understand code (with calling MSG_task_set_bound) */
- {
- double clock_sta = MSG_get_clock();
-
- msg_task_t task = MSG_task_create("Task", computation_amount, 0, NULL);
- MSG_task_set_bound(task, cpu_speed / 2);
- MSG_task_execute(task);
- MSG_task_destroy(task);
-
- double clock_end = MSG_get_clock();
- double duration = clock_end - clock_sta;
- double flops_per_sec = computation_amount / duration;
-
- XBT_INFO("bound to 0.5 => duration %f (%f flops/s)", duration, flops_per_sec);
- }
-#endif
-
{
XBT_INFO("### Test: no bound for Task1@%s", hostA_name);
launch_worker(hostA, "worker0", computation_amount, 0, 0);
{
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);