-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-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 "xbt/sysdep.h" /* calloc, printf */
+#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
+#include "xbt/sysdep.h"
/* Create a log channel to have nice outputs. */
#include "xbt/log.h"
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,
- const char *application_file);
-/** Emitter function */
+/** Sender function */
int master(int argc, char *argv[])
{
- long number_of_tasks = atol(argv[1]);
- double task_comp_size = atof(argv[2]);
- double task_comm_size = atof(argv[3]);
- long slaves_count = atol(argv[4]);
+ long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
+ double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");
+ double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");
+ long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
int i;
- XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count,
- number_of_tasks);
+ XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
char mailbox[256];
char sprintf_buffer[256];
- m_task_t task = NULL;
+ msg_task_t task = NULL;
sprintf(mailbox, "slave-%ld", i % slaves_count);
sprintf(sprintf_buffer, "Task_%d", i);
char mailbox[80];
sprintf(mailbox, "slave-%ld", i % slaves_count);
- m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
+ msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
MSG_task_send(finalize, mailbox);
}
/** Receiver function */
int slave(int argc, char *argv[])
{
- m_task_t task = NULL;
- int res;
+ msg_task_t task = NULL;
+ XBT_ATTRIB_UNUSED int res;
int id = -1;
char mailbox[80];
- int read;
+ XBT_ATTRIB_UNUSED int read;
read = sscanf(argv[1], "%d", &id);
- xbt_assert1(read, "Invalid argument %s\n", argv[1]);
+ xbt_assert(read, "Invalid argument %s\n", argv[1]);
sprintf(mailbox, "slave-%d", id);
while (1) {
res = MSG_task_receive(&(task), mailbox);
- xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+ xbt_assert(res == MSG_OK, "MSG_task_get failed");
// XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
if (!strcmp(MSG_task_get_name(task), "finalize")) {
return 0;
} /* end_of_slave */
-/** Test function */
-MSG_error_t test_all(const char *platform_file,
- const char *application_file)
+/** Main function */
+int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res;
+ const char *platform_file;
+ const char *application_file;
+
+ MSG_init(&argc, argv);
+ xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+ "\tExample: %s msg_platform.xml msg_deployment.xml\n",
+ argv[0], argv[0]);
+
+ platform_file = argv[1];
+ application_file = argv[2];
- /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
- MSG_set_channel_number(0);
MSG_create_environment(platform_file);
}
{ /* Application deployment */
res = MSG_main();
XBT_INFO("Simulation time %g", MSG_get_clock());
- return res;
-} /* end_of_test_all */
-
-
-/** Main function */
-int main(int argc, char *argv[])
-{
- MSG_error_t res = MSG_OK;
- MSG_global_init(&argc, argv);
- if (argc < 3) {
- printf("Usage: %s platform_file deployment_file\n", argv[0]);
- printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
- exit(1);
- }
- 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;
+}