start to simplify the stack of structures for files. Get rid of stats

and just keep name, size and mount point

diff --git a/include/xbt/file_stat.h b/include/xbt/file_stat.h
deleted file mode 100644 (file)
index 4e323dc..0000000
--- a/include/xbt/file_stat.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * file_stat.h
- *
- *  Created on: 3 avr. 2012
- *      Author: navarro
- */
-
-#ifndef _FILE_STAT_H
-#define _FILE_STAT_H
-
-#include "xbt/sysdep.h"
-
-/** \ingroup msg_file_management
-  \brief Strucure containing information on file like stat on POSIX
- */
-typedef struct file_stat {
-  char *user_rights;
-  char *user;
-  char *group;
-  char *date; /* FIXME: update to time_t or double */
-  char *time; /* FIXME: update to time_t or double */
-  double size;
-} s_file_stat_t, *file_stat_t;
-
-static XBT_INLINE void file_stat_copy(s_file_stat_t *src, s_file_stat_t *dst)
-{
-    dst->date = xbt_strdup(src->date);
-    dst->group = xbt_strdup(src->group);
-    dst->size = src->size;
-    dst->time = xbt_strdup(src->time);
-    dst->user = xbt_strdup(src->user);
-    dst->user_rights = xbt_strdup(src->user_rights);
-}
-
-#endif /* _FILE_STAT_H */

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 257ea0e..c966f22 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -75,10 +75,6 @@ typedef struct s_smx_file {
   surf_file_t surf_file;
 } s_smx_file_t;
 
-typedef struct s_smx_stat {
-  s_file_stat_t surf_stat;
-} s_smx_stat_t;
-
 /*********************************** Time ************************************/
 
 /** @brief Timer datatype */

diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h
index f6145f2..bc02af1 100644 (file)
--- a/src/surf/storage_private.h
+++ b/src/surf/storage_private.h
@@ -20,15 +20,10 @@ typedef struct s_mount {
   char *name;
 } s_mount_t, *mount_t;
 
-typedef struct surf_stat { /* file status structure */
-  s_file_stat_t stat;
-  /* possible additional fields (e.g., popularity, last access time to know whether the file is in cache, ...) */
-} s_surf_stat_t;
-
 typedef struct surf_file {
   char *name;
-  surf_stat_t content;
   const char* storage;
+  double size;
 } s_surf_file_t;
 
 typedef struct storage {