-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2017. 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 "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
+#include "simgrid/msg.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
xbt_dynar_t tests;
int tasks_done = 0;
+static void task_cleanup_handler(void *task)
+{
+ if (task)
+ MSG_task_destroy(task);
+}
+
static int process_daemon(int argc, char *argv[])
{
- msg_task_t task = NULL;
- XBT_INFO(" Start daemon on %s (%f)", MSG_host_get_name(MSG_host_self()), MSG_get_host_speed(MSG_host_self()));
+ msg_process_t self = MSG_process_self();
+ XBT_INFO(" Start daemon on %s (%f)", MSG_host_get_name(MSG_host_self()), MSG_host_get_speed(MSG_host_self()));
for(;;){
- task = MSG_task_create("daemon", MSG_get_host_speed(MSG_host_self()), 0, NULL);
+ msg_task_t task = MSG_task_create("daemon", MSG_host_get_speed(MSG_host_self()), 0, NULL);
+ MSG_process_set_data(self, task);
XBT_INFO(" Execute daemon");
MSG_task_execute(task);
+ MSG_process_set_data(self, NULL);
MSG_task_destroy(task);
tasks_done ++;
}
static int commTX(int argc, char *argv[])
{
- msg_task_t task = NULL;
const char * mailbox = "comm";
XBT_INFO(" Start TX");
- task = MSG_task_create("COMM", 0, 100000000, NULL);
- MSG_task_isend(task, mailbox);
+ msg_task_t task = MSG_task_create("COMM", 0, 100000000, NULL);
+ MSG_task_dsend(task, mailbox, task_cleanup_handler);
// We should wait a bit (if not the process will end before the communication, hence an exception on the other side).
MSG_process_sleep(30);
XBT_INFO(" TX done");
msg_error_t error = MSG_task_receive(&(task), mailbox);
if (error==MSG_OK) {
XBT_INFO(" Receive message: %s", task->name);
+ MSG_task_destroy(task);
} else if (error==MSG_HOST_FAILURE) {
XBT_INFO(" Receive message: HOST_FAILURE");
} else if (error==MSG_TRANSFER_FAILURE) {
XBT_INFO(" Receive message: TRANSFERT_FAILURE");
} else {
- XBT_INFO(" Receive message: %d", error);
+ XBT_INFO(" Receive message: %u", error);
}
XBT_INFO(" RX Done");
return 0;
{
int test = 0;
char **argvF;
- argvF = xbt_new(char*, 2);
- argvF[0] = xbt_strdup("process_daemon");
msg_host_t jupiter = MSG_host_by_name("Jupiter");
test = 1;
argvF[0] = xbt_strdup("process_daemon");
MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, jupiter, 1, argvF);
MSG_process_sleep(10);
- XBT_INFO(" Test 2 does not crash, WTF ?!(number of Process : %d, it should be 1)", MSG_process_get_number());
+ XBT_INFO(" Test 2 does not crash as it should (number of Process : %d, it should be 1)", MSG_process_get_number());
XBT_INFO(" Ok so let's turn on/off the node to see whether the process is correctly bound to Jupiter");
MSG_host_on(jupiter);
XBT_INFO(" Turn off");
MSG_process_sleep(10);
XBT_INFO(" Turn Jupiter off");
MSG_host_off(jupiter);
- XBT_INFO("Test 5 seems ok, cool !(number of Process : %d, it should be 2", MSG_process_get_number());
+ XBT_INFO("Test 5 seems ok (number of Process: %d, it should be 2)", MSG_process_get_number());
}
test =6;
msg_vm_t vm0;
msg_process_t daemon;
- vm0 = MSG_vm_create (jupiter, "vm0", 1, 2048, 125, NULL, -1, 125, dpRate);
+ vm0 = MSG_vm_create(jupiter, "vm0", 1, 2048, 125, dpRate);
MSG_vm_start(vm0);
argvF = xbt_new(char*, 2);
argvF[0] = xbt_strdup("process_daemon");
- daemon = MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, vm0, 1, argvF);
+ daemon = MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, (msg_host_t)vm0, 1, argvF);
argvF = xbt_new(char*, 2);
argvF[0] = xbt_strdup("process_daemonJUPI");
MSG_create_environment(argv[1]);
+ MSG_process_set_data_cleanup(task_cleanup_handler);
MSG_process_create("test_launcher", test_launcher, NULL, MSG_get_host_by_name("Tremblay"));
res = MSG_main();
XBT_INFO("Simulation time %g", MSG_get_clock());
+ xbt_dynar_free(&tests);
return res != MSG_OK;
}