sed -i -e 's/\t/ /g' [sources] Please people, stop using tabs

[simgrid.git] / examples / msg / cloud / multicore.c

diff --git a/examples/msg/cloud/multicore.c b/examples/msg/cloud/multicore.c
index 1247695..c6bd09f 100644 (file)
--- a/examples/msg/cloud/multicore.c
+++ b/examples/msg/cloud/multicore.c
@@ -1,10 +1,11 @@
-/* Copyright (c) 2007-2013. The SimGrid Team. All rights reserved. */
+/* 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"
+#include "simgrid/msg.h"
 #include "xbt/sysdep.h"         /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
@@ -28,22 +29,22 @@ static int worker_main(int argc, char *argv[])
 
 
 struct task_data {
-       msg_task_t task;
-       double prev_computation_amount;
-       double prev_clock;
+  msg_task_t task;
+  double prev_computation_amount;
+  double prev_clock;
 };
 
 
 static void task_data_init_clock(struct task_data *t)
 {
-  t->prev_computation_amount = MSG_task_get_remaining_computation(t->task);
+  t->prev_computation_amount = MSG_task_get_flops_amount(t->task);
   t->prev_clock = MSG_get_clock();
 }
 
 
 static void task_data_get_clock(struct task_data *t)
 {
-  double now_computation_amount = MSG_task_get_remaining_computation(t->task);
+  double now_computation_amount = MSG_task_get_flops_amount(t->task);
   double now_clock = MSG_get_clock();
 
   double done = t->prev_computation_amount - now_computation_amount;
@@ -69,10 +70,10 @@ static void test_pm_pin(void)
   struct task_data t3;
   struct task_data t4;
 
-  t1.task = MSG_task_create("Task1", 10000000000000000UL, 0, NULL);
-  t2.task = MSG_task_create("Task2", 10000000000000000UL, 0, NULL);
-  t3.task = MSG_task_create("Task3", 10000000000000000UL, 0, NULL);
-  t4.task = MSG_task_create("Task4", 10000000000000000UL, 0, NULL);
+  t1.task = MSG_task_create("Task1", 1e16, 0, NULL);
+  t2.task = MSG_task_create("Task2", 1e16, 0, NULL);
+  t3.task = MSG_task_create("Task3", 1e16, 0, NULL);
+  t4.task = MSG_task_create("Task4", 1e16, 0, NULL);
 
   MSG_process_create("worker1", worker_main, t1.task, pm1);
   MSG_process_create("worker2", worker_main, t2.task, pm1);
@@ -176,7 +177,7 @@ static void test_vm_pin(void)
   msg_vm_t vm2 = MSG_vm_create_core(pm2, "VM2");
   msg_vm_t vm3 = MSG_vm_create_core(pm2, "VM3");
 
-  s_ws_params_t params;
+  s_vm_params_t params;
   memset(&params, 0, sizeof(params));
   params.ramsize = 1L * 1024 * 1024;
   params.skip_stage1 = 1;
@@ -199,10 +200,10 @@ static void test_vm_pin(void)
   struct task_data t2;
   struct task_data t3;
 
-  t0.task = MSG_task_create("Task0", 10000000000000000UL, 0, NULL);
-  t1.task = MSG_task_create("Task1", 10000000000000000UL, 0, NULL);
-  t2.task = MSG_task_create("Task2", 10000000000000000UL, 0, NULL);
-  t3.task = MSG_task_create("Task3", 10000000000000000UL, 0, NULL);
+  t0.task = MSG_task_create("Task0", 1e16, 0, NULL);
+  t1.task = MSG_task_create("Task1", 1e16, 0, NULL);
+  t2.task = MSG_task_create("Task2", 1e16, 0, NULL);
+  t3.task = MSG_task_create("Task3", 1e16, 0, NULL);
 
   MSG_process_create("worker0", worker_main, t0.task, vm0);
   MSG_process_create("worker1", worker_main, t1.task, vm1);