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
Merge branch 'coverity_scan' of github.com:mquinson/simgrid
[simgrid.git]
/
examples
/
msg
/
ns3
/
ns3.c
diff --git
a/examples/msg/ns3/ns3.c
b/examples/msg/ns3/ns3.c
index
4a8b214
..
42fa9d1
100644
(file)
--- a/
examples/msg/ns3/ns3.c
+++ b/
examples/msg/ns3/ns3.c
@@
-56,34
+56,26
@@
int count_finished = 0;
/** master */
int master(int argc, char *argv[])
{
/** master */
int master(int argc, char *argv[])
{
- char *slavename = NULL;
- double task_comm_size = 0;
msg_task_t todo;
msg_task_t todo;
- char id_alias[10];
- //unique id to control statistics
- int id = -1;
xbt_assert(argc==4,"Strange number of arguments expected 3 got %d", argc - 1);
XBT_DEBUG ("Master started");
/* data size */
xbt_assert(argc==4,"Strange number of arguments expected 3 got %d", argc - 1);
XBT_DEBUG ("Master started");
/* data size */
- int read;
- read = sscanf(argv[1], "%lg", &task_comm_size);
- xbt_assert(read, "Invalid argument %s\n", argv[1]);
+ double task_comm_size = xbt_str_parse_double(argv[1], "Invalid task communication size: %s");
/* slave name */
/* slave name */
- slavename = argv[2];
- i
d = atoi(argv[3]);
-
sprintf(id_alias,
"flow_%d", id);
+
char *
slavename = argv[2];
+ i
nt id = xbt_str_parse_int(argv[3], "Invalid ID as argument 3: %s"); //unique id to control statistics
+
char *id_alias = bprintf(
"flow_%d", id);
slavenames[id] = slavename;
TRACE_category(id_alias);
masternames[id] = MSG_host_get_name(MSG_host_self());
{ /* Task creation. */
slavenames[id] = slavename;
TRACE_category(id_alias);
masternames[id] = MSG_host_get_name(MSG_host_self());
{ /* Task creation. */
- char sprintf_buffer[64] = "Task_0";
- todo = MSG_task_create(sprintf_buffer, 100*task_comm_size, task_comm_size, NULL);
+ todo = MSG_task_create("Task_0", 100*task_comm_size, task_comm_size, NULL);
MSG_task_set_category(todo, id_alias);
//keep track of running tasks
gl_task_array[id] = todo;
MSG_task_set_category(todo, id_alias);
//keep track of running tasks
gl_task_array[id] = todo;
@@
-91,7
+83,7
@@
int master(int argc, char *argv[])
}
{ /* Process organization */
}
{ /* Process organization */
- MSG_
get_
host_by_name(slavename);
+ MSG_host_by_name(slavename);
}
count_finished++;
}
count_finished++;
@@
-100,11
+92,11
@@
int master(int argc, char *argv[])
/* time measurement */
sprintf(id_alias, "%d", id);
start_time = MSG_get_clock();
/* time measurement */
sprintf(id_alias, "%d", id);
start_time = MSG_get_clock();
- //MSG_task_execute(todo);
MSG_task_send(todo, id_alias);
end_time = MSG_get_clock();
XBT_DEBUG ("Finished");
MSG_task_send(todo, id_alias);
end_time = MSG_get_clock();
XBT_DEBUG ("Finished");
+ xbt_free(id_alias);
return 0;
} /* end_of_master */
return 0;
} /* end_of_master */
@@
-148,7
+140,7
@@
int slave(int argc, char *argv[])
XBT_DEBUG ("Slave started");
XBT_DEBUG ("Slave started");
- id =
atoi(argv[1]
);
+ id =
xbt_str_parse_int(argv[1], "Invalid id: %s"
);
sprintf(id_alias, "%d", id);
a = MSG_task_receive(&(task), id_alias);
sprintf(id_alias, "%d", id);
a = MSG_task_receive(&(task), id_alias);
@@
-209,15
+201,12
@@
int main(int argc, char *argv[])
bool_printed = 0;
MSG_init(&argc, argv);
bool_printed = 0;
MSG_init(&argc, argv);
- if (argc < 3) {
- printf("Usage: %s platform_file deployment_file\n", argv[0]);
-
exit(1
);
- }
+ xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+ "\tExample: %s platform.xml 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;
+}