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
Update workstation handling in SimDag. Change the prefix of SimDag functions with...
[simgrid.git]
/
src
/
simdag
/
sd_task.c
diff --git
a/src/simdag/sd_task.c
b/src/simdag/sd_task.c
index
3a22af5
..
2a8dac0
100644
(file)
--- a/
src/simdag/sd_task.c
+++ b/
src/simdag/sd_task.c
@@
-3,17
+3,17
@@
/* Creates a task.
*/
/* Creates a task.
*/
-S
G_task_t SG
_task_create(const char *name, void *data, double amount) {
+S
D_task_t SD
_task_create(const char *name, void *data, double amount) {
xbt_assert0(amount >= 0, "Invalid parameter"); /* or amount > 0 ? */
xbt_assert0(amount >= 0, "Invalid parameter"); /* or amount > 0 ? */
- S
G_task_t task = xbt_new0(s_SG
_task_t, 1);
+ S
D_task_t task = xbt_new0(s_SD
_task_t, 1);
task->data = data;
task->name = xbt_strdup(name);
/*task->amount = amount;
task->remaining_amount = amount;*/
task->data = data;
task->name = xbt_strdup(name);
/*task->amount = amount;
task->remaining_amount = amount;*/
- task->state = S
G_SCHEDULED; /* not sure... should we add a state SG
_NOT_SCHEDULED? */
+ task->state = S
D_SCHEDULED; /* not sure... should we add a state SD
_NOT_SCHEDULED? */
/* TODO: dependencies + watch */
return task;
/* TODO: dependencies + watch */
return task;
@@
-21,8
+21,8
@@
SG_task_t SG_task_create(const char *name, void *data, double amount) {
/* Schedules a task.
*/
/* Schedules a task.
*/
-int S
G_task_schedule(SG
_task_t task, int workstation_nb,
- S
G
_workstation_t **workstation_list, double *computation_amount,
+int S
D_task_schedule(SD
_task_t task, int workstation_nb,
+ S
D
_workstation_t **workstation_list, double *computation_amount,
double *communication_amount, double rate) {
xbt_assert0(task, "Invalid parameter");
/* TODO */
double *communication_amount, double rate) {
xbt_assert0(task, "Invalid parameter");
/* TODO */
@@
-32,28
+32,28
@@
int SG_task_schedule(SG_task_t task, int workstation_nb,
/* Returns the data of a task.
*/
/* Returns the data of a task.
*/
-void* S
G_task_get_data(SG
_task_t task) {
+void* S
D_task_get_data(SD
_task_t task) {
xbt_assert0(task, "Invalid parameter");
return task->data;
}
/* Sets the data of a task.
*/
xbt_assert0(task, "Invalid parameter");
return task->data;
}
/* Sets the data of a task.
*/
-void S
G_task_set_data(SG
_task_t task, void *data) {
+void S
D_task_set_data(SD
_task_t task, void *data) {
xbt_assert0(task, "Invalid parameter");
task->data = data;
}
/* Returns the name of a task.
*/
xbt_assert0(task, "Invalid parameter");
task->data = data;
}
/* Returns the name of a task.
*/
-const char* S
G_task_get_name(SG
_task_t task) {
+const char* S
D_task_get_name(SD
_task_t task) {
xbt_assert0(task, "Invalid parameter");
return task->name;
}
/* Returns the computing amount of a task.
*/
xbt_assert0(task, "Invalid parameter");
return task->name;
}
/* Returns the computing amount of a task.
*/
-double S
G_task_get_amount(SG
_task_t task) {
+double S
D_task_get_amount(SD
_task_t task) {
xbt_assert0(task, "Invalid parameter");
/* TODO */
xbt_assert0(task, "Invalid parameter");
/* TODO */
@@
-63,7
+63,7
@@
double SG_task_get_amount(SG_task_t task) {
/* Returns the remaining computing amount of a task.
*/
/* Returns the remaining computing amount of a task.
*/
-double S
G_task_get_remaining_amount(SG
_task_t task) {
+double S
D_task_get_remaining_amount(SD
_task_t task) {
xbt_assert0(task, "Invalid parameter")
/* TODO (surf encapsulation) */;
xbt_assert0(task, "Invalid parameter")
/* TODO (surf encapsulation) */;
@@
-72,37
+72,37
@@
double SG_task_get_remaining_amount(SG_task_t task) {
/* Adds a dependency between two tasks.
*/
/* Adds a dependency between two tasks.
*/
-void S
G_task_dependency_add(const char *name, void *data, SG_task_t src, SG
_task_t dst) {
+void S
D_task_dependency_add(const char *name, void *data, SD_task_t src, SD
_task_t dst) {
xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
/* TODO */
}
/* Removes a dependency between two tasks.
*/
xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
/* TODO */
}
/* Removes a dependency between two tasks.
*/
-void S
G_task_dependency_remove(SG_task_t src, SG
_task_t dst) {
+void S
D_task_dependency_remove(SD_task_t src, SD
_task_t dst) {
xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
/* TODO */
}
xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
/* TODO */
}
-/* Returns the state of a task: S
G_SCHEDULED, SG_RUNNING, SG_DONE or SG
_FAILED.
+/* Returns the state of a task: S
D_SCHEDULED, SD_RUNNING, SD_DONE or SD
_FAILED.
*/
*/
-S
G_task_state_t SG_task_get_state(SG
_task_t task) {
+S
D_task_state_t SD_task_get_state(SD
_task_t task) {
xbt_assert0(task, "Invalid parameter");
return task->state;
}
/* Adds a watch point to a task.
xbt_assert0(task, "Invalid parameter");
return task->state;
}
/* Adds a watch point to a task.
- S
G
_simulate will stop as soon as the state of this task is the one given in argument.
+ S
D
_simulate will stop as soon as the state of this task is the one given in argument.
Watch point is then automatically removed.
*/
Watch point is then automatically removed.
*/
-void S
G_task_watch(SG_task_t task, SG
_task_state_t state) {
+void S
D_task_watch(SD_task_t task, SD
_task_state_t state) {
xbt_assert0(task, "Invalid parameter");
/* TODO */
}
/* Removes a watch point from a task.
*/
xbt_assert0(task, "Invalid parameter");
/* TODO */
}
/* Removes a watch point from a task.
*/
-void S
G_task_unwatch(SG_task_t task, SG
_task_state_t state) {
+void S
D_task_unwatch(SD_task_t task, SD
_task_state_t state) {
xbt_assert0(task, "Invalid parameter");
/* TODO */
}
xbt_assert0(task, "Invalid parameter");
/* TODO */
}
@@
-110,14
+110,14
@@
void SG_task_unwatch(SG_task_t task, SG_task_state_t state) {
/* Unschedules a task.
Change state and rerun
*/
/* Unschedules a task.
Change state and rerun
*/
-void S
G_task_unschedule(SG
_task_t task) {
+void S
D_task_unschedule(SD
_task_t task) {
xbt_assert0(task, "Invalid parameter");
/* TODO */
}
/* Destroys a task. The user data (if any) should have been destroyed first.
*/
xbt_assert0(task, "Invalid parameter");
/* TODO */
}
/* Destroys a task. The user data (if any) should have been destroyed first.
*/
-void S
G_task_destroy(SG
_task_t task) {
+void S
D_task_destroy(SD
_task_t task) {
if (task->name)
xbt_free(task->name);
if (task->name)
xbt_free(task->name);