simplify way files are handled by MSG

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 5853a9c..df2c744 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -60,14 +60,9 @@ typedef msg_host_t msg_vm_t;
 
 /* ******************************** File ************************************ */
 
 
 /* ******************************** File ************************************ */
 

-/** @brief Opaque object describing a File in MSG.
- *  @ingroup msg_file */
-typedef xbt_dictelm_t msg_file_t;
+typedef struct simdata_file* simdata_file_t;

 
 

-extern int MSG_FILE_LEVEL;
-typedef struct simdata_file *simdata_file_t;
-
-struct msg_file_priv  {
+typedef struct msg_file_priv {

   char *fullpath;
   sg_size_t size;
   char* mount_point;
   char *fullpath;
   sg_size_t size;
   char* mount_point;


@@ -77,14 +72,9 @@ struct msg_file_priv  {
   int desc_id;
   void *data;
   simdata_file_t simdata;
   int desc_id;
   void *data;
   simdata_file_t simdata;

-};
+} s_msg_file_priv_t;

 
 

-typedef struct msg_file_priv s_msg_file_priv_t;
-typedef struct msg_file_priv* msg_file_priv_t;
-
-static inline msg_file_priv_t MSG_file_priv(msg_file_t file){
-  return (msg_file_priv_t )xbt_lib_get_level(file, MSG_FILE_LEVEL);
-}
+typedef struct msg_file_priv* msg_file_t;

 
 /* ******************************** Storage ************************************ */
 /* TODO: PV: to comment */
 
 /* ******************************** Storage ************************************ */
 /* TODO: PV: to comment */


@@ -208,7 +198,6 @@ XBT_PUBLIC(msg_error_t) MSG_file_unlink(msg_file_t fd);
 XBT_PUBLIC(msg_error_t) MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin);
 XBT_PUBLIC(sg_size_t) MSG_file_tell (msg_file_t fd);
 XBT_PUBLIC(void) __MSG_file_get_info(msg_file_t fd);
 XBT_PUBLIC(msg_error_t) MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin);
 XBT_PUBLIC(sg_size_t) MSG_file_tell (msg_file_t fd);
 XBT_PUBLIC(void) __MSG_file_get_info(msg_file_t fd);

-XBT_PUBLIC(void) __MSG_file_priv_free(msg_file_priv_t priv);

 XBT_PUBLIC(const char *) MSG_file_get_name(msg_file_t file);
 XBT_PUBLIC(msg_error_t) MSG_file_move(msg_file_t fd, const char* fullpath);
 XBT_PUBLIC(msg_error_t) MSG_file_rcopy(msg_file_t fd, msg_host_t host, const char* fullpath);
 XBT_PUBLIC(const char *) MSG_file_get_name(msg_file_t file);
 XBT_PUBLIC(msg_error_t) MSG_file_move(msg_file_t fd, const char* fullpath);
 XBT_PUBLIC(msg_error_t) MSG_file_rcopy(msg_file_t fd, msg_host_t host, const char* fullpath);

diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h
index abe93e0..ce7ec7a 100644 (file)
--- a/include/surf/surf_routing.h
+++ b/include/surf/surf_routing.h
@@ -18,7 +18,6 @@ XBT_PUBLIC_DATA(int) SIMIX_STORAGE_LEVEL; //Simix storage level
 XBT_PUBLIC_DATA(xbt_lib_t) storage_lib;
 XBT_PUBLIC_DATA(int) ROUTING_STORAGE_LEVEL;        //Routing storage level
 XBT_PUBLIC_DATA(int) SURF_STORAGE_LEVEL;  // Surf storage level
 XBT_PUBLIC_DATA(xbt_lib_t) storage_lib;
 XBT_PUBLIC_DATA(int) ROUTING_STORAGE_LEVEL;        //Routing storage level
 XBT_PUBLIC_DATA(int) SURF_STORAGE_LEVEL;  // Surf storage level

-XBT_PUBLIC_DATA(xbt_lib_t) file_lib;

 XBT_PUBLIC_DATA(xbt_lib_t) storage_type_lib;
 XBT_PUBLIC_DATA(int) ROUTING_STORAGE_TYPE_LEVEL;   //Routing storage_type level
 
 XBT_PUBLIC_DATA(xbt_lib_t) storage_type_lib;
 XBT_PUBLIC_DATA(int) ROUTING_STORAGE_TYPE_LEVEL;   //Routing storage_type level
 

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 3b0e79a..bec6a7b 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -66,7 +66,6 @@ void MSG_init_nocheck(int *argc, char **argv) {
 
   XBT_DEBUG("ADD MSG LEVELS");
   MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy);
 
   XBT_DEBUG("ADD MSG LEVELS");
   MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy);

