-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-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" /* 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 execute(int argc, char *argv[]);
int redistribute(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);
{
char buffer[32];
int i, j;
- m_host_t *m_host_list = NULL;
- m_task_t task = NULL;
+ msg_host_t *m_host_list = NULL;
+ msg_task_t task = NULL;
int host_list_size;
double *computation_duration = NULL;
double *communication_table = NULL;
host_list_size = argc - 3;
XBT_DEBUG("host_list_size=%d", host_list_size);
- m_host_list = calloc(host_list_size, sizeof(m_host_t));
+ m_host_list = calloc(host_list_size, sizeof(msg_host_t));
for (i = 1; i <= host_list_size; i++) {
- m_host_list[i - 1] = MSG_get_host_by_name(argv[i]);
+ m_host_list[i - 1] = MSG_host_by_name(argv[i]);
xbt_assert(m_host_list[i - 1] != NULL,
"Unknown host %s. Stopping Now! ", argv[i]);
}
- _XBT_GNUC_UNUSED int read;
+ XBT_ATTRIB_UNUSED int read;
read = sscanf(argv[argc - 2], "%lg", &computation_amount);
xbt_assert(read, "Invalid argument %s\n", argv[argc - 2]);
read = sscanf(argv[argc - 1], "%lg", &communication_amount);
{
char buffer[32];
int i, j;
- m_host_t *m_host_list = NULL;
- m_task_t task = NULL;
+ msg_host_t *m_host_list = NULL;
+ msg_task_t task = NULL;
int host_list_size;
double *computation_duration = NULL;
double *communication_table = NULL;
host_list_size = argc - 2;
XBT_DEBUG("host_list_size=%d", host_list_size);
- m_host_list = calloc(host_list_size, sizeof(m_host_t));
+ m_host_list = calloc(host_list_size, sizeof(msg_host_t));
for (i = 1; i <= host_list_size; i++) {
- m_host_list[i - 1] = MSG_get_host_by_name(argv[i]);
+ m_host_list[i - 1] = MSG_host_by_name(argv[i]);
xbt_assert(m_host_list[i - 1] != NULL,
"Unknown host %s. Stopping Now! ", argv[i]);
}
- _XBT_GNUC_UNUSED int read;
+ XBT_ATTRIB_UNUSED int read;
read = sscanf(argv[argc - 1], "%lg", &communication_amount);
xbt_assert(read, "Invalid argument %s\n", argv[argc - 1]);
computation_duration = (double *) calloc(host_list_size, sizeof(double));
}
-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", "ptask_L07");
+ MSG_config("host/model", "ptask_L07");
/* Simulation setting */
MSG_create_environment(platform_file);
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
- MSG_global_init(&argc, argv);
+ MSG_init(&argc, argv);
if (argc < 3) {
printf("Usage: %s platform_file deployment_file\n", argv[0]);
exit(1);
}
res = test_all(argv[1], argv[2]);
- MSG_clean();
if (res == MSG_OK)
return 0;