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
there is no need for a SimDag's link type
[simgrid.git]
/
include
/
simgrid
/
platf.h
diff --git
a/include/simgrid/platf.h
b/include/simgrid/platf.h
index
6639f2c
..
d19beb3
100644
(file)
--- a/
include/simgrid/platf.h
+++ b/
include/simgrid/platf.h
@@
-1,6
+1,7
@@
/* platf.h - Public interface to the SimGrid platforms */
/* platf.h - Public interface to the SimGrid platforms */
-/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2014. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-9,13
+10,17
@@
#define SG_PLATF_H
#include <xbt.h>
#define SG_PLATF_H
#include <xbt.h>
+#include <simgrid/host.h>
-typedef void *sg_routing_link_t; /* The actual type is model-dependent so use void* instead*/
-typedef struct s_routing_edge *sg_routing_edge_t;
+SG_BEGIN_DECL()
+
+typedef void *sg_routing_link_t; /* FIXME:The actual type is model-dependent so use void* instead*/
+typedef struct RoutingEdge *sg_routing_edge_t;
XBT_PUBLIC(sg_routing_edge_t) sg_routing_edge_by_name_or_null(const char *name);
XBT_PUBLIC(sg_routing_edge_t) sg_routing_edge_by_name_or_null(const char *name);
-/** Defines whether a given resource is working or not */
+/** @ingroup SURF_interface
+* @brief Defines whether a given resource is working or not */
typedef enum {
SURF_RESOURCE_ON = 1, /**< Up & ready */
SURF_RESOURCE_OFF = 0 /**< Down & broken */
typedef enum {
SURF_RESOURCE_ON = 1, /**< Up & ready */
SURF_RESOURCE_OFF = 0 /**< Down & broken */
@@
-40,6
+45,12
@@
typedef enum {
SURF_PROCESS_ON_FAILURE_RESTART = 0
} e_surf_process_on_failure_t;
SURF_PROCESS_ON_FAILURE_RESTART = 0
} e_surf_process_on_failure_t;
+typedef enum {
+ SURF_CLUSTER_FAT_TREE=2,
+ SURF_CLUSTER_FLAT = 1,
+ SURF_CLUSTER_TORUS = 0
+} e_surf_cluster_topology_t;
+
typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
@@
-70,7
+81,7
@@
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;
}
static inline char* sg_host_name(sg_host_t host) {
return host->key;
}
@@
-79,6
+90,15
@@
typedef xbt_dictelm_t sg_storage_t;
static inline char* sg_storage_name(sg_storage_t storage) {
return storage->key;
}
static inline char* sg_storage_name(sg_storage_t storage) {
return storage->key;
}
+/** @ingroup m_datatypes_management_details
+ * @brief Type for any simgrid size
+ */
+typedef unsigned long long sg_size_t;
+
+/** @ingroup m_datatypes_management_details
+ * @brief Type for any simgrid offset
+ */
+typedef long long sg_offset_t;
/*
* Platform creation functions. Instead of passing 123 arguments to the creation functions
/*
* Platform creation functions. Instead of passing 123 arguments to the creation functions
@@
-195,6
+215,8
@@
typedef struct s_sg_platf_cluster_cbarg {
double loopback_bw;
double loopback_lat;
double limiter_link;
double loopback_bw;
double loopback_lat;
double limiter_link;
+ e_surf_cluster_topology_t topology;
+ const char* topo_parameters;
xbt_dict_t properties;
const char* router_id;
e_surf_link_sharing_policy_t sharing_policy;
xbt_dict_t properties;
const char* router_id;
e_surf_link_sharing_policy_t sharing_policy;
@@
-225,6
+247,7
@@
typedef struct {
const char* content;
const char* content_type;
xbt_dict_t properties;
const char* content;
const char* content_type;
xbt_dict_t properties;
+ const char* attach;
} s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t;
#define SG_PLATF_STORAGE_INITIALIZER {NULL,NULL,NULL,NULL}
} s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t;
#define SG_PLATF_STORAGE_INITIALIZER {NULL,NULL,NULL,NULL}
@@
-235,7
+258,8
@@
typedef struct {
const char* content;
const char* content_type;
xbt_dict_t properties;
const char* content;
const char* content_type;
xbt_dict_t properties;
- size_t size;
+ xbt_dict_t model_properties;
+ sg_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}
@@
-293,7
+317,7
@@
typedef struct s_sg_platf_process_cbarg {
e_surf_process_on_failure_t on_failure;
} s_sg_platf_process_cbarg_t;
e_surf_process_on_failure_t on_failure;
} s_sg_platf_process_cbarg_t;
-#define SG_PLATF_PROCESS_INITIALIZER {NULL,
NULL,NULL,NULL,NULL,NULL,NULL,NULL
}
+#define SG_PLATF_PROCESS_INITIALIZER {NULL,
0,NULL,NULL,NULL,-1.0,-1.0,SURF_PROCESS_ON_FAILURE_DIE
}
typedef struct s_sg_platf_AS_cbarg *sg_platf_AS_cbarg_t;
typedef struct s_sg_platf_AS_cbarg {
typedef struct s_sg_platf_AS_cbarg *sg_platf_AS_cbarg_t;
typedef struct s_sg_platf_AS_cbarg {
@@
-313,6
+337,7
@@
typedef struct s_sg_platf_gpu_cbarg {
#define SG_PLATF_GPU_INITIALIZER {NULL}
#define SG_PLATF_GPU_INITIALIZER {NULL}
+
/* ***************************************** */
XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform
/* ***************************************** */
XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform
@@
-338,7
+363,6
@@
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_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect);
XBT_PUBLIC(void) sg_platf_new_trace(sg_platf_trace_cbarg_t trace);
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_mstorage(sg_platf_mstorage_cbarg_t mstorage);
XBT_PUBLIC(void) sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type);
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_mstorage(sg_platf_mstorage_cbarg_t mstorage);
XBT_PUBLIC(void) sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type);
@@
-364,5
+388,6
@@
XBT_PUBLIC(void) sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_
typedef void (*sg_platf_process_cb_t)(sg_platf_process_cbarg_t);
XBT_PUBLIC(void) sg_platf_process_add_cb(sg_platf_process_cb_t fct);
typedef void (*sg_platf_process_cb_t)(sg_platf_process_cbarg_t);
XBT_PUBLIC(void) sg_platf_process_add_cb(sg_platf_process_cb_t fct);
+SG_END_DECL()
#endif /* SG_PLATF_H */
#endif /* SG_PLATF_H */