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
Energy, onHostDestruction: ensured ptr existence
[simgrid.git]
/
examples
/
msg
/
parallel_task
/
parallel_task.c
diff --git
a/examples/msg/parallel_task/parallel_task.c
b/examples/msg/parallel_task/parallel_task.c
index
a3dda64
..
7035cba
100644
(file)
--- a/
examples/msg/parallel_task/parallel_task.c
+++ b/
examples/msg/parallel_task/parallel_task.c
@@
-1,11
+1,11
@@
-/* Copyright (c) 2007-201
4
. The SimGrid Team.
+/* Copyright (c) 2007-201
5
. 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 <stdio.h>
* 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 <stdio.h>
-#include "
msg/msg.h" /* Yeah! If you want to use msg, you need to include msg
/msg.h */
+#include "
simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid
/msg.h */
#include "xbt/sysdep.h" /* calloc, printf */
/* Create a log channel to have nice outputs. */
#include "xbt/sysdep.h" /* calloc, printf */
/* Create a log channel to have nice outputs. */
@@
-77,7
+77,7
@@
msg_error_t test_all(const char *platform_file)
xbt_dynar_t all_hosts;
msg_host_t first_host;
xbt_dynar_t all_hosts;
msg_host_t first_host;
- MSG_config("
workstation
/model", "ptask_L07");
+ MSG_config("
host
/model", "ptask_L07");
MSG_create_environment(platform_file);
all_hosts = MSG_hosts_as_dynar();
MSG_create_environment(platform_file);
all_hosts = MSG_hosts_as_dynar();
@@
-95,15
+95,9
@@
int main(int argc, char *argv[])
msg_error_t res = MSG_OK;
MSG_init(&argc, argv);
msg_error_t res = MSG_OK;
MSG_init(&argc, argv);
- if (argc < 2) {
- printf("Usage: %s platform_file\n", argv[0]);
- printf("example: %s msg_platform.xml\n", argv[0]);
- exit(1);
- }
+ xbt_assert(argc > 1, "Usage: %s platform_file\n"
+ "\tExample: %s msg_platform.xml", argv[0], argv[0]);
res = test_all(argv[1]);
res = test_all(argv[1]);
- if (res == MSG_OK)
- return 0;
- else
- return 1;
+ return res != MSG_OK;
}
}