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
Whitespace cleanup.
[simgrid.git]
/
src
/
simix
/
smx_io.c
diff --git
a/src/simix/smx_io.c
b/src/simix/smx_io.c
index
1c16b3b
..
7dbccac
100644
(file)
--- a/
src/simix/smx_io.c
+++ b/
src/simix/smx_io.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2010, 2012-2013
. 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
@@
-21,7
+21,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix,
* \param storage the SURF storage to encapsulate
* \param data some user data (may be NULL)
*/
* \param storage the SURF storage to encapsulate
* \param data some user data (may be NULL)
*/
-smx_
host
_t SIMIX_storage_create(const char *name, void *storage, void *data)
+smx_
storage
_t SIMIX_storage_create(const char *name, void *storage, void *data)
{
smx_storage_priv_t smx_storage = xbt_new0(s_smx_storage_priv_t, 1);
{
smx_storage_priv_t smx_storage = xbt_new0(s_smx_storage_priv_t, 1);
@@
-29,7
+29,8
@@
smx_host_t SIMIX_storage_create(const char *name, void *storage, void *data)
/* Update global variables */
xbt_lib_set(storage_lib,name,SIMIX_STORAGE_LEVEL,smx_storage);
/* Update global variables */
xbt_lib_set(storage_lib,name,SIMIX_STORAGE_LEVEL,smx_storage);
- return xbt_lib_get_elm_or_null(storage_lib, name);
+
+ return xbt_lib_get_or_null(storage_lib, name, SIMIX_STORAGE_LEVEL);
}
}
@@
-319,9
+320,12
@@
xbt_dict_t SIMIX_storage_get_properties(smx_storage_t storage){
return surf_storage_model->extension.storage.get_properties(storage);
}
return surf_storage_model->extension.storage.get_properties(storage);
}
+const char* SIMIX_pre_storage_get_name(smx_simcall_t simcall, smx_storage_t storage){
+ return SIMIX_storage_get_name(storage);
+}
+
const char* SIMIX_storage_get_name(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters");
const char* SIMIX_storage_get_name(smx_storage_t storage){
xbt_assert((storage != NULL), "Invalid parameters");
-
return sg_storage_name(storage);
}
return sg_storage_name(storage);
}