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);
-
/** Emitter function */
int master(int argc, char *argv[])
{
long slaves_count = atol(argv[4]);
//setting the variable "is_master" (previously declared) to value 1
- TRACE_host_variable_set("is_master", 1);
+ TRACE_host_variable_set(MSG_host_self()->name, "is_master", 1);
TRACE_mark("msmark", "start_send_tasks");
int i;
task = MSG_task_create("task", task_comp_size, task_comm_size, NULL);
//setting the variable "task_creation" to value i
- TRACE_host_variable_set("task_creation", i);
+ TRACE_host_variable_set(MSG_host_self()->name, "task_creation", i);
//setting the category of task to "compute"
//the category of a task must be defined before it is sent or executed
int slave(int argc, char *argv[])
{
m_task_t task = NULL;
- int res;
- TRACE_host_variable_set("is_slave", 1);
+ TRACE_host_variable_set(MSG_host_self()->name, "is_slave", 1);
while (1) {
- res = MSG_task_receive(&(task), "master_mailbox");
+ MSG_task_receive(&(task), "master_mailbox");
if (!strcmp(MSG_task_get_name(task), "finalize")) {
MSG_task_destroy(task);
}
//adding the value returned by MSG_task_get_compute_duration(task)
//to the variable "task_computation"
- TRACE_host_variable_add("task_computation",
+ TRACE_host_variable_add(MSG_host_self()->name,
+ "task_computation",
MSG_task_get_compute_duration(task));
MSG_task_execute(task);
MSG_task_destroy(task);
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);
- }
- {
- /* declaring tracing categories */
-
- //declaring user variables
- TRACE_host_variable_declare("is_slave");
- TRACE_host_variable_declare("is_master");
- TRACE_host_variable_declare("task_creation");
- TRACE_host_variable_declare("task_computation");
-
- //declaring user markers
- TRACE_declare_mark("msmark");
-
- //declaring user categories with RGB colors (values from 0 to 1)
- TRACE_category_with_color ("compute", "1 0 0"); //compute is red
- TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
- //categories without user-defined colors receive
- //random colors generated by the tracing system
- TRACE_category ("request");
- TRACE_category_with_color ("report", NULL);
- }
- { /* Application deployment */
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- MSG_launch_application(application_file);
- }
- res = MSG_main();
-
- XBT_INFO("Simulation time %g", MSG_get_clock());
- return res;
-}
-
-
/** Main function */
int main(int argc, char *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);
}
- res = test_all(argv[1], argv[2]);
- MSG_clean();
+ char *platform_file = argv[1];
+ char *deployment_file = argv[2];
+ MSG_create_environment(platform_file);
+
+ //declaring user variables
+ TRACE_host_variable_declare("is_slave");
+ TRACE_host_variable_declare("is_master");
+ TRACE_host_variable_declare("task_creation");
+ TRACE_host_variable_declare("task_computation");
+
+ //declaring user markers
+ TRACE_declare_mark("msmark");
- if (res == MSG_OK)
- return 0;
- else
- return 1;
+ //declaring user categories with RGB colors (values from 0 to 1)
+ TRACE_category_with_color ("compute", "1 0 0"); //compute is red
+ TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
+ //categories without user-defined colors receive
+ //random colors generated by the tracing system
+ TRACE_category ("request");
+ TRACE_category_with_color ("report", NULL);
+
+ MSG_function_register("master", master);
+ MSG_function_register("slave", slave);
+ MSG_launch_application(deployment_file);
+
+ MSG_main();
+ MSG_clean();
+ return 0;
} /* end_of_main */
