-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <stdio.h>
#include <stdlib.h>
-#include "msg/msg.h"
+#include "simgrid/msg.h"
#include "xbt/log.h"
#include "xbt/asserts.h"
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
int timer(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);
int timer_start; //set as 1 in the master process
gl_data_size[id] = task_comm_size;
}
- { /* Process organisation */
+ { /* Process organization */
MSG_get_host_by_name(slavename);
}
XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s",
id,
- MSG_task_get_data_size(task),
+ MSG_task_get_bytes_amount(task),
masternames[id],
slavenames[id]);
// MSG_task_execute(task);
} /* 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", "GTNETS"); */
- /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
/** Main function */
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
bool_printed = 0;
MSG_init(&argc, argv);
- if (argc < 3) {
- printf("Usage: %s platform_file deployment_file\n", argv[0]);
- exit(1);
- }
+ xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+ "\tExample: %s platform.xml deployment.xml\n",
+ argv[0], argv[0]);
+
res = test_all(argv[1], argv[2]);
- MSG_clean();
-
- if (res == MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+ return res != MSG_OK;
+}