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
change algo chosen for pairwise, to work with non power of 2 number of procs
[simgrid.git]
/
include
/
simgrid
/
platf.h
diff --git
a/include/simgrid/platf.h
b/include/simgrid/platf.h
index
d044e35
..
9b6d970
100644
(file)
--- a/
include/simgrid/platf.h
+++ b/
include/simgrid/platf.h
@@
-33,7
+33,7
@@
typedef enum {
SURF_TRACE_CONNECT_KIND_LINK_AVAIL = 2,
SURF_TRACE_CONNECT_KIND_BANDWIDTH = 1,
SURF_TRACE_CONNECT_KIND_LATENCY = 0
SURF_TRACE_CONNECT_KIND_LINK_AVAIL = 2,
SURF_TRACE_CONNECT_KIND_BANDWIDTH = 1,
SURF_TRACE_CONNECT_KIND_LATENCY = 0
-} e_surf_trace_connect_kin_t;
+} e_surf_trace_connect_kin
d
_t;
typedef enum {
SURF_PROCESS_ON_FAILURE_DIE = 1,
typedef enum {
SURF_PROCESS_ON_FAILURE_DIE = 1,
@@
-70,6
+70,11
@@
XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(c
XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(const char* id,
double scale,
double shape);
XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(const char* id,
double scale,
double shape);
+typedef xbt_dictelm_t sg_host_t;
+static inline char* sg_host_name(sg_host_t host) {
+ return host->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
@@
-83,7
+88,8
@@
XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(const
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;
@@
-182,6
+188,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;
@@
-190,7
+200,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 {
@@
-209,6
+219,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;
@@
-218,6
+229,7
@@
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;
unsigned long size; /* size in Gbytes */
} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t;
xbt_dict_t properties;
unsigned long size; /* size in Gbytes */
} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t;
@@
-232,7
+244,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;
@@
-258,7
+270,7
@@
typedef struct s_sg_platf_trace_cbarg {
typedef struct s_sg_platf_trace_connect_cbarg *sg_platf_trace_connect_cbarg_t;
typedef struct s_sg_platf_trace_connect_cbarg {
typedef struct s_sg_platf_trace_connect_cbarg *sg_platf_trace_connect_cbarg_t;
typedef struct s_sg_platf_trace_connect_cbarg {
- e_surf_trace_connect_kin_t kind;
+ e_surf_trace_connect_kin
d
_t kind;
const char *trace;
const char *element;
} s_sg_platf_trace_connect_cbarg_t;
const char *trace;
const char *element;
} s_sg_platf_trace_connect_cbarg_t;
@@
-297,8
+309,6
@@
typedef struct s_sg_platf_gpu_cbarg {
#define SG_PLATF_GPU_INITIALIZER {NULL}
#define SG_PLATF_GPU_INITIALIZER {NULL}
-XBT_PUBLIC(void) sg_platf_new_gpu (sg_platf_gpu_cbarg_t gpu); // Add an gpu
-
/* ***************************************** */
XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform
/* ***************************************** */
XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform
@@
-322,7
+332,7
@@
XBT_PUBLIC(void) sg_platf_new_bypassASroute (sg_platf_route_cbarg_t bypassASrout
XBT_PUBLIC(void) sg_platf_new_prop (sg_platf_prop_cbarg_t prop); // Add a prop
XBT_PUBLIC(void) sg_platf_new_trace(sg_platf_trace_cbarg_t trace);
XBT_PUBLIC(void) sg_platf_new_prop (sg_platf_prop_cbarg_t prop); // Add a prop
XBT_PUBLIC(void) sg_platf_new_trace(sg_platf_trace_cbarg_t trace);
-XBT_PUBLIC(void) sg_platf_
new_
trace_connect(sg_platf_trace_connect_cbarg_t trace_connect);
+XBT_PUBLIC(void) sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect);
XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS
XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS
XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS
XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS
@@
-332,6
+342,11
@@
XBT_PUBLIC(void) sg_platf_new_mount(sg_platf_mount_cbarg_t mount);
XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process);
XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process);
+/* ***************************************** */
+/* TUTORIAL: New TAG */
+XBT_PUBLIC(void) sg_platf_new_gpu(sg_platf_gpu_cbarg_t gpu);
+/* ***************************************** */
+
// Add route and Asroute without xml file with those functions
XBT_PUBLIC(void) sg_platf_route_begin (sg_platf_route_cbarg_t route); // Initialize route
XBT_PUBLIC(void) sg_platf_route_end (sg_platf_route_cbarg_t route); // Finalize and add a route
// Add route and Asroute without xml file with those functions
XBT_PUBLIC(void) sg_platf_route_begin (sg_platf_route_cbarg_t route); // Initialize route
XBT_PUBLIC(void) sg_platf_route_end (sg_platf_route_cbarg_t route); // Finalize and add a route