-  MSG_FILE_LEVEL = xbt_lib_add_level(file_lib, (void_f_pvoid_t) __MSG_file_destroy);

   if(xbt_cfg_get_boolean("clean-atexit"))
     atexit(MSG_exit);
 }
   if(xbt_cfg_get_boolean("clean-atexit"))
     atexit(MSG_exit);
 }

diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp
index 0503108..cfd487c 100644 (file)
--- a/src/msg/msg_io.cpp
+++ b/src/msg/msg_io.cpp
@@ -21,16 +21,15 @@ SG_BEGIN_DECL()
 /********************************* File **************************************/
 void __MSG_file_get_info(msg_file_t fd){
 
 /********************************* File **************************************/
 void __MSG_file_get_info(msg_file_t fd){
 

-  msg_file_priv_t priv = MSG_file_priv(fd);
-  xbt_dynar_t info = simcall_file_get_info(priv->simdata->smx_file);
+  xbt_dynar_t info = simcall_file_get_info(fd->simdata->smx_file);

   sg_size_t *psize;
 
   sg_size_t *psize;
 

-  priv->content_type = xbt_dynar_pop_as(info, char *);
-  priv->storage_type = xbt_dynar_pop_as(info, char *);
-  priv->storageId = xbt_dynar_pop_as(info, char *);
-  priv->mount_point = xbt_dynar_pop_as(info, char *);
-  psize = xbt_dynar_pop_as(info, sg_size_t*);
-  priv->size = *psize;
+  fd->content_type = xbt_dynar_pop_as(info, char*);
+  fd->storage_type = xbt_dynar_pop_as(info, char*);
+  fd->storageId    = xbt_dynar_pop_as(info, char*);
+  fd->mount_point  = xbt_dynar_pop_as(info, char*);
+  psize            = xbt_dynar_pop_as(info, sg_size_t*);
+  fd->size         = *psize;

   xbt_free(psize);
   xbt_dynar_free_container(&info);
 }
   xbt_free(psize);
   xbt_dynar_free_container(&info);
 }


@@ -61,8 +60,7 @@ static void MSG_host_release_file_descriptor_id(msg_host_t host, int id)
  */
 msg_error_t MSG_file_set_data(msg_file_t fd, void *data)
 {
  */
 msg_error_t MSG_file_set_data(msg_file_t fd, void *data)
 {

-  msg_file_priv_t priv = MSG_file_priv(fd);
-  priv->data = data;
+  fd->data = data;

   return MSG_OK;
 }
 
   return MSG_OK;
 }
 


@@ -74,8 +72,7 @@ msg_error_t MSG_file_set_data(msg_file_t fd, void *data)
  */
 void *MSG_file_get_data(msg_file_t fd)
 {
  */
 void *MSG_file_get_data(msg_file_t fd)
 {

-  msg_file_priv_t priv = MSG_file_priv(fd);
-  return priv->data;
+  return fd->data;

 }
 
 /** \ingroup msg_file
 }
 
 /** \ingroup msg_file


@@ -87,7 +84,6 @@ void MSG_file_dump (msg_file_t fd){
   /* Update the cached information first */
   __MSG_file_get_info(fd);
 
   /* Update the cached information first */
   __MSG_file_get_info(fd);
 

-  msg_file_priv_t priv = MSG_file_priv(fd);

   XBT_INFO("File Descriptor information:\n"
            "\t\tFull path: '%s'\n"
            "\t\tSize: %llu\n"
   XBT_INFO("File Descriptor information:\n"
            "\t\tFull path: '%s'\n"
            "\t\tSize: %llu\n"


@@ -96,9 +92,7 @@ void MSG_file_dump (msg_file_t fd){
            "\t\tStorage Type: '%s'\n"
            "\t\tContent Type: '%s'\n"
            "\t\tFile Descriptor Id: %d",
            "\t\tStorage Type: '%s'\n"
            "\t\tContent Type: '%s'\n"
            "\t\tFile Descriptor Id: %d",

-           priv->fullpath, priv->size, priv->mount_point,
-           priv->storageId, priv->storage_type,
-           priv->content_type, priv->desc_id);
+           fd->fullpath, fd->size, fd->mount_point, fd->storageId, fd->storage_type, fd->content_type, fd->desc_id);

 }
 
 /** \ingroup msg_file
 }
 
 /** \ingroup msg_file


@@ -110,17 +104,16 @@ void MSG_file_dump (msg_file_t fd){
  */
 sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size)
 {
  */
 sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size)
 {

-  msg_file_priv_t file_priv = MSG_file_priv(fd);

   sg_size_t read_size;
 
   sg_size_t read_size;
 

-  if (file_priv->size == 0) /* Nothing to read, return */
+  if (fd->size == 0) /* Nothing to read, return */

     return 0;
 
   /* Find the host where the file is physically located and read it */
     return 0;
 
   /* Find the host where the file is physically located and read it */

-  msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId));
+  msg_storage_t storage_src           = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, fd->storageId));

   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);

