-/* $Id$ */
-
/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <stdio.h>
#include "msg/msg.h"
-#include "xbt/sysdep.h" /* calloc, printf */
+#include "xbt/sysdep.h" /* calloc, printf */
/* 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");
-
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file, const char *application_file);
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
+ "Messages specific for this msg example");
/** Emitter function */
int master(int argc, char *argv[])
double task_comp_size = atof(argv[2]);
double task_comm_size = atof(argv[3]);
long slaves_count = atol(argv[4]);
- INFO4 ("master %ld %f %f %ld", number_of_tasks, task_comp_size, task_comm_size, slaves_count);
+ XBT_INFO("master %ld %f %f %ld", number_of_tasks, task_comp_size,
+ task_comm_size, slaves_count);
int i;
for (i = 0; i < number_of_tasks; i++) {
- m_task_t task=NULL;
- task = MSG_task_create("task", task_comp_size, task_comm_size, NULL);
+ char task_name[100];
+ snprintf (task_name, 100, "task-%d", i);
+ m_task_t task = NULL;
+ task = MSG_task_create(task_name, task_comp_size, task_comm_size, NULL);
//setting the category of task to "compute"
//the category of a task must be defined before it is sent or executed
- TRACE_msg_set_task_category (task, "compute");
+ TRACE_msg_set_task_category(task, "compute");
MSG_task_send(task, "master_mailbox");
}
-
- for (i = 0; i < slaves_count; i++) {
- m_task_t finalize = MSG_task_create ("finalize", 0, 0, 0);
- TRACE_msg_set_task_category(finalize, "finalize");
- MSG_task_send(finalize, "master_mailbox");
- }
-
+
+ for (i = 0; i < slaves_count; i++) {
+ char task_name[100];
+ snprintf (task_name, 100, "task-%d", i);
+ m_task_t finalize = MSG_task_create(task_name, 0, 0, xbt_strdup("finalize"));
+ TRACE_msg_set_task_category(finalize, "finalize");
+ MSG_task_send(finalize, "master_mailbox");
+ }
+
return 0;
}
int slave(int argc, char *argv[])
{
m_task_t task = NULL;
- int res;
+ MSG_error_t res;
- while(1) {
- res = MSG_task_receive(&(task), "master_mailbox");
- if (res != MSG_OK){
- INFO0("error");
- break;
- }
+ while (1) {
+ MSG_task_receive(&(task), "master_mailbox");
- if (!strcmp(MSG_task_get_name(task),"finalize")) {
+ char *data = MSG_task_get_data(task);
+ if (data && !strcmp(data, "finalize")) {
+ free(data);
MSG_task_destroy(task);
- break;
+ break;
}
- INFO1("Executing task %f", MSG_task_get_compute_duration(task));
+ XBT_INFO("Executing task %f", MSG_task_get_compute_duration(task));
MSG_task_execute(task);
- INFO0("End of execution");
+ XBT_INFO("End of execution");
MSG_task_destroy(task);
task = NULL;
}
return 0;
}
-/** Test function */
-MSG_error_t test_all(const char *platform_file,
- const char *application_file)
-{
- MSG_error_t res = MSG_OK;
-
- { /* Simulation setting */
- MSG_set_channel_number(0);
- MSG_create_environment(platform_file);
- }
- { /* Application deployment */
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- MSG_launch_application(application_file);
- }
- res = MSG_main();
-
- INFO1("Simulation time %g",MSG_get_clock());
- return res;
-}
-
-
/** Main function */
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
-
- //starting the simulation tracing
- TRACE_start_with_mask ("tasks.trace", TRACE_TASK);
-
- //declaring user categories
- TRACE_category ("compute");
- TRACE_category ("finalize");
-
- MSG_global_init(&argc,argv);
+ 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);
+ printf("Usage: %s platform_file deployment_file\n", argv[0]);
+ exit(1);
}
- res = test_all(argv[1],argv[2]);
- MSG_clean();
- //ending the simulation tracing
- TRACE_end();
+ char *platform_file = argv[1];
+ char *deployment_file = argv[2];
+ MSG_create_environment(platform_file);
+
+ TRACE_category_with_color ("compute", "1 0 0"); //compute is red
+ TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
+
+ MSG_function_register("master", master);
+ MSG_function_register("slave", slave);
+ MSG_launch_application(deployment_file);
- if(res==MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+ MSG_main();
+ MSG_clean();
+ return 0;
+}
