-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. 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. */
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
-int forwarder(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file,
+msg_error_t test_all(const char *platform_file,
const char *application_file);
#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
XBT_INFO("Got %d task to process :", number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
- m_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size,
+ msg_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size,
xbt_new0(double, 1));
- int a;
+ msg_error_t a;
*((double *) task->data) = MSG_get_clock();
a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i % slaves_count]),10.0);
XBT_INFO
("All tasks have been dispatched. Let's tell everybody the computation is over.");
for (i = 0; i < slaves_count; i++) {
- m_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE);
+ msg_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE);
int a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i]),1.0);
if (a == MSG_OK)
continue;
int slave(int argc, char *argv[])
{
while (1) {
- m_task_t task = NULL;
+ msg_task_t task = NULL;
int a;
double time1, time2;
} else if (a == MSG_HOST_FAILURE) {
XBT_INFO
("Gloups. The cpu on which I'm running just turned off!. See you!");
+ free(task->data);
+ MSG_task_destroy(task);
return 0;
} else {
XBT_INFO("Hey ?! What's up ? ");
} /* end_of_slave */
/** Test function */
-MSG_error_t test_all(const char *platform_file,
+msg_error_t test_all(const char *platform_file,
const char *application_file)
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
/* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
/** Main function */
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
MSG_init(&argc, argv);
if (argc < 3) {
exit(1);
}
res = test_all(argv[1], argv[2]);
- MSG_clean();
if (res == MSG_OK)
return 0;