Changeset 2505

Timestamp:

08/26/07 15:18:55 (1 year ago)

Author:

kris

Message:

Shuffled things around to resolve the flush() issue when closing a file. Tango has both a soft and hard flush, where the former is flush() and the latter is commit(). The change means that files are hard-committed when closed cleanly, which is expected. However, there may be a second invocation of the equivalent hard-commit within the OS itself when the file is actually closed. At this time we're asserting that won't be a performance hit.

The upshot is that you can force a hard flush of a FileConduit? (all the way to the disk) via a commit(). A flush() just ensures any internal buffering is emptied. FileConduit?.commit() checks itself for write access.

Files:

• trunk/tango/io/Conduit.d (modified) (2 diffs)
• trunk/tango/io/Console.d (modified) (1 diff)
• trunk/tango/io/DeviceConduit.d (modified) (1 diff)
• trunk/tango/io/FileConduit.d (modified) (2 diffs)
• trunk/tango/io/model/IConduit.d (modified) (1 diff)
• trunk/tango/net/cluster/tina/QueueFile.d (modified) (1 diff)

trunk/tango/io/Conduit.d

@@ -149 +149 @@
-        ***********************************************************************/
-
-final 
+
-
-        /***********************************************************************
@@ -156 +156 @@
-                
-                Remarks:
-, and disconnects the
-conduit.
+ before disconnecting
+the conduit
-
-        ***********************************************************************/

trunk/tango/io/Console.d

@@ -353 +353 @@
-                /***************************************************************
-
-                        Intercept the default file-flushing implementation.
-                        We don't actually flush the console device per se, as
-                        the OS does not really like that. Flush any enclosing
-                        buffer instead.
-
-                ***************************************************************/
-
-                override void flush () {}
-
-                /***************************************************************
-
-                        Windows-specific code
-

trunk/tango/io/DeviceConduit.d

@@ -106 +106 @@
-                                  error ();
-                        handle = cast(HANDLE) null;
-                }
-
-                /***************************************************************
-
-                ***************************************************************/
-
-                override void flush ()
-                {
-                        if (! FlushFileBuffers (handle))
-                              error ();
-                        return this;
-                }
-

trunk/tango/io/FileConduit.d

@@ -434 +434 @@
-                /***************************************************************
-
+                        Ensures that data is flushed immediately to disk
+
+                ***************************************************************/
+
+                override void commit ()
+                {
+                        if (style_.access & Access.Write)
+                            if (! FlushFileBuffers (handle))
+                                  error ();
+                }
+
+                /***************************************************************
+
-                        Set the file size to be that of the current seek 
-                        position. The file must be writable for this to
@@ -520 +533 @@
-                        if (handle is -1)
-                            error ();
+                }
+
+                /***************************************************************
+
+                        Ensures that data is flushed immediately to disk
+
+                ***************************************************************/
+
+                override void commit ()
+                {
+                        // no Posix API for this :(
-                }
-

trunk/tango/io/model/IConduit.d

@@ -105 +105 @@
-                
-                Remarks:
-, and disconnects the
-conduit.
+ before disconnecting
+the conduit
-
-        ***********************************************************************/

trunk/tango/net/cluster/tina/QueueFile.d

@@ -183 +183 @@
-        final synchronized void flush ()
-        {
+                conduit.commit;
-                dirty = false;
-                conduit.output.flush;
-        }
-