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]
/
include
/
simdag
/
datatypes.h
diff --git
a/include/simdag/datatypes.h
b/include/simdag/datatypes.h
index
1b1ad0b
..
78b64b6
100644
(file)
--- a/
include/simdag/datatypes.h
+++ b/
include/simdag/datatypes.h
@@
-2,46
+2,42
@@
#define SIMDAG_DATATYPES_H
/* Link */
#define SIMDAG_DATATYPES_H
/* Link */
-typedef struct S
G_link_data *SG
_link_data_t;
+typedef struct S
D_link_data *SD
_link_data_t;
-typedef struct S
G
_link {
- S
G_link_data_t sgdata; /* SG
internal data */
+typedef struct S
D
_link {
+ S
D_link_data_t sd_data; /* SD
internal data */
void *data; /* user data */
char *name;
/*double capacity;*/
/*double current_bandwidth;
double current_latency;*/
void *data; /* user data */
char *name;
/*double capacity;*/
/*double current_bandwidth;
double current_latency;*/
-} s_S
G_link_t, *SG
_link_t;
+} s_S
D_link_t, *SD
_link_t;
/* Workstation */
/* Workstation */
-typedef struct S
G_workstation_data *SG
_workstation_data_t;
+typedef struct S
D_workstation_data *SD
_workstation_data_t;
-typedef struct S
G
_workstation {
- S
G_workstation_data_t sgdata; /* SG
internal data */
+typedef struct S
D
_workstation {
+ S
D_workstation_data_t sd_data; /* SD
internal data */
void *data; /* user data */
void *data; /* user data */
- char *name;
-
- /* double power;
- double available_power;*/
-} s_SG_workstation_t, *SG_workstation_t;
+} s_SD_workstation_t, *SD_workstation_t;
/* Task state */
typedef enum {
/* Task state */
typedef enum {
- S
G
_SCHEDULED,
- S
G
_RUNNING,
- S
G
_DONE,
- S
G
_FAILED
-} S
G
_task_state_t;
+ S
D
_SCHEDULED,
+ S
D
_RUNNING,
+ S
D
_DONE,
+ S
D
_FAILED
+} S
D
_task_state_t;
/* Task */
/* Task */
-typedef struct S
G
_task {
+typedef struct S
D
_task {
void *data;
char *name;
/*double amount;
double remaining_amount;*/
void *data;
char *name;
/*double amount;
double remaining_amount;*/
- S
G
_task_state_t state;
+ S
D
_task_state_t state;
/* TODO: dependencies + watch */
/* TODO: dependencies + watch */
-} s_S
G_task_t, *SG
_task_t;
+} s_S
D_task_t, *SD
_task_t;
#endif
#endif