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 branch 'mc++'
[simgrid.git]
/
include
/
simgrid
/
platf.h
diff --git
a/include/simgrid/platf.h
b/include/simgrid/platf.h
index
d894607
..
4031d13
100644
(file)
--- a/
include/simgrid/platf.h
+++ b/
include/simgrid/platf.h
@@
-1,6
+1,6
@@
/* platf.h - Public interface to the SimGrid platforms */
/* platf.h - Public interface to the SimGrid platforms */
-/* Copyright (c) 2004-201
3
. The SimGrid Team.
+/* Copyright (c) 2004-201
4
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-89,7
+89,9
@@
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;
}
-/* Type for any simgrid size */
+/** @ingroup m_datatypes_management_details
+ * @brief Type for any simgrid size
+ */
typedef unsigned long long sg_size_t;
/*
typedef unsigned long long sg_size_t;
/*
@@
-239,6
+241,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}
@@
-249,6
+252,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;
+ xbt_dict_t model_properties;
sg_size_t size;
} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t;
sg_size_t size;
} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t;