Changeset 2048 for trunk/src/emx/include

Timestamp:

Jun 19, 2005, 6:10:41 AM (20 years ago)

Author:

bird

Message:

o File resize optimization: The JFS, HPFS and probably NET

will never return space which isn't zeroed when expanding
a file. Associate a file system information object with the
filehandles to keep track of such features. This also fixes
the fsStatFH() implementation trouble.
This attribute doesn't apply to CDFS. While RAMFS fails
the test, it zeros at open but not at setfilesize.

o Fixed invalid inode and dev numbers for new files, was passing

the wrong path around.

Location:

trunk/src/emx/include

Files:

• 386/builtin.h (modified) (4 diffs, 1 prop)
• InnoTekLIBC/sharedpm.h (modified) (2 diffs, 1 prop)
• emx/io.h (modified) (2 diffs, 1 prop)

trunk/src/emx/include/386/builtin.h

@@ -148 +148 @@
 }
 
-
 /**
  * Atomically increments a 32-bit unsigned value.
@@ -164 +163 @@
  * Atomically increments a 32-bit unsigned value.
  *
+ * @returns The new value.
  * @param   pu32    Pointer to the value to increment.
  */
-static __inline__ void __atomic_increment_u32(uint32_t __volatile__ *pu32)
-{
-    __asm__ __volatile__("lock; incl %0"
-                         : "=m" (*pu32)
-                         : "m"  (*pu32));
+static __inline__ uint32_t __atomic_increment_u32(uint32_t __volatile__ *pu32)
+{
+    uint32_t u32;
+    __asm__ __volatile__("lock; xadd %0, %1\n\t"
+                         "incl %0\n\t"
+                         : "=r" (u32),
+                           "=m" (*pu32)
+                         : "0" (1)
+                         : "memory");
+    return u32;
+}
+
+/**
+ * Atomically increments a 32-bit signed value.
+ *
+ * @returns The new value.
+ * @param   pi32    Pointer to the value to increment.
+ */
+static __inline__ uint32_t __atomic_increment_s32(int32_t __volatile__ *pi32)
+{
+    int32_t i32;
+    __asm__ __volatile__("lock; xadd %0, %1\n\t"
+                         "incl %0\n\t"
+                         : "=r" (i32),
+                           "=m" (*pi32)
+                         : "0" (1)
+                         : "memory");
+    return i32;
 }
 
@@ -200 +223 @@
  * Atomically decrements a 32-bit unsigned value.
  *
- * @param   pu      Pointer to the value to decrement.
- */
-static __inline__ void __atomic_decrement_u32(__volatile__ uint32_t *pu32)
-{
-    __asm__ __volatile__("lock; decl %0"
-                         : "=m" (*pu32)
-                         : "m"  (*pu32));
+ * @returns The new value.
+ * @param   pu32      Pointer to the value to decrement.
+ */
+static __inline__ uint32_t __atomic_decrement_u32(__volatile__ uint32_t *pu32)
+{
+    uint32_t u32;
+    __asm__ __volatile__("lock; xadd %0, %1\n\t"
+                         "decl %0\n\t"
+                         : "=r" (u32),
+                           "=m" (*pu32)
+                         : "0" (-1)
+                         : "memory");
+    return u32;
+}
+
+/**
+ * Atomically decrements a 32-bit signed value.
+ *
+ * @returns The new value.
+ * @param   pi32    Pointer to the value to decrement.
+ */
+static __inline__ uint32_t __atomic_decrement_s32(__volatile__ int32_t *pi32)
+{
+    int32_t i32;
+    __asm__ __volatile__("lock; xadd %0, %1\n\t"
+                         "decl %0\n\t"
+                         : "=r" (i32),
+                           "=m" (*pi32)
+                         : "0" (-1)
+                         : "memory");
+    return i32;
 }
 
@@ -212 +259 @@
  * Atomically decrements a 16-bit unsigned value.
  *
+ * @returns The new value.
  * @param   pu16    Pointer to the value to decrement.
  */

trunk/src/emx/include/InnoTekLIBC/sharedpm.h

@@ -163 +163 @@
 #define __LIBC_SPM_INH_FHB_TYPE_END         (0)
 /** Standard bundle. */
-#define __LIBC_SPM_INH_FHB_TYPE_STANDARD    (0x10 | sizeof(unsigned))
+#define __LIBC_SPM_INH_FHB_TYPE_STANDARD    (0x10 | (sizeof(unsigned) + sizeof(ino_t) + sizeof(dev_t)))
+/** The old standard bundle. */
+#define __LIBC_SPM_INH_FHB_TYPE_STANDARD_OLD (0x10 | sizeof(unsigned))
 /** Socket bundle, using the BSD 4.4 backend. */
 #define __LIBC_SPM_INH_FHB_TYPE_SOCKET_44   (0x20 | (sizeof(unsigned) + sizeof(unsigned short)))
@@ -199 +201 @@
     /** The common bundle header. */
     __LIBC_SPMINHFHBHDR Hdr;
-    /** Array of flags of Hdr.cHandles entries. */
-    unsigned            afFlags[1];
+    /** Array Hdr.cHandles entries. */
+    struct
+    {
+        /** The flags */
+        unsigned            fFlags;
+        /** The inode number. */
+        ino_t               Inode;
+        /** The device number. */
+        dev_t               Dev;
+    } aHandles[1];
 } __LIBC_SPMINHFHBSTD;
 #pragma pack()
 /** Pointer to SPM standard filehandle inherit bundle. */
 typedef __LIBC_SPMINHFHBSTD *__LIBC_PSPMINHFHBSTD;
+
+/**
+ * SPM standard filehandle inherit bundle
+ * This is used for OS/2 filehandles which only needs flags
+ * transfered.
+ */
+#pragma pack(1)
+typedef struct __libc_SPMInhFHOld
+{
+    /** The common bundle header. */
+    __LIBC_SPMINHFHBHDR Hdr;
+    /** Array of flags of Hdr.cHandles entries. */
+    unsigned            afFlags[1];
+} __LIBC_SPMINHFHBSTDOLD;
+#pragma pack()
+/** Pointer to SPM standard filehandle inherit bundle. */
+typedef __LIBC_SPMINHFHBSTDOLD *__LIBC_PSPMINHFHBSTDOLD;
 
 /**

trunk/src/emx/include/emx/io.h

@@ -225 +225 @@
 
 /**
+ * Information struct about a mounted file system.
+ *
+ * Used to track down the filesystem of an open file handle and
+ * so we can optimize certain operations like expanding a file.
+ */
+typedef struct __libc_FileSystemInfo
+{
+    /** Number of references to this file system info object.
+     * The structure can be shared by many handles. */
+    volatile int32_t    cRefs;
+    /** Does the file system automatically zero the new space when a file is extended? */
+    unsigned            fZeroNewBytes : 1;
+    /** Device number of the device the filesystem resides on.
+     * On OS/2 the device number is derived from the driveletter. */
+    dev_t               Dev;
+    /** The filesystem driver name. */
+    char                szName[16];
+    /** The mount point - may extend beyond the 4 bytes on some OSes. */
+    char                szMountpoint[4];
+} __LIBC_FSINFO;
+/** Pointer to information about an open filesystem. */
+typedef __LIBC_FSINFO *__LIBC_PFSINFO;
+
+
+/**
  * Filehandle type.
  */
@@ -381 +406 @@
      * determin this at handle creation time. */
     ino_t                   Inode;
+    /** Pointer to the filesystem information object for the filesystem which
+     * this file resides on. This might be NULL... */
+    __LIBC_PFSINFO          pFsInfo;
 } __LIBC_FH;
 /** Pointer to filehandle. */