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
Merge pull request #193 from Takishipp/signals
[simgrid.git]
/
src
/
surf
/
xml
/
platf_private.hpp
diff --git
a/src/surf/xml/platf_private.hpp
b/src/surf/xml/platf_private.hpp
index
092e81c
..
d6b4dd8
100644
(file)
--- a/
src/surf/xml/platf_private.hpp
+++ b/
src/surf/xml/platf_private.hpp
@@
-11,8
+11,9
@@
#include "simgrid/host.h"
#include "src/surf/xml/platf.hpp"
#include "simgrid/host.h"
#include "src/surf/xml/platf.hpp"
-#include <
vector
>
+#include <
map
>
#include <string>
#include <string>
+#include <vector>
SG_BEGIN_DECL()
#include "src/surf/xml/simgrid_dtd.h"
SG_BEGIN_DECL()
#include "src/surf/xml/simgrid_dtd.h"
@@
-49,13
+50,15
@@
typedef struct {
tmgr_trace_t state_trace;
const char* coord;
xbt_dict_t properties;
tmgr_trace_t state_trace;
const char* coord;
xbt_dict_t properties;
-} s_sg_platf_host_cbarg_t, *sg_platf_host_cbarg_t;
+} s_sg_platf_host_cbarg_t;
+typedef s_sg_platf_host_cbarg_t* sg_platf_host_cbarg_t;
typedef struct {
const char* id;
const char* link_up;
const char* link_down;
typedef struct {
const char* id;
const char* link_up;
const char* link_down;
-} s_sg_platf_host_link_cbarg_t, *sg_platf_host_link_cbarg_t;
+} s_sg_platf_host_link_cbarg_t;
+typedef s_sg_platf_host_link_cbarg_t* sg_platf_host_link_cbarg_t;
class LinkCreationArgs {
public:
class LinkCreationArgs {
public:
@@
-96,7
+99,7
@@
typedef struct s_sg_platf_cluster_cbarg {
const char* prefix;
const char* suffix;
std::vector<int>* radicals;
const char* prefix;
const char* suffix;
std::vector<int>* radicals;
-
double speed
;
+
std::vector<double> speeds
;
int core_amount;
double bw;
double lat;
int core_amount;
double bw;
double lat;
@@
-113,7
+116,7
@@
typedef struct s_sg_platf_cluster_cbarg {
e_surf_link_sharing_policy_t bb_sharing_policy;
} s_sg_platf_cluster_cbarg_t;
e_surf_link_sharing_policy_t bb_sharing_policy;
} s_sg_platf_cluster_cbarg_t;
-typedef struct s_sg_platf_cabinet_cbarg
*
sg_platf_cabinet_cbarg_t;
+typedef struct s_sg_platf_cabinet_cbarg
*
sg_platf_cabinet_cbarg_t;
typedef struct s_sg_platf_cabinet_cbarg {
const char* id;
const char* prefix;
typedef struct s_sg_platf_cabinet_cbarg {
const char* id;
const char* prefix;
@@
-124,29
+127,30
@@
typedef struct s_sg_platf_cabinet_cbarg {
double lat;
} s_sg_platf_cabinet_cbarg_t;
double lat;
} s_sg_platf_cabinet_cbarg_t;
-typedef struct {
+typedef struct s_sg_platf_storage_cbarg* sg_platf_storage_cbarg_t;
+typedef struct s_sg_platf_storage_cbarg {
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;
const char* attach;
xbt_dict_t properties;
const char* attach;
-} s_sg_platf_storage_cbarg_t
, *sg_platf_storage_cbarg_t
;
+} s_sg_platf_storage_cbarg_t;
-typedef struct {
+typedef struct s_sg_platf_storage_type_cbarg* sg_platf_storage_type_cbarg_t;
+typedef struct s_sg_platf_storage_type_cbarg {
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;
-
xbt_dict_t
model_properties;
+
std::map<std::string, std::string>*
model_properties;
sg_size_t size;
sg_size_t size;
-} s_sg_platf_storage_type_cbarg_t
, *sg_platf_storage_type_cbarg_t
;
+} s_sg_platf_storage_type_cbarg_t;
-typedef struct {
+typedef struct s_sg_platf_mount_cbarg* sg_platf_mount_cbarg_t;
+typedef struct s_sg_platf_mount_cbarg {
const char* storageId;
const char* name;
const char* storageId;
const char* name;
-} s_sg_platf_mount_cbarg_t
, *sg_platf_mount_cbarg_t
;
+} s_sg_platf_mount_cbarg_t;
typedef struct s_sg_platf_prop_cbarg *sg_platf_prop_cbarg_t;
typedef struct s_sg_platf_prop_cbarg {
typedef struct s_sg_platf_prop_cbarg *sg_platf_prop_cbarg_t;
typedef struct s_sg_platf_prop_cbarg {
@@
-234,17
+238,7
@@
XBT_PUBLIC(int) surf_parse_get_debug();
XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
XBT_PUBLIC(int) surf_parse_lex_destroy();
XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
XBT_PUBLIC(int) surf_parse_lex_destroy();
-/* To include files (?) */
-XBT_PRIVATE void surfxml_bufferstack_push(int _new);
-XBT_PRIVATE void surfxml_bufferstack_pop(int _new);
-XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
-
XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
-/********** Instr. **********/
-XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS);
-XBT_PRIVATE void sg_instr_new_router(const char* name);
-XBT_PRIVATE void sg_instr_new_host(simgrid::s4u::Host& host);
-XBT_PRIVATE void sg_instr_AS_end();
SG_END_DECL()
SG_END_DECL()