-/* Copyright (c) 2010-2014. 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 "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
-#include "xbt/sysdep.h" /* calloc, printf */
+#include "simgrid/msg.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");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
+static int slave(int argc, char *argv[])
+{
+ msg_task_t task = NULL;
+ XBT_ATTRIB_UNUSED int res;
+ int id = -1;
+ const char * mailbox = "jupi";
+
+ while (1) {
+ res = MSG_task_receive(&(task), mailbox);
+ xbt_assert(res == MSG_OK, "MSG_task_get failed");
-/** Emitter function */
-int master(int argc, char *argv[])
+ if (!strcmp(MSG_task_get_name(task), "finalize")) {
+ MSG_task_destroy(task);
+ break;
+ }
+ MSG_task_execute(task);
+ XBT_INFO("Task \"%s\" done", MSG_task_get_name(task));
+
+ MSG_task_destroy(task);
+ task = NULL;
+ id--;
+ }
+ XBT_INFO("I'm done. See you!");
+ return 0;
+}
+
+static int master(int argc, char *argv[])
{
double task_comp_size = 5E7;
double task_comm_size = 1E6;
- char mailbox[256];
- msg_task_t task = NULL;
+ const char * mailbox = "jupi";
msg_host_t jupiter = MSG_host_by_name("Jupiter");
- sprintf(mailbox, "jupi");
- task = MSG_task_create("task on", task_comp_size, task_comm_size, NULL);
+ msg_task_t task = MSG_task_create("task on", task_comp_size, task_comm_size, NULL);
XBT_INFO("Sending \"%s\"", task->name);
if (MSG_task_send_with_timeout(task, mailbox, 1) != MSG_OK)
MSG_task_destroy(task);
MSG_task_destroy(task);
MSG_host_on(jupiter);
- xbt_swag_t jupi_processes = MSG_host_get_process_list(jupiter);
- void *process;
- xbt_swag_foreach(process, jupi_processes) {
+
+ xbt_dynar_t jupi_processes = xbt_dynar_new(sizeof(msg_process_t), NULL);
+ MSG_host_get_process_list(jupiter, jupi_processes);
+ msg_process_t process = NULL;
+ unsigned int cursor;
+ xbt_dynar_foreach (jupi_processes, cursor, process) {
MSG_process_kill(process);
}
+ xbt_dynar_free(&jupi_processes);
task = MSG_task_create("task on without proc", task_comp_size, task_comm_size, NULL);
XBT_INFO("Sending \"%s\"", task->name);
XBT_INFO("Goodbye now!");
return 0;
-} /* end_of_master */
-
-/** Receiver function */
-int slave(int argc, char *argv[])
-{
- msg_task_t task = NULL;
- _XBT_GNUC_UNUSED int res;
- int id = -1;
- char mailbox[80];
-
- sprintf(mailbox, "jupi");
-
- while (1) {
- res = MSG_task_receive(&(task), mailbox);
- xbt_assert(res == MSG_OK, "MSG_task_get failed");
-
- if (!strcmp(MSG_task_get_name(task), "finalize")) {
- MSG_task_destroy(task);
- break;
- }
- MSG_task_execute(task);
- XBT_INFO("Task \"%s\" done", MSG_task_get_name(task));
-
- MSG_task_destroy(task);
- task = NULL;
- id--;
- }
- XBT_INFO("I'm done. See you!");
- return 0;
-} /* end_of_slave */
+}
-/** Main function */
int main(int argc, char *argv[])
{
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];
+ xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
- { /* Simulation setting */
- MSG_create_environment(platform_file);
- }
- { /* Application deployment */
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
+ MSG_create_environment(argv[1]);
+
+ MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Jupiter"));
- MSG_launch_application(application_file);
- }
res = MSG_main();
XBT_INFO("Simulation time %g", MSG_get_clock());
- if (res == MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+ return res != MSG_OK;
+}
