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
kill that ruby script that nobody will ever use
[simgrid.git]
/
examples
/
msg
/
icomms
/
peer3.c
diff --git
a/examples/msg/icomms/peer3.c
b/examples/msg/icomms/peer3.c
index
2026f88
..
155b702
100644
(file)
--- a/
examples/msg/icomms/peer3.c
+++ b/
examples/msg/icomms/peer3.c
@@
-1,11
+1,11
@@
-/* Copyright (c) 2010-201
4
. The SimGrid Team.
+/* Copyright (c) 2010-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 */
#include <math.h>
/* Create a log channel to have nice outputs. */
#include "xbt/sysdep.h" /* calloc, printf */
#include <math.h>
/* Create a log channel to have nice outputs. */
@@
-69,7
+69,7
@@
int sender(int argc, char *argv[])
sprintf(mailbox, "finalize");
msg_comm_t res_irecv;
sprintf(mailbox, "finalize");
msg_comm_t res_irecv;
-
_XBT_GNUC
_UNUSED msg_error_t res_wait;
+
XBT_ATTRIB
_UNUSED msg_error_t res_wait;
for (i = 0; i < receivers_count; i++) {
task = NULL;
res_irecv = MSG_task_irecv(&(task), mailbox);
for (i = 0; i < receivers_count; i++) {
task = NULL;
res_irecv = MSG_task_irecv(&(task), mailbox);
@@
-93,7
+93,7
@@
int receiver(int argc, char *argv[])
int tasks = atof(argv[2]);
msg_task_t *task = xbt_new(msg_task_t, tasks);
int tasks = atof(argv[2]);
msg_task_t *task = xbt_new(msg_task_t, tasks);
-
_XBT_GNUC
_UNUSED int read;
+
XBT_ATTRIB
_UNUSED int read;
read = sscanf(argv[1], "%d", &id);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
sprintf(mailbox, "receiver-%d", id);
read = sscanf(argv[1], "%d", &id);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
sprintf(mailbox, "receiver-%d", id);
@@
-109,7
+109,7
@@
int receiver(int argc, char *argv[])
/* Here we are waiting for the receiving of all communications */
msg_task_t task_com;
while (!xbt_dynar_is_empty(comms)) {
/* Here we are waiting for the receiving of all communications */
msg_task_t task_com;
while (!xbt_dynar_is_empty(comms)) {
-
_XBT_GNUC
_UNUSED msg_error_t err;
+
XBT_ATTRIB
_UNUSED msg_error_t err;
xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
task_com = MSG_comm_get_task(res_irecv);
MSG_comm_destroy(res_irecv);
xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
task_com = MSG_comm_get_task(res_irecv);
MSG_comm_destroy(res_irecv);
@@
-137,7
+137,6
@@
msg_error_t test_all(const char *platform_file,
{
msg_error_t res = MSG_OK;
{
msg_error_t res = MSG_OK;
- /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
@@
-159,15
+158,11
@@
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 < 3) {
- printf("Usage: %s platform_file deployment_file\n", argv[0]);
- printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
- exit(1);
- }
+ xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+ "\tExample: %s msg_platform.xml msg_deployment.xml\n",
+ argv[0], argv[0]);
+
res = test_all(argv[1], argv[2]);
res = test_all(argv[1], argv[2]);
-
- if (res == MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+
+ return res != MSG_OK;
+}