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
Try to activate coverity for simgrid
[simgrid.git]
/
examples
/
msg
/
masterslave
/
masterslave_bypass.c
diff --git
a/examples/msg/masterslave/masterslave_bypass.c
b/examples/msg/masterslave/masterslave_bypass.c
index
59aed82
..
1ff3e3a
100644
(file)
--- a/
examples/msg/masterslave/masterslave_bypass.c
+++ b/
examples/msg/masterslave/masterslave_bypass.c
@@
-1,11
+1,11
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-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 <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 "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
/* Create a log channel to have nice outputs. */
#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
/* Create a log channel to have nice outputs. */
@@
-165,7
+165,7
@@
int master(int argc, char *argv[])
double task_comp_size = 0;
double task_comm_size = 0;
int i;
double task_comp_size = 0;
double task_comm_size = 0;
int i;
-
_XBT_GNUC
_UNUSED int read;
+
XBT_ATTRIB
_UNUSED int read;
read = sscanf(argv[1], "%d", &number_of_tasks);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
read = sscanf(argv[1], "%d", &number_of_tasks);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
@@
-187,14
+187,14
@@
int master(int argc, char *argv[])
}
}
}
}
- { /* Process organi
s
ation */
+ { /* Process organi
z
ation */
slaves_count = argc - 4;
slaves = xbt_new0(msg_host_t, slaves_count);
for (i = 4; i < argc; i++) {
slaves_count = argc - 4;
slaves = xbt_new0(msg_host_t, slaves_count);
for (i = 4; i < argc; i++) {
- slaves[i - 4] = MSG_
get_
host_by_name(argv[i]);
+ slaves[i - 4] = MSG_host_by_name(argv[i]);
if (slaves[i - 4] == NULL) {
if (slaves[i - 4] == NULL) {
- XBT_INFO("Unknown host %s. Stopping Now!
", argv[i]);
+ XBT_INFO("Unknown host %s. Stopping Now!", argv[i]);
abort();
}
}
abort();
}
}
@@
-240,17
+240,17
@@
int slave(int argc, char *argv[])
int a;
a = MSG_task_receive(&task, MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
int a;
a = MSG_task_receive(&task, MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
- XBT_INFO("Received \"%s\"
"
, MSG_task_get_name(task));
+ XBT_INFO("Received \"%s\"
"
, MSG_task_get_name(task));
if (MSG_task_get_data(task) == FINALIZE) {
MSG_task_destroy(task);
break;
}
if (MSG_task_get_data(task) == FINALIZE) {
MSG_task_destroy(task);
break;
}
- XBT_INFO("Processing \"%s\"
", MSG_task_get_name(task));
+ XBT_INFO("Processing \"%s\"", MSG_task_get_name(task));
MSG_task_execute(task);
MSG_task_execute(task);
- XBT_INFO("\"%s\" done
", MSG_task_get_name(task));
+ XBT_INFO("\"%s\" done", MSG_task_get_name(task));
MSG_task_destroy(task);
} else {
MSG_task_destroy(task);
} else {
- XBT_INFO("Hey ?! What's up ?
");
+ XBT_INFO("Hey ?! What's up ?");
xbt_die( "Unexpected behavior");
}
}
xbt_die( "Unexpected behavior");
}
}