-  msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
-  read_size = simcall_file_read(file_priv->simdata->smx_file, size, attached_host);
+  msg_host_t attached_host            = MSG_host_by_name(storage_priv_src->hostname);
+  read_size                           = simcall_file_read(fd->simdata->smx_file, size, attached_host);

 
   if (strcmp(storage_priv_src->hostname, MSG_host_self()->cname())) {
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
 
   if (strcmp(storage_priv_src->hostname, MSG_host_self()->cname())) {
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */


@@ -159,15 +152,13 @@ sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size)
  */
 sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
 {
  */
 sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
 {

-  msg_file_priv_t file_priv = MSG_file_priv(fd);
-

   if (size == 0) /* Nothing to write, return */
     return 0;
 
   /* Find the host where the file is physically located (remote or local)*/
   if (size == 0) /* Nothing to write, return */
     return 0;
 
   /* Find the host where the file is physically located (remote or local)*/

-  msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId));
+  msg_storage_t storage_src           = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, fd->storageId));

   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);

-  msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
+  msg_host_t attached_host            = MSG_host_by_name(storage_priv_src->hostname);

 
   if (strcmp(storage_priv_src->hostname, MSG_host_self()->cname())) {
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
 
   if (strcmp(storage_priv_src->hostname, MSG_host_self()->cname())) {
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */


@@ -195,9 +186,9 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
     }
   }
   /* Write file on local or remote host */
     }
   }
   /* Write file on local or remote host */

-  sg_size_t offset = simcall_file_tell(file_priv->simdata->smx_file);
-  sg_size_t write_size = simcall_file_write(file_priv->simdata->smx_file, size, attached_host);
-  file_priv->size = offset+write_size;
+  sg_size_t offset     = simcall_file_tell(fd->simdata->smx_file);
+  sg_size_t write_size = simcall_file_write(fd->simdata->smx_file, size, attached_host);
+  fd->size             = offset + write_size;

 
   return write_size;
 }
 
   return write_size;
 }


@@ -212,20 +203,14 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
  */
 msg_file_t MSG_file_open(const char* fullpath, void* data)
 {
  */
 msg_file_t MSG_file_open(const char* fullpath, void* data)
 {

-  char *name;
-  msg_file_priv_t priv = xbt_new(s_msg_file_priv_t, 1);
-  priv->data = data;
-  priv->fullpath = xbt_strdup(fullpath);
-  priv->simdata = xbt_new0(s_simdata_file_t,1);
-  priv->simdata->smx_file = simcall_file_open(fullpath, MSG_host_self());
-  priv->desc_id           = MSG_host_get_file_descriptor_id(MSG_host_self());
-
-  name = bprintf("%s:%s:%d", priv->fullpath, MSG_host_self()->cname(), priv->desc_id);
+  msg_file_t fd         = xbt_new(s_msg_file_priv_t, 1);
+  fd->data              = data;
+  fd->fullpath          = xbt_strdup(fullpath);
+  fd->simdata           = xbt_new0(s_simdata_file_t, 1);
+  fd->simdata->smx_file = simcall_file_open(fullpath, MSG_host_self());
+  fd->desc_id           = MSG_host_get_file_descriptor_id(MSG_host_self());

 
 

-  xbt_lib_set(file_lib, name, MSG_FILE_LEVEL, priv);
-  msg_file_t fd = static_cast<msg_file_t>(xbt_lib_get_elm_or_null(file_lib, name));

   __MSG_file_get_info(fd);
   __MSG_file_get_info(fd);

-  xbt_free(name);

 
   return fd;
 }
 
   return fd;
 }


