-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-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. */
-#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"
xbt_mutex_t mutex = NULL;
xbt_cond_t cond = NULL;
-static m_process_t process_to_migrate = NULL;
+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);
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();
xbt_cond_broadcast(cond);
xbt_mutex_release(mutex);
MSG_process_suspend(MSG_process_self());
- m_host_t h = MSG_process_get_host(MSG_process_self());
+ msg_host_t h = MSG_process_get_host(MSG_process_self());
XBT_INFO("I've been moved on this new host: %s", MSG_host_get_name(h));
XBT_INFO("Uh, nothing to do here. Stopping now");
return 0;
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);
/** Main function */
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
/* Argument checking */
- MSG_global_init(&argc, argv);
- if (argc < 3) {
- XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]);
- XBT_CRITICAL("example: %s msg_platform.xml msg_deployment_suspend.xml\n",
- argv[0]);
- exit(1);
- }
+ MSG_init(&argc, argv);
+ xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+ "\tExample: %s msg_platform.xml msg_deployment_suspend.xml\n",
+ argv[0], argv[0]);
/* Simulation setting */
MSG_create_environment(argv[1]);
xbt_cond_destroy(cond);
xbt_mutex_destroy(mutex);
- if (res == MSG_OK)
- res = MSG_clean();
-
- if (res == MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+ return res != MSG_OK;
+}