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
Put those variables private
[simgrid.git]
/
src
/
surf
/
surf_private.h
diff --git
a/src/surf/surf_private.h
b/src/surf/surf_private.h
index
6e10c38
..
e714b8d
100644
(file)
--- a/
src/surf/surf_private.h
+++ b/
src/surf/surf_private.h
@@
-17,12
+17,6
@@
#define NO_MAX_DURATION -1.0
#define NO_MAX_DURATION -1.0
-typedef enum {
- UM_FULL,
- UM_LAZY,
- UM_UNDEFINED
-} e_UM_t;
-
/* user-visible parameters */
extern double sg_tcp_gamma;
extern double sg_sender_gap;
/* user-visible parameters */
extern double sg_tcp_gamma;
extern double sg_sender_gap;
@@
-39,6
+33,12
@@
extern int sg_gtnets_jitter_seed;
extern const char *surf_action_state_names[6];
extern const char *surf_action_state_names[6];
+typedef enum {
+ UM_FULL,
+ UM_LAZY,
+ UM_UNDEFINED
+} e_UM_t;
+
typedef struct surf_model_private {
int (*resource_used) (void *resource_id);
/* Share the resources to the actions and return in how much time
typedef struct surf_model_private {
int (*resource_used) (void *resource_id);
/* Share the resources to the actions and return in how much time
@@
-49,6
+49,13
@@
typedef struct surf_model_private {
void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
double value, double time);
void (*finalize) (void);
void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
double value, double time);
void (*finalize) (void);
+
+ lmm_system_t maxmin_system;
+ e_UM_t update_mechanism;
+ xbt_swag_t modified_set;
+ xbt_heap_t action_heap;
+ int selective_update;
+
} s_surf_model_private_t;
double generic_maxmin_share_resources(xbt_swag_t running_actions,
} s_surf_model_private_t;
double generic_maxmin_share_resources(xbt_swag_t running_actions,
@@
-175,7
+182,7
@@
typedef struct s_as {
const char *dst, route_t e_route);
} s_as_t;
const char *dst, route_t e_route);
} s_as_t;
-struct s_routing_
global
{
+struct s_routing_
platf
{
AS_t root;
void *loopback;
xbt_dynar_t last_route;
AS_t root;
void *loopback;
xbt_dynar_t last_route;