-/* 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 "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,
- const char *application_file);
/** Emitter function */
int master(int argc, char *argv[])
int i;
- INFO2("Got %ld slaves and %ld tasks to process", slaves_count,
+ 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);
MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
NULL);
if (number_of_tasks < 10000 || i % 10000 == 0)
- INFO3("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name,
+ XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name,
number_of_tasks, mailbox);
MSG_task_send(task, mailbox);
}
- INFO0
+ XBT_INFO
("All tasks have been dispatched. Let's tell everybody the computation is over.");
for (i = 0; i < slaves_count; 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);
}
-// INFO0("Goodbye now!");
+// XBT_INFO("Goodbye now!");
return 0;
} /* end_of_master */
/** Receiver function */
int slave(int argc, char *argv[])
{
- m_task_t task = NULL;
- int res;
+ msg_task_t task = NULL;
+ _XBT_GNUC_UNUSED int res;
int id = -1;
char mailbox[80];
+ _XBT_GNUC_UNUSED int read;
- xbt_assert1(sscanf(argv[1], "%d", &id),
- "Invalid argument %s\n", argv[1]);
+ read = sscanf(argv[1], "%d", &id);
+ 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");
-// INFO1("Received \"%s\"", MSG_task_get_name(task));
+// XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
if (!strcmp(MSG_task_get_name(task), "finalize")) {
MSG_task_destroy(task);
break;
}
-// INFO1("Processing \"%s\"", MSG_task_get_name(task));
+// XBT_INFO("Processing \"%s\"", MSG_task_get_name(task));
MSG_task_execute(task);
-// INFO1("\"%s\" done", MSG_task_get_name(task));
+// XBT_INFO("\"%s\" done", MSG_task_get_name(task));
MSG_task_destroy(task);
task = NULL;
}
- INFO0("I'm done. See you!");
+ XBT_INFO("I'm done. See you!");
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);
+ 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);
+ }
+ 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();
- INFO1("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]);
- SIMIX_message_sizes_output("toto.txt");
- MSG_clean();
+ XBT_INFO("Simulation time %g", MSG_get_clock());
if (res == MSG_OK)
return 0;