@@ -238,16 +223,13 @@ msg_file_t MSG_file_open(const char* fullpath, void* data)
  */
 int MSG_file_close(msg_file_t fd)
 {
  */
 int MSG_file_close(msg_file_t fd)
 {

-  char *name;
-  msg_file_priv_t priv = MSG_file_priv(fd);
-  if (priv->data)
-    xbt_free(priv->data);
-
-  int res = simcall_file_close(priv->simdata->smx_file, MSG_host_self());
-  name    = bprintf("%s:%s:%d", priv->fullpath, MSG_host_self()->cname(), priv->desc_id);
-  MSG_host_release_file_descriptor_id(MSG_host_self(), priv->desc_id);
-  xbt_lib_unset(file_lib, name, MSG_FILE_LEVEL, 1);
-  xbt_free(name);
+  if (fd->data)
+    xbt_free(fd->data);
+
+  int res = simcall_file_close(fd->simdata->smx_file, MSG_host_self());
+  MSG_host_release_file_descriptor_id(MSG_host_self(), fd->desc_id);
+  __MSG_file_destroy(fd);
+

   return res;
 }
 
   return res;
 }
 


@@ -259,12 +241,12 @@ int MSG_file_close(msg_file_t fd)
  */
 msg_error_t MSG_file_unlink(msg_file_t fd)
 {
  */
 msg_error_t MSG_file_unlink(msg_file_t fd)
 {

-  msg_file_priv_t file_priv = MSG_file_priv(fd);

   /* Find the host where the file is physically located (remote or local)*/
   /* Find the host where the file is physically located (remote or local)*/

-  msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId));
+  msg_storage_t storage_src           = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, fd->storageId));

   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);

-  msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
-  int res = simcall_file_unlink(file_priv->simdata->smx_file, attached_host);
+  msg_host_t attached_host            = MSG_host_by_name(storage_priv_src->hostname);
+  int res                             = simcall_file_unlink(fd->simdata->smx_file, attached_host);
+  __MSG_file_destroy(fd);

   return static_cast<msg_error_t>(res);
 }
 
   return static_cast<msg_error_t>(res);
 }
 


@@ -275,8 +257,7 @@ msg_error_t MSG_file_unlink(msg_file_t fd)
  * \return the size of the file (as a #sg_size_t)
  */
 sg_size_t MSG_file_get_size(msg_file_t fd){
  * \return the size of the file (as a #sg_size_t)
  */
 sg_size_t MSG_file_get_size(msg_file_t fd){

-  msg_file_priv_t priv = MSG_file_priv(fd);
-  return simcall_file_get_size(priv->simdata->smx_file);
+  return simcall_file_get_size(fd->simdata->smx_file);

 }
 
 /**
 }
 
 /**


@@ -293,8 +274,7 @@ sg_size_t MSG_file_get_size(msg_file_t fd){
  */
 msg_error_t MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin)
 {
  */
 msg_error_t MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin)
 {

-  msg_file_priv_t priv = MSG_file_priv(fd);
-  return static_cast<msg_error_t>(simcall_file_seek(priv->simdata->smx_file, offset, origin));
+  return static_cast<msg_error_t>(simcall_file_seek(fd->simdata->smx_file, offset, origin));

 }
 
 /**
 }
 
 /**


@@ -307,14 +287,12 @@ msg_error_t MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin)
  */
 sg_size_t MSG_file_tell(msg_file_t fd)
 {
  */
 sg_size_t MSG_file_tell(msg_file_t fd)
 {

-  msg_file_priv_t priv = MSG_file_priv(fd);
-  return simcall_file_tell(priv->simdata->smx_file);
+  return simcall_file_tell(fd->simdata->smx_file);

 }
 
 const char *MSG_file_get_name(msg_file_t fd) {
   xbt_assert((fd != nullptr), "Invalid parameters");
 }
 
 const char *MSG_file_get_name(msg_file_t fd) {
   xbt_assert((fd != nullptr), "Invalid parameters");

-  msg_file_priv_t priv = MSG_file_priv(fd);
-  return priv->fullpath;
+  return fd->fullpath;

 }
 
 /**
 }
 
 /**


@@ -324,8 +302,7 @@ const char *MSG_file_get_name(msg_file_t fd) {
  */
 msg_error_t MSG_file_move (msg_file_t fd, const char* fullpath)
 {
  */
 msg_error_t MSG_file_move (msg_file_t fd, const char* fullpath)
 {

-  msg_file_priv_t priv = MSG_file_priv(fd);
-  return static_cast<msg_error_t>(simcall_file_move(priv->simdata->smx_file, fullpath));
+  return static_cast<msg_error_t>(simcall_file_move(fd->simdata->smx_file, fullpath));

 }
 
 /**
 }
 
 /**


@@ -338,18 +315,15 @@ msg_error_t MSG_file_move (msg_file_t fd, const char* fullpath)
  */
 msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpath)
 {
  */
 msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpath)
 {

-  msg_file_priv_t file_priv = MSG_file_priv(file);
-  sg_size_t read_size;
-

   /* Find the host where the file is physically located and read it */
   /* Find the host where the file is physically located and read it */

-  msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId));
+  msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, file->storageId));

   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
   msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
   MSG_file_seek(file, 0, SEEK_SET);
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
   msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
   MSG_file_seek(file, 0, SEEK_SET);

