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 d0b77c5..b5667c2 100644 (file)
--- a/src/msg/msg_io.c
+++ b/src/msg/msg_io.c
@@ -248,6 +248,8 @@ const char *MSG_file_get_name(msg_file_t fd) {
  * \brief Destroys a file (internal call only)
  */
 void __MSG_file_destroy(msg_file_priv_t file) {
+  xbt_free(file->fullname);
+  xbt_free(file->simdata);
   xbt_free(file);
 }
 /********************************* Storage **************************************/
@@ -261,7 +263,9 @@ void __MSG_file_destroy(msg_file_priv_t file) {
 msg_storage_t __MSG_storage_create(smx_storage_t storage)
 {
   const char *name = SIMIX_storage_get_name(storage);
+  const char *host = SIMIX_storage_get_host(storage);
   msg_storage_priv_t storage_private = xbt_new0(s_msg_storage_priv_t, 1);
+  storage_private->host = host;
   xbt_lib_set(storage_lib,name,MSG_STORAGE_LEVEL,storage_private);
   return xbt_lib_get_elm_or_null(storage_lib, name);
 }
@@ -348,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) {
-    if(routing_get_network_element_type(key) == MSG_STORAGE_LEVEL) {
+         if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), MSG_STORAGE_LEVEL) != NULL) {
       xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
       xbt_dynar_push(res, &elm);
     }
   }
-
   return res;
 }
 
@@ -365,8 +368,8 @@ xbt_dynar_t MSG_storages_as_dynar(void) {
  */
 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;
 }
 
@@ -379,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)
 {
-  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
@@ -421,3 +426,15 @@ msg_error_t MSG_storage_file_move (msg_file_t fd, msg_host_t dest, char* mount,
   THROW_UNIMPLEMENTED;
   return MSG_OK;
 }
+
+/** \ingroup msg_storage_management
+ *
+ * \brief Returns the host name the storage is attached to
+ *
+ * This functions checks whether a storage is a valid pointer or not and return its name.
+ */
+const char *MSG_storage_get_host(msg_storage_t storage) {
+  xbt_assert((storage != NULL), "Invalid parameters");
+  msg_storage_priv_t priv = MSG_storage_priv(storage);
+  return priv->host;
+}