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 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
[simgrid.git]
/
src
/
surf
/
workstation_private.h
diff --git
a/src/surf/workstation_private.h
b/src/surf/workstation_private.h
index
5b63d3f
..
f786f4f
100644
(file)
--- a/
src/surf/workstation_private.h
+++ b/
src/surf/workstation_private.h
@@
-10,8
+10,13
@@
typedef struct workstation_CLM03 {
s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */
void *net_elm;
xbt_dynar_t storage;
s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */
void *net_elm;
xbt_dynar_t storage;
+
+ /* common with vm */
+ s_ws_params_t params;
+
} s_workstation_CLM03_t, *workstation_CLM03_t;
} s_workstation_CLM03_t, *workstation_CLM03_t;
+int ws_action_unref(surf_action_t action);
int ws_resource_used(void *resource_id);
double ws_share_resources(surf_model_t workstation_model, double now);
int ws_resource_used(void *resource_id);
double ws_share_resources(surf_model_t workstation_model, double now);
@@
-25,5
+30,10
@@
surf_action_t ws_execute(void *workstation, double size);
surf_action_t ws_action_sleep(void *workstation, double duration);
void ws_action_suspend(surf_action_t action);
void ws_action_resume(surf_action_t action);
surf_action_t ws_action_sleep(void *workstation, double duration);
void ws_action_suspend(surf_action_t action);
void ws_action_resume(surf_action_t action);
+void ws_action_cancel(surf_action_t action);
e_surf_resource_state_t ws_get_state(void *workstation);
e_surf_resource_state_t ws_get_state(void *workstation);
+double ws_action_get_remains(surf_action_t action);
+
+void ws_get_params(void *ws, ws_params_t params);
+void ws_set_params(void *ws, ws_params_t params);
#endif /* WS_PRIVATE_H_ */
#endif /* WS_PRIVATE_H_ */