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
coverage madness in examples
[simgrid.git]
/
examples
/
msg
/
migration
/
migration.c
diff --git
a/examples/msg/migration/migration.c
b/examples/msg/migration/migration.c
index
ef06bf1
..
8a6bd75
100644
(file)
--- a/
examples/msg/migration/migration.c
+++ b/
examples/msg/migration/migration.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
4
. The SimGrid Team.
+/* Copyright (c) 2009-201
5
. 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
@@
-30,7
+30,7
@@
static int emigrant(int argc, char *argv[])
msg_task_t task;
XBT_INFO
("I'll look for a new job on another machine where the grass is greener.");
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);
XBT_INFO("Yeah, found something to do");
task = MSG_task_create("job", 98095000, 0, NULL);
@@
-38,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_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();
MSG_process_sleep(4);
xbt_mutex_acquire(mutex);
process_to_migrate = MSG_process_self();
@@
-60,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);
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);
XBT_INFO("I moved the emigrant");
MSG_process_resume(process_to_migrate);
xbt_mutex_release(mutex);
@@
-76,12
+76,9
@@
int main(int argc, char *argv[])
/* Argument checking */
MSG_init(&argc, argv);
/* Argument checking */
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",
- argv[0]);
- exit(1);
- }
+ 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]);
/* Simulation setting */
MSG_create_environment(argv[1]);
@@
-99,8
+96,5
@@
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)
- return 0;
- else
- return 1;
-} /* end_of_main */
+ return res != MSG_OK;
+}