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
Introducing new functionnality without breaking the API.
[simgrid.git]
/
src
/
surf
/
surf_private.h
diff --git
a/src/surf/surf_private.h
b/src/surf/surf_private.h
index
3fbf995
..
f819a09
100644
(file)
--- a/
src/surf/surf_private.h
+++ b/
src/surf/surf_private.h
@@
-17,27
+17,37
@@
#define NO_MAX_DURATION -1.0
typedef struct surf_resource_private {
#define NO_MAX_DURATION -1.0
typedef struct surf_resource_private {
- int (*resource_used)(void *resource_id);
+ int (*resource_used)
(void *resource_id);
/* Share the resources to the actions and return in hom much time
/* Share the resources to the actions and return in hom much time
-
the next action may terminate */
- xbt_heap_float_t(*share_resources) (xbt_heap_float_t now);
+ the next action may terminate */
+ double (*share_resources) (double now);
/* Update the actions' state */
/* Update the actions' state */
- void (*update_actions_state) (xbt_heap_float_t now, xbt_heap_float_t delta);
- void (*update_resource_state) (void *id,tmgr_trace_event_t event_type, xbt_maxmin_float_t value);
- void (*finalize)(void);
+ void (*update_actions_state) (double now, double delta);
+ void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
+ double value);
+ void (*finalize) (void);
} s_surf_resource_private_t;
/* #define pub2priv(r) ((surf_resource_private_t) ((char *)(r) -(sizeof(struct surf_resource_private_part)))) */
/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_resource_private_part)))) */
} s_surf_resource_private_t;
/* #define pub2priv(r) ((surf_resource_private_t) ((char *)(r) -(sizeof(struct surf_resource_private_part)))) */
/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_resource_private_part)))) */
-xbt_heap_float_t generic_maxmin_share_resources(xbt_swag_t running_actions,
- size_t offset);
+double generic_maxmin_share_resources(xbt_swag_t running_actions,
+ size_t offset);
+double generic_maxmin_share_resources2(xbt_swag_t running_actions,
+ size_t offset,
+ lmm_system_t sys);
+
/* Generic functions common to all ressources */
e_surf_action_state_t surf_action_get_state(surf_action_t action);
void surf_action_free(surf_action_t * action);
/* Generic functions common to all ressources */
e_surf_action_state_t surf_action_get_state(surf_action_t action);
void surf_action_free(surf_action_t * action);
-void surf_action_change_state(surf_action_t action, e_surf_action_state_t state);
+void surf_action_change_state(surf_action_t action,
+ e_surf_action_state_t state);
+void surf_action_set_data(surf_action_t action,
+ void *data);
+FILE *surf_fopen(const char *name, const char *mode);
extern lmm_system_t maxmin_system;
extern tmgr_history_t history;
extern lmm_system_t maxmin_system;
extern tmgr_history_t history;
+extern xbt_dynar_t surf_path;
#endif /* _SURF_SURF_PRIVATE_H */
#endif /* _SURF_SURF_PRIVATE_H */