X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df12bbc75c274351f3b3a628740e0b3270f08e18..c85e43e7cc3034aefc758257a387d32026c05ef4:/examples/msg/migration/migration.c?ds=sidebyside

diff --git a/examples/msg/migration/migration.c b/examples/msg/migration/migration.c
index fef2e70951..35fc18a9e2 100644
--- a/examples/msg/migration/migration.c
+++ b/examples/msg/migration/migration.c
@@ -1,11 +1,12 @@
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2014. 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 "msg/msg.h"            /* core library */
+#include "simgrid/msg.h"        /* core library */
 #include "xbt/sysdep.h"         /* calloc */
+#include "xbt/synchro_core.h"
 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
@@ -26,10 +27,10 @@ static msg_process_t process_to_migrate = NULL;
 /** 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;
+  msg_task_t task;
   XBT_INFO
       ("I'll look for a new job on another machine where the grass is greener.");
-  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Boivin"));
+  MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Boivin"));
   
   XBT_INFO("Yeah, found something to do");
   task = MSG_task_create("job", 98095000, 0, NULL);
@@ -37,8 +38,8 @@ static int emigrant(int argc, char *argv[])
   MSG_task_destroy(task);
   MSG_process_sleep(2);
   XBT_INFO("Moving back home after work");
-  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Jacquelin"));
-  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Boivin"));
+  MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Jacquelin"));
+  MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Boivin"));
   MSG_process_sleep(4);
   xbt_mutex_acquire(mutex);
   process_to_migrate = MSG_process_self();
@@ -59,7 +60,7 @@ static int policeman(int argc, char *argv[])
   xbt_mutex_acquire(mutex);
   XBT_INFO("Wait a bit before migrating the emigrant.");
   while (process_to_migrate == NULL) xbt_cond_wait(cond, mutex);
-  MSG_process_migrate(process_to_migrate, MSG_get_host_by_name("Jacquelin"));
+  MSG_process_migrate(process_to_migrate, MSG_host_by_name("Jacquelin"));
   XBT_INFO("I moved the emigrant");
   MSG_process_resume(process_to_migrate);
   xbt_mutex_release(mutex);
@@ -71,7 +72,7 @@ static int policeman(int argc, char *argv[])
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
   /* Argument checking */
   MSG_init(&argc, argv);
@@ -98,9 +99,6 @@ int main(int argc, char *argv[])
   xbt_cond_destroy(cond);
   xbt_mutex_destroy(mutex);
 
-  if (res == MSG_OK)
-    res = MSG_clean();
-
   if (res == MSG_OK)
     return 0;
   else