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 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[simgrid.git]
/
examples
/
msg
/
priority
/
priority.c
diff --git
a/examples/msg/priority/priority.c
b/examples/msg/priority/priority.c
index
63162cf
..
9c5eb23
100644
(file)
--- a/
examples/msg/priority/priority.c
+++ b/
examples/msg/priority/priority.c
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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. */
/* 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. */
@@
-21,21
+20,20
@@
static int test(int argc, char *argv[])
double priority = 1.0;
m_task_t task = NULL;
double priority = 1.0;
m_task_t task = NULL;
+ int res = sscanf(argv[1], "%lg", &computation_amount);
+ xbt_assert(res, "Invalid argument %s\n", argv[1]);
+ res = sscanf(argv[2], "%lg", &priority);
+ xbt_assert(res, "Invalid argument %s\n", argv[2]);
- xbt_assert1(sscanf(argv[1], "%lg", &computation_amount),
- "Invalid argument %s\n", argv[1]);
- xbt_assert1(sscanf(argv[2], "%lg", &priority),
- "Invalid argument %s\n", argv[2]);
-
- INFO2("Hello! Running a task of size %g with priority %g",
+ XBT_INFO("Hello! Running a task of size %g with priority %g",
computation_amount, priority);
task = MSG_task_create("Task", computation_amount, 0.0, NULL);
MSG_task_set_priority(task, priority);
MSG_task_execute(task);
computation_amount, priority);
task = MSG_task_create("Task", computation_amount, 0.0, NULL);
MSG_task_set_priority(task, priority);
MSG_task_execute(task);
+ MSG_task_destroy(task);
-
- INFO0("Goodbye now!");
+ XBT_INFO("Goodbye now!");
return 0;
}
return 0;
}
@@
-54,7
+52,7
@@
static MSG_error_t test_all(const char *platform_file,
}
res = MSG_main();
}
res = MSG_main();
-
INFO1
("Simulation time %g", MSG_get_clock());
+
XBT_INFO
("Simulation time %g", MSG_get_clock());
return res;
}
return res;
}
@@
-63,7
+61,8
@@
int main(int argc, char *argv[])
MSG_error_t res = MSG_OK;
#ifdef _MSC_VER
MSG_error_t res = MSG_OK;
#ifdef _MSC_VER
- unsigned int prev_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT);
+ unsigned int prev_exponent_format =
+ _set_output_format(_TWO_DIGIT_EXPONENT);
#endif
#endif