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
cosmetics in the uglyness that MSVC requires
[simgrid.git]
/
src
/
msg
/
msg_task.c
diff --git
a/src/msg/msg_task.c
b/src/msg/msg_task.c
index
c6055c5
..
5e78505
100644
(file)
--- a/
src/msg/msg_task.c
+++ b/
src/msg/msg_task.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-107,7
+107,7
@@
MSG_parallel_task_create(const char *name, int host_nb,
/* Simulator Data specific to parallel tasks */
simdata->host_nb = host_nb;
/* Simulator Data specific to parallel tasks */
simdata->host_nb = host_nb;
- simdata->host_list = xbt_new0(s
mx
_host_t, host_nb);
+ simdata->host_list = xbt_new0(s
g
_host_t, host_nb);
simdata->flops_parallel_amount = flops_amount;
simdata->bytes_parallel_amount = bytes_amount;
simdata->flops_parallel_amount = flops_amount;
simdata->bytes_parallel_amount = bytes_amount;
@@
-273,7
+273,7
@@
msg_error_t MSG_task_destroy(msg_task_t task)
action = task->simdata->compute;
if (action)
action = task->simdata->compute;
if (action)
- simcall_
host
_execution_destroy(action);
+ simcall_
process
_execution_destroy(action);
/* parallel tasks only */
xbt_free(task->simdata->host_list);
/* parallel tasks only */
xbt_free(task->simdata->host_list);
@@
-298,7
+298,7
@@
msg_error_t MSG_task_cancel(msg_task_t task)
xbt_assert((task != NULL), "Cannot cancel a NULL task");
if (task->simdata->compute) {
xbt_assert((task != NULL), "Cannot cancel a NULL task");
if (task->simdata->compute) {
- simcall_
host
_execution_cancel(task->simdata->compute);
+ simcall_
process
_execution_cancel(task->simdata->compute);
}
else if (task->simdata->comm) {
simdata_task_t simdata = task->simdata;
}
else if (task->simdata->comm) {
simdata_task_t simdata = task->simdata;
@@
-319,7
+319,7
@@
msg_error_t MSG_task_cancel(msg_task_t task)
double MSG_task_get_flops_amount(msg_task_t task) {
if (task->simdata->compute) {
double MSG_task_get_flops_amount(msg_task_t task) {
if (task->simdata->compute) {
- return simcall_
host
_execution_get_remains(task->simdata->compute);
+ return simcall_
process
_execution_get_remains(task->simdata->compute);
} else {
return task->simdata->flops_amount;
}
} else {
return task->simdata->flops_amount;
}
@@
-410,7
+410,7
@@
void MSG_task_set_priority(msg_task_t task, double priority)
task->simdata->priority = 1 / priority;
if (task->simdata->compute)
task->simdata->priority = 1 / priority;
if (task->simdata->compute)
- simcall_
host
_execution_set_priority(task->simdata->compute,
+ simcall_
process
_execution_set_priority(task->simdata->compute,
task->simdata->priority);
}
task->simdata->priority);
}
@@
-431,7
+431,7
@@
void MSG_task_set_bound(msg_task_t task, double bound)
task->simdata->bound = bound;
if (task->simdata->compute)
task->simdata->bound = bound;
if (task->simdata->compute)
- simcall_
host
_execution_set_bound(task->simdata->compute,
+ simcall_
process
_execution_set_bound(task->simdata->compute,
task->simdata->bound);
}
task->simdata->bound);
}
@@
-517,6
+517,6
@@
void MSG_task_set_affinity(msg_task_t task, msg_host_t host, unsigned long mask)
}
XBT_INFO("set affinity(0x%04lx@%s) for %s", mask, MSG_host_get_name(host), MSG_task_get_name(task));
}
XBT_INFO("set affinity(0x%04lx@%s) for %s", mask, MSG_host_get_name(host), MSG_task_get_name(task));
- simcall_
host
_execution_set_affinity(task->simdata->compute, host, mask);
+ simcall_
process
_execution_set_affinity(task->simdata->compute, host, mask);
}
}
}
}