-/* Copyright (c) 2007-2012. 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. */
"Messages specific for this msg example");
-int computation_fun(int argc, char *argv[])
+static int computation_fun(int argc, char *argv[])
{
const char *pr_name = MSG_process_get_name(MSG_process_self());
const char *host_name = MSG_host_get_name(MSG_host_self());
return 0;
}
-void launch_computation_worker(msg_host_t host)
+static void launch_computation_worker(msg_host_t host)
{
const char *pr_name = "compute";
char **argv = xbt_new(char *, 2);
double clock_sta;
};
-int communication_tx_fun(int argc, char *argv[])
+static int communication_tx_fun(int argc, char *argv[])
{
xbt_assert(argc == 2);
const char *mbox = argv[1];
return 0;
}
-int communication_rx_fun(int argc, char *argv[])
+static int communication_rx_fun(int argc, char *argv[])
{
const char *pr_name = MSG_process_get_name(MSG_process_self());
const char *host_name = MSG_host_get_name(MSG_host_self());
MSG_process_get_name(priv->tx_proc),
host_name, pr_name, clock_end - priv->clock_sta);
+ xbt_free(priv);
MSG_task_destroy(task);
return 0;
}
-void launch_communication_worker(msg_host_t tx_host, msg_host_t rx_host)
+static void launch_communication_worker(msg_host_t tx_host, msg_host_t rx_host)
{
char *mbox = bprintf("MBOX:%s-%s",
MSG_host_get_name(tx_host),
MSG_host_get_name(rx_host));
char **argv = NULL;
- char *pr_name = NULL;
-
- pr_name = "comm_tx";
+
+ const char *pr_name_tx = "comm_tx";
argv = xbt_new(char *, 3);
- argv[0] = xbt_strdup(pr_name);
+ argv[0] = xbt_strdup(pr_name_tx);
argv[1] = xbt_strdup(mbox);
argv[2] = NULL;
- MSG_process_create_with_arguments(pr_name, communication_tx_fun, NULL, tx_host, 2, argv);
+ MSG_process_create_with_arguments(pr_name_tx, communication_tx_fun, NULL, tx_host, 2, argv);
- pr_name = "comm_rx";
+ const char *pr_name_rx = "comm_rx";
argv = xbt_new(char *, 3);
- argv[0] = xbt_strdup(pr_name);
+ argv[0] = xbt_strdup(pr_name_rx);
argv[1] = xbt_strdup(mbox);
argv[2] = NULL;
- MSG_process_create_with_arguments(pr_name, communication_rx_fun, NULL, rx_host, 2, argv);
+ MSG_process_create_with_arguments(pr_name_rx, communication_rx_fun, NULL, rx_host, 2, argv);
xbt_free(mbox);
}
-int master_main(int argc, char *argv[])
+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 pm2 = xbt_dynar_get_as(hosts_dynar, 2, msg_host_t);
msg_vm_t vm0, vm1;
+
+ XBT_INFO("## Test 1 (started): check computation on normal PMs");
+
XBT_INFO("### Put a task on a PM");
launch_computation_worker(pm0);
MSG_process_sleep(2);
launch_computation_worker(pm1);
MSG_process_sleep(2);
+ XBT_INFO("## Test 1 (ended)");
+
+
+ XBT_INFO("## Test 2 (started): check impact of running a task inside a VM (there is no degradation for the moment)");
+
XBT_INFO("### Put a VM on a PM, and put a task to the VM");
vm0 = MSG_vm_create_core(pm0, "VM0");
MSG_vm_start(vm0);
MSG_process_sleep(2);
MSG_vm_destroy(vm0);
- XBT_INFO("### Put a VM on a PM, and put a task to the PM (FIXME: broken)");
+ XBT_INFO("## Test 2 (ended)");
+
+
+ XBT_INFO("## Test 3 (started): check impact of running a task collocated with a VM (there is no VM noise for the moment)");
+
+ XBT_INFO("### Put a VM on a PM, and put a task to the PM");
vm0 = MSG_vm_create_core(pm0, "VM0");
MSG_vm_start(vm0);
launch_computation_worker(pm0);
MSG_process_sleep(2);
MSG_vm_destroy(vm0);
+ XBT_INFO("## Test 3 (ended)");
+
+
+ XBT_INFO("## Test 4 (started): compare the cost of running two tasks inside two different VMs collocated or not (for the moment, there is no degradation for the VMs. Hence, the time should be equals to the time of test 1");
+
XBT_INFO("### Put two VMs on a PM, and put a task to each VM");
vm0 = MSG_vm_create_core(pm0, "VM0");
vm1 = MSG_vm_create_core(pm0, "VM1");
MSG_process_sleep(2);
MSG_vm_destroy(vm0);
MSG_vm_destroy(vm1);
+ XBT_INFO("## Test 4 (ended)");
-
+
+ XBT_INFO("## Test 5 (started): Analyse network impact");
XBT_INFO("### Make a connection between PM0 and PM1");
launch_communication_worker(pm0, pm1);
MSG_process_sleep(5);
MSG_vm_destroy(vm0);
MSG_vm_destroy(vm1);
+ XBT_INFO("## Test 5 (ended)");
+
+ XBT_INFO("## Test 6 (started): Check migration impact (not yet implemented neither on the CPU resource nor on the network one");
XBT_INFO("### Relocate VM0 between PM0 and PM1");
vm0 = MSG_vm_create_core(pm0, "VM0");
+ {
+ s_vm_params_t params;
+ memset(¶ms, 0, sizeof(params));
+ params.ramsize = 1L * 1024 * 1024 * 1024; // 1Gbytes
+ MSG_host_set_params(vm0, ¶ms);
+ }
MSG_vm_start(vm0);
launch_communication_worker(vm0, pm2);
MSG_process_sleep(0.01);
MSG_vm_migrate(vm0, pm0);
MSG_process_sleep(5);
MSG_vm_destroy(vm0);
-
+ XBT_INFO("## Test 6 (ended)");
+
+ xbt_dynar_free(&hosts_dynar);
return 0;
}
-void launch_master(msg_host_t host)
+static void launch_master(msg_host_t host)
{
const char *pr_name = "master_";
char **argv = xbt_new(char *, 2);
argv[0] = xbt_strdup(pr_name);
argv[1] = NULL;
- msg_process_t pr = MSG_process_create_with_arguments(pr_name, master_main, NULL, host, 1, argv);
+ MSG_process_create_with_arguments(pr_name, master_main, NULL, host, 1, argv);
}
MSG_init(&argc, argv);
/* load the platform file */
+ xbt_assert(argc == 2);
MSG_create_environment(argv[1]);
xbt_dynar_t hosts_dynar = MSG_hosts_as_dynar();
launch_master(pm0);
int res = MSG_main();
- XBT_INFO("Simulation time %g", MSG_get_clock());
+ XBT_INFO("Bye (simulation time %g)", MSG_get_clock());
+ xbt_dynar_free(&hosts_dynar);
- XBT_INFO("bye");
-
- return 0;
+ return !(res == MSG_OK);
}