-  read_size = simcall_file_read(file_priv->simdata->smx_file, file_priv->size, attached_host);
+  sg_size_t read_size = simcall_file_read(file->simdata->smx_file, file->size, attached_host);

 
   /* Find the real host destination where the file will be physically stored */
 
   /* Find the real host destination where the file will be physically stored */

-  xbt_dict_cursor_t cursor = nullptr;
+  xbt_dict_cursor_t cursor   = nullptr;

   msg_storage_t storage_dest = nullptr;
   msg_host_t host_dest;
   size_t longest_prefix_length = 0;
   msg_storage_t storage_dest = nullptr;
   msg_host_t host_dest;
   size_t longest_prefix_length = 0;


@@ -431,7 +405,8 @@ msg_error_t MSG_file_rmove (msg_file_t file, msg_host_t host, const char* fullpa
 /**
  * \brief Destroys a file (internal call only)
  */
 /**
  * \brief Destroys a file (internal call only)
  */

-void __MSG_file_destroy(msg_file_priv_t file) {
+void __MSG_file_destroy(msg_file_t file)
+{

   xbt_free(file->fullpath);
   xbt_free(file->simdata);
   xbt_free(file);
   xbt_free(file->fullpath);
   xbt_free(file->simdata);
   xbt_free(file);

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index d921f5f..1e39918 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -107,7 +107,7 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
 XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
 XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
 XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host);
 XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
 XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
 XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host);

-XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host);
+XBT_PRIVATE void __MSG_file_destroy(msg_file_t file);

 
 XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc);
 XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data,
 
 XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc);
 XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data,

diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp
index 0dd5095..73f4d1b 100644 (file)
--- a/src/simix/smx_io.cpp
+++ b/src/simix/smx_io.cpp
@@ -20,7 +20,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)");
 

-

 /**
  * \brief Internal function to create a SIMIX storage.
  * \param name name of the storage to create
 /**
  * \brief Internal function to create a SIMIX storage.
  * \param name name of the storage to create

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 70cb9d7..48e4640 100644 (file)
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -14,9 +14,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
 

-xbt_lib_t file_lib;
-int MSG_FILE_LEVEL = -1; // Msg file level
-

 xbt_lib_t storage_lib;
 int SIMIX_STORAGE_LEVEL        = -1; // Simix storage level
 int MSG_STORAGE_LEVEL          = -1; // Msg storage level
 xbt_lib_t storage_lib;
 int SIMIX_STORAGE_LEVEL        = -1; // Simix storage level
 int MSG_STORAGE_LEVEL          = -1; // Msg storage level

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 39119c5..a77bc13 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -353,7 +353,6 @@ void surf_init(int *argc, char **argv)
 
   storage_lib = xbt_lib_new();
   storage_type_lib = xbt_lib_new();
 
   storage_lib = xbt_lib_new();
   storage_type_lib = xbt_lib_new();

-  file_lib = xbt_lib_new();

   watched_hosts_lib = xbt_dict_new_homogeneous(nullptr);
 
   XBT_DEBUG("Add SURF levels");
   watched_hosts_lib = xbt_dict_new_homogeneous(nullptr);
 
   XBT_DEBUG("Add SURF levels");


@@ -382,7 +381,6 @@ void surf_exit()
   xbt_lib_free(&storage_lib);
   sg_link_exit();
   xbt_lib_free(&storage_type_lib);
   xbt_lib_free(&storage_lib);
   sg_link_exit();
   xbt_lib_free(&storage_type_lib);

-  xbt_lib_free(&file_lib);

   xbt_dict_free(&watched_hosts_lib);
 
   for (auto model : *all_existing_models)
   xbt_dict_free(&watched_hosts_lib);
 
   for (auto model : *all_existing_models)