A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
catch some dumb "nested code block"
[simgrid.git]
/
examples
/
msg
/
cloud-capping
/
cloud-capping.c
diff --git
a/examples/msg/cloud-capping/cloud-capping.c
b/examples/msg/cloud-capping/cloud-capping.c
index
c3b0f7d
..
dcfcc72
100644
(file)
--- a/
examples/msg/cloud-capping/cloud-capping.c
+++ b/
examples/msg/cloud-capping/cloud-capping.c
@@
-55,17
+55,16
@@
static int worker_busy_loop_main(int argc, char *argv[])
{
msg_task_t *task = MSG_process_get_data(MSG_process_self());
MSG_task_execute(*task);
+ MSG_task_destroy(*task);
return 0;
}
-/* FIXME: */
#define DOUBLE_MAX 1e11
static void test_dynamic_change(void)
{
- xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
- msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
+ msg_host_t pm0 = MSG_host_by_name("Fafard");
msg_host_t vm0 = MSG_vm_create_core(pm0, "VM0");
msg_host_t vm1 = MSG_vm_create_core(pm0, "VM1");
@@
-80,28
+79,26
@@
static void test_dynamic_change(void)
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_host_get_speed(pm0);
- int i = 0;
- for (i = 0; i < 10; i++) {
- double new_bound = (cpu_speed / 10) * i;
- XBT_INFO("set bound of VM1 to %f", new_bound);
- MSG_vm_set_bound(vm1, new_bound);
- MSG_process_sleep(100);
+ const double cpu_speed = MSG_host_get_speed(pm0);
+ for (int i = 0; i < 10; i++) {
+ double new_bound = (cpu_speed / 10) * i;
+ XBT_INFO("set bound of VM1 to %f", new_bound);
+ MSG_vm_set_bound(vm1, new_bound);
+ MSG_process_sleep(100);
-
double task0_remain_now = MSG_task_get_flops_amount(task0);
-
double task1_remain_now = MSG_task_get_flops_amount(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;
+ double task0_flops_per_sec = task0_remain_prev - task0_remain_now;
+ double task1_flops_per_sec = task1_remain_prev - task1_remain_now;
-
XBT_INFO("Task0@VM0: %f flops/s", task0_flops_per_sec / 100);
-
XBT_INFO("Task1@VM1: %f flops/s", task1_flops_per_sec / 100);
+ XBT_INFO("Task0@VM0: %f flops/s", task0_flops_per_sec / 100);
+ XBT_INFO("Task1@VM1: %f flops/s", task1_flops_per_sec / 100);
- task0_remain_prev = task0_remain_now;
- task1_remain_prev = task1_remain_now;
- }
+ task0_remain_prev = task0_remain_now;
+ task1_remain_prev = task1_remain_now;
}
+
MSG_process_sleep(2000); // let the tasks end
MSG_vm_destroy(vm0);
@@
-195,10
+192,8
@@
static void test_two_tasks(msg_host_t hostA, msg_host_t hostB)
static int master_main(int argc, char *argv[])
{
- xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
- msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
- msg_host_t pm1 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
- xbt_dynar_free(&hosts_dynar);
+ msg_host_t pm0 = MSG_host_by_name("Fafard");
+ msg_host_t pm1 = MSG_host_by_name("Fafard");
XBT_INFO("# 1. Put a single task on a PM. ");
test_one_task(pm0);
@@
-311,8
+306,7
@@
int main(int argc, char *argv[])
MSG_create_environment(argv[1]);
- xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
- msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
+ msg_host_t pm0 = MSG_host_by_name("Fafard");
launch_master(pm0);
int res = MSG_main();