X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/257ab65b59147888e6d3cfdf284e55889e7d5b16..b3b356352e87ae00a20f737c48e19b0c8413455a:/examples/msg/tracing/procmig.c diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c index 26a7eff2b8..5be002b70a 100644 --- a/examples/msg/tracing/procmig.c +++ b/examples/msg/tracing/procmig.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2010 The SimGrid team. All rights reserved. */ +/* 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. */ @@ -10,12 +11,12 @@ * 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:1 - * --cfg=tracing/msg/process:1 + * --cfg=tracing:yes + * --cfg=tracing/msg/process:yes * (See \ref tracing_tracing_options for details) */ -#include "msg/msg.h" /* core library */ +#include "simgrid/msg.h" /* core library */ #include "xbt/sysdep.h" /* calloc */ /* Create a log channel to have nice outputs. */ @@ -26,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); @@ -36,7 +37,7 @@ 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 - MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name(destination)); + MSG_process_migrate(MSG_process_self(), MSG_host_by_name(destination)); MSG_process_sleep(2); // I am tired, have to sleep for 2 seconds free (destination); task = NULL; @@ -46,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. @@ -80,7 +81,7 @@ static int master(int argc, char *argv[]) int main(int argc, char *argv[]) { /* 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); @@ -98,6 +99,5 @@ int main(int argc, char *argv[]) MSG_launch_application(deployment_file); MSG_main(); - MSG_clean(); return 0; } /* end_of_main */