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
Deprecate functions MSG_global_init() / MSG_global_init_args() in flavor of MSG_init()
[simgrid.git]
/
examples
/
msg
/
priority
/
priority.c
diff --git
a/examples/msg/priority/priority.c
b/examples/msg/priority/priority.c
index
066b374
..
8690ec5
100644
(file)
--- a/
examples/msg/priority/priority.c
+++ b/
examples/msg/priority/priority.c
@@
-14,27
+14,34
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
"Messages specific for this msg example");
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
"Messages specific for this msg example");
+/** @addtogroup MSG_examples
+ *
+ * - <b>priority/priority.c</b>: Demonstrates the use of @ref
+ * MSG_task_set_priority to change the computation priority of a
+ * given task.
+ *
+ */
+
static int test(int argc, char *argv[])
{
double computation_amount = 0.0;
double priority = 1.0;
m_task_t task = NULL;
static int test(int argc, char *argv[])
{
double computation_amount = 0.0;
double priority = 1.0;
m_task_t task = NULL;
+ _XBT_GNUC_UNUSED 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;
}
@@
-44,7
+51,6
@@
static MSG_error_t test_all(const char *platform_file,
MSG_error_t res = MSG_OK;
{ /* Simulation setting */
MSG_error_t res = MSG_OK;
{ /* Simulation setting */
- MSG_set_channel_number(1);
MSG_create_environment(platform_file);
}
{ /* Application deployment */
MSG_create_environment(platform_file);
}
{ /* Application deployment */
@@
-53,7
+59,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;
}
@@
-62,11
+68,12
@@
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
- MSG_
global_
init(&argc, argv);
+ 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]);
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]);