Changeset 594 for trunk/kernel/syscalls/shared_include

Timestamp:

Nov 10, 2018, 2:33:26 PM (5 years ago)

Author:

alain

Message:

Fix various bugs in sys_stat() and sys_mmap() functions.
Improve debug in other functions.

Location:

trunk/kernel/syscalls/shared_include

Files:

• shared_mman.h (modified) (1 diff)
• shared_stat.h (modified) (1 diff)

trunk/kernel/syscalls/shared_include/shared_mman.h

@@ -43 +43 @@
     MAP_ANON    = 0x00000001,  /*! map an anonymous vseg in local cluster                 */
     MAP_REMOTE  = 0x00000002,  /*! map an anonymous vseg in remote cluster (cxy == fdid)  */
-    MAP_PRIVATE = 0x00000010,  /*!                                                        */
-    MAP_SHARED  = 0x00000020,  /*!                                                        */
-    MAP_FIXED   = 0x00000100,  /*! non supported                                          */
+    MAP_PRIVATE = 0x00000010,  /*! modifications are private to the calling process       */
+    MAP_SHARED  = 0x00000020,  /*! modifications are shared                               */
+    MAP_FIXED   = 0x00000100,  /*! non supported (user defined base address)              */
 }
 mmap_flags_t;

trunk/kernel/syscalls/shared_include/shared_stat.h

@@ -32 +32 @@
 typedef struct stat 
 {
-        unsigned int    dev;        /*! ID of device containing file                             */
-        unsigned int    inum;       /*! inode number                                             */
-        unsigned int    mode;       /*! protection                                               */
-        unsigned int    nlink;      /*! number of hard links                                     */
-        unsigned int    uid;        /*! user ID of owner                                         */
-        unsigned int    gid;        /*! group ID of owner                                        */
-        unsigned int    rdev;       /*! device ID (if special file)                              */
-        unsigned int    size;       /*! total size, in bytes                                     */
-        unsigned int    blksize;    /*! blocksize for file system I/O                            */
-        unsigned int    blocks;     /*! number of 512B blocks allocated                          */
+        unsigned int    st_dev;     /*! ID of device containing file                         */
+        unsigned int    st_ino;     /*! inode number                                         */
+        unsigned int    st_mode;    /*! bit vector defined below                             */
+        unsigned int    st_nlink;   /*! number of hard links                                 */
+        unsigned int    st_uid;     /*! user ID of owner                                     */
+        unsigned int    st_gid;     /*! group ID of owner                                    */
+        unsigned int    st_rdev;    /*! device ID (if special file)                          */
+        unsigned int    st_size;    /*! total size, in bytes                                 */
+        unsigned int    st_blksize; /*! blocksize for file system I/O                        */
+        unsigned int    st_blocks;  /*! number of allocated blocks                           */
 }
 stat_t;
 
+/******************************************************************************************
+ * The st_mode field contains informations on both access rights and file types.
+ * - access rights (defined by the inode <rights> field) are stored in st_mode[15:0]
+ * - file types (defined by the inode <type> field) are stored in st_mode[19:16]
+ * The following macros can be used to extract file type information.
+ *
+ * WARNING : these macros must be kept consistent with inode types in <vfs.h> file.
+ *****************************************************************************************/
+
+#define  S_ISREG(x)   ((((x)>>16) & 0xF) == 0)    /*! it is a regular file               */
+#define  S_ISDIR(x)   ((((x)>>16) & 0xF) == 1)    /*! it is a directory                  */
+#define  S_ISFIFO(x)  ((((x)>>16) & 0xF) == 2)    /*! it is a named pipe                 */
+#define  S_ISPIPE(x)  ((((x)>>16) & 0xF) == 3)    /*! it is an anonymous pipe            */
+#define  S_ISSOCK(x)  ((((x)>>16) & 0xF) == 4)    /*! it is a socket                     */
+#define  S_ISCHR(x)   ((((x)>>16) & 0xF) == 5)    /*! it is a character device           */
+#define  S_ISLNK(x)   ((((x)>>16) & 0xF) == 6)    /*! it is a symbolic link              */
+
 #endif /* _STAT_H_ */