X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7b7b4b41126df6c1198c30b5af68570cea785c5..fc5167a345c9569b12237d14937523d733fb041f:/examples/msg/tracing/procmig.c diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c index d2f564711a..c81c26a909 100644 --- a/examples/msg/tracing/procmig.c +++ b/examples/msg/tracing/procmig.c @@ -1,8 +1,21 @@ -/* Copyright (c) 2009 The SimGrid team. All rights reserved. */ +/* Copyright (c) 2010-2012. 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. */ +/** @addtogroup MSG_examples + * + * - tracing/procmig.c This program shows a process migration. Tracing + * this program with the options below enables a gantt-chart visualization + * of where the process has been during its execution. Migrations are represented by + * arrows from the origin to the destination host. + * You might want to run this program with the following parameters: + * --cfg=tracing:yes + * --cfg=tracing/msg/process:yes + * (See \ref tracing_tracing_options for details) + */ + #include "msg/msg.h" /* core library */ #include "xbt/sysdep.h" /* calloc */ @@ -14,7 +27,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, /** The guy we will move from host to host. It move alone and then is moved by policeman back */ static int emigrant(int argc, char *argv[]) { - m_task_t task = NULL; + msg_task_t task = NULL; char *destination = NULL; MSG_process_sleep(2); @@ -24,7 +37,6 @@ static int emigrant(int argc, char *argv[]) destination = (char*)MSG_task_get_data (task); MSG_task_destroy (task); if (!destination) break; //there is no destination, die - XBT_INFO("Migrating to %s", destination); MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name(destination)); MSG_process_sleep(2); // I am tired, have to sleep for 2 seconds free (destination); @@ -35,7 +47,7 @@ static int emigrant(int argc, char *argv[]) static int master(int argc, char *argv[]) { - m_task_t task = NULL; + msg_task_t task = NULL; // I am the master of emigrant process, // I tell it where it must emigrate to. @@ -57,7 +69,7 @@ static int master(int argc, char *argv[]) if (destination){ MSG_task_set_data(task, xbt_strdup (destination)); } - TRACE_msg_set_task_category(task, "migration_order"); + MSG_task_set_category(task, "migration_order"); MSG_task_send (task, "master_mailbox"); task = NULL; } @@ -68,10 +80,8 @@ static int master(int argc, char *argv[]) /** Main function */ int main(int argc, char *argv[]) { - MSG_error_t res = MSG_OK; - /* Argument checking */ - MSG_global_init(&argc, argv); + MSG_init(&argc, argv); if (argc < 3) { XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]); exit(1); @@ -89,6 +99,5 @@ int main(int argc, char *argv[]) MSG_launch_application(deployment_file); MSG_main(); - MSG_clean(); return 0; } /* end_of_main */