-/* 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 <math.h>
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
- "Messages specific for this msg example");
+#include "simgrid/msg.h"
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
/** @addtogroup MSG_examples
*
* - <b>msg/icomms/peer3.c</b>: demonstrates the @ref MSG_comm_waitany function
*/
-int sender(int argc, char *argv[]);
-int receiver(int argc, char *argv[]);
-
-MSG_error_t test_all(const char *platform_file,
- const char *application_file);
-
-/** Sender function */
-int sender(int argc, char *argv[])
+static int sender(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 receivers_count = atol(argv[4]);
- int diff_com = atol(argv[5]);
+ 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 receivers_count = xbt_str_parse_int(argv[4], "Invalid amount of receivers: %s");
+ int diff_com = xbt_str_parse_int(argv[5], "Invalid value for diff_comm: %s");
double coef = 0;
xbt_dynar_t d = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int i;
- m_task_t task;
+ msg_task_t task;
char mailbox[256];
char sprintf_buffer[256];
msg_comm_t comm;
task_comm_size / coef, NULL);
comm = MSG_task_isend(task, mailbox);
xbt_dynar_push_as(d, msg_comm_t, comm);
- XBT_INFO("Send to receiver-%ld %s comm_size %f", i % receivers_count,
- sprintf_buffer, task_comm_size / coef);
+ XBT_INFO("Send to receiver-%ld %s comm_size %f", i % receivers_count, sprintf_buffer, task_comm_size / coef);
}
/* Here we are waiting for the completion of all communications */
sprintf(mailbox, "finalize");
msg_comm_t res_irecv;
- _XBT_GNUC_UNUSED MSG_error_t res_wait;
+ XBT_ATTRIB_UNUSED msg_error_t res_wait;
for (i = 0; i < receivers_count; i++) {
task = NULL;
res_irecv = MSG_task_irecv(&(task), mailbox);
XBT_INFO("Goodbye now!");
return 0;
-} /* end_of_sender */
+}
-/** Receiver function */
-int receiver(int argc, char *argv[])
+static int receiver(int argc, char *argv[])
{
int id = -1;
- int i;
char mailbox[80];
xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
- int tasks = atof(argv[2]);
- m_task_t *task = xbt_new(m_task_t, tasks);
+ int tasks = xbt_str_parse_int(argv[2], "Invalid amount of tasks: %s");
+ msg_task_t *task = xbt_new(msg_task_t, tasks);
- _XBT_GNUC_UNUSED int read;
+ XBT_ATTRIB_UNUSED int read;
read = sscanf(argv[1], "%d", &id);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
sprintf(mailbox, "receiver-%d", id);
MSG_process_sleep(10);
msg_comm_t res_irecv;
- for (i = 0; i < tasks; i++) {
+ for (int i = 0; i < tasks; i++) {
XBT_INFO("Wait to receive task %d", i);
task[i] = NULL;
res_irecv = MSG_task_irecv(&task[i], mailbox);
}
/* Here we are waiting for the receiving of all communications */
- m_task_t task_com;
+ msg_task_t task_com;
while (!xbt_dynar_is_empty(comms)) {
- _XBT_GNUC_UNUSED MSG_error_t err;
+ XBT_ATTRIB_UNUSED msg_error_t err;
xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
task_com = MSG_comm_get_task(res_irecv);
MSG_comm_destroy(res_irecv);
MSG_comm_destroy(res_irecv);
XBT_INFO("I'm done. See you!");
return 0;
-} /* end_of_receiver */
+}
-/** Test function */
-MSG_error_t test_all(const char *platform_file,
- const char *application_file)
+int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
- /* MSG_config("workstation/model","KCCFLN05"); */
- { /* Simulation setting */
- MSG_create_environment(platform_file);
- }
- { /* Application deployment */
- MSG_function_register("sender", sender);
- MSG_function_register("receiver", receiver);
- MSG_launch_application(application_file);
- }
- res = MSG_main();
+ 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]);
- XBT_INFO("Simulation time %g", MSG_get_clock());
- return res;
-} /* end_of_test_all */
+ MSG_create_environment(argv[1]);
+ MSG_function_register("sender", sender);
+ MSG_function_register("receiver", receiver);
+ MSG_launch_application(argv[2]);
-/** Main function */
-int main(int argc, char *argv[])
-{
- MSG_error_t res = MSG_OK;
+ res = MSG_main();
- 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);
- }
- res = test_all(argv[1], argv[2]);
- MSG_clean();
-
- if (res == MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+ XBT_INFO("Simulation time %g", MSG_get_clock());
+
+ return res != MSG_OK;
+}