-/* 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. */
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
"Messages specific for this msg example");
+/** @addtogroup MSG_examples
+ *
+ * - <b>msg/icomms/peer2.c</b>: demonstrates the @ref MSG_comm_waitall function
+ */
+
int sender(int argc, char *argv[]);
int receiver(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);
/** Sender function */
msg_comm_t *comm = xbt_new(msg_comm_t, number_of_tasks + receivers_count);
int i;
- m_task_t task = NULL;
+ msg_task_t task = NULL;
for (i = 0; i < number_of_tasks; i++) {
char mailbox[256];
char sprintf_buffer[256];
MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
NULL);
comm[i] = MSG_task_isend(task, mailbox);
- INFO2("Send to receiver-%ld Task_%d", i % receivers_count, i);
+ XBT_INFO("Send to receiver-%ld Task_%d", i % receivers_count, i);
}
for (i = 0; i < receivers_count; i++) {
char mailbox[80];
sprintf(mailbox, "receiver-%ld", i % receivers_count);
task = MSG_task_create("finalize", 0, 0, 0);
comm[i + number_of_tasks] = MSG_task_isend(task, mailbox);
- INFO1("Send to receiver-%ld finalize", i % receivers_count);
+ XBT_INFO("Send to receiver-%ld finalize", i % receivers_count);
}
/* Here we are waiting for the completion of all communications */
MSG_comm_waitall(comm, (number_of_tasks + receivers_count), -1);
+ for (i = 0; i < number_of_tasks + receivers_count; i++)
+ MSG_comm_destroy(comm[i]);
- INFO0("Goodbye now!");
+ XBT_INFO("Goodbye now!");
xbt_free(comm);
return 0;
} /* end_of_sender */
/** Receiver function */
int receiver(int argc, char *argv[])
{
- m_task_t task = NULL;
- MSG_error_t res;
+ msg_task_t task = NULL;
+ XBT_ATTRIB_UNUSED msg_error_t res;
int id = -1;
char mailbox[80];
msg_comm_t res_irecv;
- xbt_assert1(sscanf(argv[1], "%d", &id),
- "Invalid argument %s\n", argv[1]);
+ XBT_ATTRIB_UNUSED int read;
+ read = sscanf(argv[1], "%d", &id);
+ xbt_assert(read, "Invalid argument %s\n", argv[1]);
MSG_process_sleep(10);
sprintf(mailbox, "receiver-%d", id);
while (1) {
res_irecv = MSG_task_irecv(&(task), mailbox);
- INFO0("Wait to receive a task");
+ XBT_INFO("Wait to receive a task");
res = MSG_comm_wait(res_irecv, -1);
- xbt_assert0(res == MSG_OK, "MSG_task_get failed");
- INFO1("Received \"%s\"", MSG_task_get_name(task));
+ MSG_comm_destroy(res_irecv);
+ 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")) {
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_receiver */
/** Test function */
-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","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());
+ 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_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]);
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();
if (res == MSG_OK)
return 0;