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
Use surf_parse_error() rather than xbt_die() during surf parsing
[simgrid.git]
/
src
/
msg
/
msg_io.c
diff --git
a/src/msg/msg_io.c
b/src/msg/msg_io.c
index
c2b108e
..
b5667c2
100644
(file)
--- a/
src/msg/msg_io.c
+++ b/
src/msg/msg_io.c
@@
-352,12
+352,11
@@
xbt_dynar_t MSG_storages_as_dynar(void) {
xbt_dynar_t res = xbt_dynar_new(sizeof(msg_storage_t),NULL);
xbt_lib_foreach(storage_lib, cursor, key, data) {
xbt_dynar_t res = xbt_dynar_new(sizeof(msg_storage_t),NULL);
xbt_lib_foreach(storage_lib, cursor, key, data) {
-
if(routing_get_network_element_type(key) == MSG_STORAGE_LEVE
L) {
+
if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), MSG_STORAGE_LEVEL) != NUL
L) {
xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
xbt_dynar_push(res, &elm);
}
}
xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
xbt_dynar_push(res, &elm);
}
}
-
return res;
}
return res;
}
@@
-369,8
+368,8
@@
xbt_dynar_t MSG_storages_as_dynar(void) {
*/
msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data)
{
*/
msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data)
{
-
SIMIX_storage_set_data(storage,data
);
-
+
msg_storage_priv_t priv = MSG_storage_priv(storage
);
+ priv->data = data;
return MSG_OK;
}
return MSG_OK;
}
@@
-383,7
+382,9
@@
msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data)
*/
void *MSG_storage_get_data(msg_storage_t storage)
{
*/
void *MSG_storage_get_data(msg_storage_t storage)
{
- return SIMIX_storage_get_data(storage);
+ xbt_assert((storage != NULL), "Invalid parameters");
+ msg_storage_priv_t priv = MSG_storage_priv(storage);
+ return priv->data;
}
/** \ingroup msg_storage_management
}
/** \ingroup msg_storage_management