Changeset 3850

Timestamp:

08/04/08 14:23:41 (4 months ago)

Author:

schveiguy

Message:

Updated to inherit from Conduit, now that Conduit is decoupled from ISelectable.

Files:

• trunk/tango/io/ThreadConduit.d (modified) (8 diffs)

trunk/tango/io/ThreadConduit.d

@@ -13 +13 @@
-private import tango.core.Exception;
-
-model.I
+
-
-/**
@@ -36 +36 @@
- * t.join();
- */
-I
+
-{
-    private bool _closed;
@@ -60 +60 @@
-
-    /**
-     * Implements IConduit.input (covariant)
-     */
-    ThreadConduit input()
-    {
-        return this;
-    }
-
-    /**
-     * Implements IConduit.output (covariant)
-     */
-    ThreadConduit output()
-    {
-        return this;
-    }
-
-    /**
-     * Implements IConduit.bufferSize
-     *
@@ -91 +75 @@
-     * Implements IConduit.toString
-     *
-<thread conduit>
+&lt;thread conduit&gt;
-     */
-    char[] toString()
@@ -102 +86 @@
-     * closed.
-     */
-
+override 
-    {
-        synchronized(_mutex)
@@ -152 +136 @@
-            _condition.notifyAll();
-        }
-    }
-
-    /**
-     * Throw an IOException with the given message.
-     */
-    void error(char[] msg)
-    {
-        throw new IOException(msg);
-    }
-
-    /**
-     * Implements InputStream.conduit and OutputStream.conduit (covariant)
-     */
-    ThreadConduit conduit()
-    {
-        return this;
-    }
-
-    /**
-     * Close the write end of the conduit.  Same as detach()
-     */
-    void close()
-    {
-        detach();
-    }
-
@@ -230 +190 @@
-            return result;
-        }
-    }
-
-    /**
-     * Implements InputStream.load
-     *
-     * Load the bits from a stream, and return them all in an array. The dst
-     * array can be provided as an option, which will be expanded as necessary
-     * to consume the input.
-     *
-     * Returns an array representing the content, and throws IOException on
-     * error
-     */
-    void[] load(void[] dst = null)
-    {
-        //
-        // copied from Conduit.load
-        //
-        auto chunk = 0;
-        auto index = 0;
-
-        while (chunk != Eof)
-        {
-            if (dst.length - index < 1024)
-                dst.length = dst.length + 16 * 1024;
-
-            chunk = read (dst[index .. $]);
-            index += chunk;
-        } 
-
-        return dst [0 .. index - chunk];
-    }
-
@@ -325 +255 @@
-        }
-    }
-
-    /**
-     * Implements OutputStream.copy
-     *
-     * Transfer the content of another stream to this one. Returns a reference
-     * to this class, and throws IOException on failure.
-     */
-    ThreadConduit copy(InputStream src)
-    {
-        //
-        // copied from Conduit
-        //
-        uint len = 0;
-        auto tmp = new void [bufferSize];
-        while ((len = src.read(tmp)) != IConduit.Eof)
-        {
-            auto p = tmp.ptr;
-            for (uint j; len > 0; len -= j, p += j)
-                if ((j = write (p[0..len])) is IConduit.Eof)
-                    error ("ThreadConduit.copy :: Eof while writing to: "~toString);
-        }
-        delete tmp;
-        return this;
-    }
-
-    /**
-     * Implements OutputStream.flush
-     *
-     * Since there is no callable sink, this is a noop.
-     */
-    ThreadConduit flush()
-    {
-        return this;
-    }
-}