A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use values of type double.
[simgrid.git]
/
examples
/
msg
/
migration
/
migration.c
diff --git
a/examples/msg/migration/migration.c
b/examples/msg/migration/migration.c
index
cd2b65d
..
898682f
100644
(file)
--- a/
examples/msg/migration/migration.c
+++ b/
examples/msg/migration/migration.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2009
-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-6,20
+6,28
@@
#include "msg/msg.h" /* core library */
#include "xbt/sysdep.h" /* calloc */
#include "msg/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_LOG_NEW_DEFAULT_CATEGORY(msg_test,
"Messages specific for this msg example");
/* Create a log channel to have nice outputs. */
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
"Messages specific for this msg example");
+/** @addtogroup MSG_examples
+ *
+ * - <b>migration/migration.c</b> Demonstrates how to use the @ref
+ * MSG_process_migrate function to let processes change the host they
+ * run on after their start.
+ */
+
xbt_mutex_t mutex = NULL;
xbt_cond_t cond = NULL;
xbt_mutex_t mutex = NULL;
xbt_cond_t cond = NULL;
-static m_process_t process_to_migrate = NULL;
+static m
sg
_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[])
{
/** 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;
+ m
sg
_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"));
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"));
@@
-38,8
+46,8
@@
static int emigrant(int argc, char *argv[])
xbt_cond_broadcast(cond);
xbt_mutex_release(mutex);
MSG_process_suspend(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());
- XBT_INFO("I've been moved on this new host: %s",
h->name
);
+ m
sg
_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;
} /* end_of_emigrant */
XBT_INFO("Uh, nothing to do here. Stopping now");
return 0;
} /* end_of_emigrant */
@@
-64,10
+72,10
@@
static int policeman(int argc, char *argv[])
/** Main function */
int main(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 */
/* 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]);
XBT_CRITICAL("example: %s msg_platform.xml msg_deployment_suspend.xml\n",
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",
@@
-91,9
+99,6
@@
int main(int argc, char *argv[])
xbt_cond_destroy(cond);
xbt_mutex_destroy(mutex);
xbt_cond_destroy(cond);
xbt_mutex_destroy(mutex);
- if (res == MSG_OK)
- res = MSG_clean();
-
if (res == MSG_OK)
return 0;
else
if (res == MSG_OK)
return 0;
else