-/* 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"
/** master */
int master(int argc, char *argv[])
{
- char *slavename = NULL;
- double task_comm_size = 0;
msg_task_t todo;
- char id_alias[10];
- //unique id to control statistics
- int id = -1;
xbt_assert(argc==4,"Strange number of arguments expected 3 got %d", argc - 1);
XBT_DEBUG ("Master started");
/* data size */
- int read;
- read = sscanf(argv[1], "%lg", &task_comm_size);
- xbt_assert(read, "Invalid argument %s\n", argv[1]);
+ double task_comm_size = xbt_str_parse_double(argv[1], "Invalid task communication size: %s");
/* slave name */
- slavename = argv[2];
- id = atoi(argv[3]);
- sprintf(id_alias, "flow_%d", id);
+ char *slavename = argv[2];
+ int id = xbt_str_parse_int(argv[3], "Invalid ID as argument 3: %s"); //unique id to control statistics
+ char *id_alias = bprintf("flow_%d", id);
slavenames[id] = slavename;
TRACE_category(id_alias);
masternames[id] = MSG_host_get_name(MSG_host_self());
{ /* Task creation. */
- char sprintf_buffer[64] = "Task_0";
- todo = MSG_task_create(sprintf_buffer, 100*task_comm_size, task_comm_size, NULL);
+ todo = MSG_task_create("Task_0", 100*task_comm_size, task_comm_size, NULL);
MSG_task_set_category(todo, id_alias);
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
}
- { /* Process organisation */
- MSG_get_host_by_name(slavename);
+ { /* Process organization */
+ MSG_host_by_name(slavename);
}
count_finished++;
/* time measurement */
sprintf(id_alias, "%d", id);
start_time = MSG_get_clock();
- //MSG_task_execute(todo);
MSG_task_send(todo, id_alias);
end_time = MSG_get_clock();
XBT_DEBUG ("Finished");
+ xbt_free(id_alias);
return 0;
} /* end_of_master */
XBT_DEBUG ("Slave started");
- id = atoi(argv[1]);
+ id = xbt_str_parse_int(argv[1], "Invalid id: %s");
sprintf(id_alias, "%d", id);
a = MSG_task_receive(&(task), id_alias);
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);
{
msg_error_t res = MSG_OK;
- /* MSG_config("workstation/model", "GTNETS"); */
- /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
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]);
- if (res == MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+ return res != MSG_OK;
+}