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
Ansi C declaration of the variables (at the beginning of the blocks)
[simgrid.git]
/
src
/
surf
/
surf_private.h
diff --git
a/src/surf/surf_private.h
b/src/surf/surf_private.h
index
88dc20a
..
9a25508
100644
(file)
--- a/
src/surf/surf_private.h
+++ b/
src/surf/surf_private.h
@@
-13,6
+13,7
@@
#include "surf/trace_mgr.h"
#include "xbt/log.h"
#include "surf/surfxml_parse_private.h"
#include "surf/trace_mgr.h"
#include "xbt/log.h"
#include "surf/surfxml_parse_private.h"
+#include "surf/random_mgr.h"
#define NO_MAX_DURATION -1.0
#define SG_TCP_CTE_GAMMA 20000.0
#define NO_MAX_DURATION -1.0
#define SG_TCP_CTE_GAMMA 20000.0
@@
-20,16
+21,16
@@
extern const char *surf_action_state_names[6];
typedef enum {
extern const char *surf_action_state_names[6];
typedef enum {
- SURF_
NETWORK_
LINK_ON = 1, /* Ready */
- SURF_
NETWORK_
LINK_OFF = 0 /* Running */
-} e_surf_
network_
link_state_t;
+ SURF_LINK_ON = 1, /* Ready */
+ SURF_LINK_OFF = 0 /* Running */
+} e_surf_link_state_t;
typedef enum {
typedef enum {
- SURF_
NETWORK_
LINK_SHARED = 1,
- SURF_
NETWORK_
LINK_FATPIPE = 0
-} e_surf_
network_
link_sharing_policy_t;
+ SURF_LINK_SHARED = 1,
+ SURF_LINK_FATPIPE = 0
+} e_surf_link_sharing_policy_t;
-typedef struct surf_
resource
_private {
+typedef struct surf_
model
_private {
int (*resource_used) (void *resource_id);
/* Share the resources to the actions and return in hom much time
the next action may terminate */
int (*resource_used) (void *resource_id);
/* Share the resources to the actions and return in hom much time
the next action may terminate */
@@
-39,22
+40,20
@@
typedef struct surf_resource_private {
void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
double value);
void (*finalize) (void);
void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
double value);
void (*finalize) (void);
-} s_surf_
resource
_private_t;
+} s_surf_
model
_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)))) */
+/* #define pub2priv(r) ((surf_
model_private_t) ((char *)(r) -(sizeof(struct surf_model
_private_part)))) */
+/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_
model
_private_part)))) */
extern int use_sdp_solver;
extern int use_lagrange_solver;
double generic_maxmin_share_resources(xbt_swag_t running_actions,
extern int use_sdp_solver;
extern int use_lagrange_solver;
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,
void (*solve)(lmm_system_t));
size_t offset,
lmm_system_t sys,
void (*solve)(lmm_system_t));
-/* Generic functions common to all
ressource
s */
+/* Generic functions common to all
models
s */
e_surf_action_state_t surf_action_get_state(surf_action_t action);
double surf_action_get_start_time(surf_action_t action);
double surf_action_get_finish_time(surf_action_t action);
e_surf_action_state_t surf_action_get_state(surf_action_t action);
double surf_action_get_start_time(surf_action_t action);
double surf_action_get_finish_time(surf_action_t action);
@@
-65,11
+64,9
@@
void surf_action_set_data(surf_action_t action,
void *data);
FILE * surf_fopen(const char *name, const char *mode);
void *data);
FILE * surf_fopen(const char *name, const char *mode);
-extern lmm_system_t maxmin_system;
extern tmgr_history_t history;
extern xbt_dynar_t surf_path;
extern tmgr_history_t history;
extern xbt_dynar_t surf_path;
-
/*
* Returns the initial path. On Windows the initial path is
* the current directory for the current process in the other
/*
* Returns the initial path. On Windows the initial path is
* the current directory for the current process in the other