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
found a hidden unsigned long
[simgrid.git]
/
include
/
simgrid
/
platf.h
diff --git
a/include/simgrid/platf.h
b/include/simgrid/platf.h
index
49ad142
..
6639f2c
100644
(file)
--- a/
include/simgrid/platf.h
+++ b/
include/simgrid/platf.h
@@
-75,6
+75,10
@@
static inline char* sg_host_name(sg_host_t host) {
return host->key;
}
return host->key;
}
+typedef xbt_dictelm_t sg_storage_t;
+static inline char* sg_storage_name(sg_storage_t storage) {
+ return storage->key;
+}
/*
* Platform creation functions. Instead of passing 123 arguments to the creation functions
/*
* Platform creation functions. Instead of passing 123 arguments to the creation functions
@@
-88,7
+92,8
@@
static inline char* sg_host_name(sg_host_t host) {
typedef struct {
const char* id;
typedef struct {
const char* id;
- double power_peak;
+ xbt_dynar_t power_peak;
+ int pstate;
int core_amount;
double power_scale;
tmgr_trace_t power_trace;
int core_amount;
double power_scale;
tmgr_trace_t power_trace;
@@
-187,6
+192,10
@@
typedef struct s_sg_platf_cluster_cbarg {
double lat;
double bb_bw;
double bb_lat;
double lat;
double bb_bw;
double bb_lat;
+ double loopback_bw;
+ double loopback_lat;
+ double limiter_link;
+ xbt_dict_t properties;
const char* router_id;
e_surf_link_sharing_policy_t sharing_policy;
e_surf_link_sharing_policy_t bb_sharing_policy;
const char* router_id;
e_surf_link_sharing_policy_t sharing_policy;
e_surf_link_sharing_policy_t bb_sharing_policy;
@@
-195,7
+204,7
@@
typedef struct s_sg_platf_cluster_cbarg {
} s_sg_platf_cluster_cbarg_t;
#define SG_PLATF_CLUSTER_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL \
} s_sg_platf_cluster_cbarg_t;
#define SG_PLATF_CLUSTER_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL \
- ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}
+ ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL
,NULL
}
typedef struct s_sg_platf_cabinet_cbarg *sg_platf_cabinet_cbarg_t;
typedef struct s_sg_platf_cabinet_cbarg {
typedef struct s_sg_platf_cabinet_cbarg *sg_platf_cabinet_cbarg_t;
typedef struct s_sg_platf_cabinet_cbarg {
@@
-214,6
+223,7
@@
typedef struct {
const char* id;
const char* type_id;
const char* content;
const char* id;
const char* type_id;
const char* content;
+ const char* content_type;
xbt_dict_t properties;
} s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t;
xbt_dict_t properties;
} s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t;
@@
-223,8
+233,9
@@
typedef struct {
const char* id;
const char* model;
const char* content;
const char* id;
const char* model;
const char* content;
+ const char* content_type;
xbt_dict_t properties;
xbt_dict_t properties;
- unsigned long size; /* size in Gbytes */
+ size_t size;
} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t;
#define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL}
} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t;
#define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL}
@@
-237,7
+248,7
@@
typedef struct {
#define SG_PLATF_MSTORAGE_INITIALIZER {NULL,NULL}
typedef struct {
#define SG_PLATF_MSTORAGE_INITIALIZER {NULL,NULL}
typedef struct {
- const char*
i
d;
+ const char*
storageI
d;
const char* name;
} s_sg_platf_mount_cbarg_t, *sg_platf_mount_cbarg_t;
const char* name;
} s_sg_platf_mount_cbarg_t, *sg_platf_mount_cbarg_t;