//\r
// (C) Ximian, Inc. http://www.ximian.com\r
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)\r
-// Copyright 2011 Xamarin Inc.\r
+// Copyright 2011, 2013 Xamarin Inc.\r
//\r
// Permission is hereby granted, free of charge, to any person obtaining\r
// a copy of this software and associated documentation files (the\r
\r
using System.Text;\r
using System.Runtime.InteropServices;\r
-#if NET_4_5
-using System.Threading.Tasks;
+#if NET_4_5\r
+using System.Threading.Tasks;\r
#endif\r
\r
namespace System.IO {\r
private int decode_pos;\r
\r
private bool iflush;\r
- private bool DisposedAlready;\r
private bool preamble_done;\r
\r
#if NET_4_5\r
readonly bool leave_open;\r
- Task async_task;\r
+ IDecoupledTask async_task;\r
#endif\r
\r
public new static readonly StreamWriter Null = new StreamWriter (Stream.Null, Encoding.UTF8Unmarked, 1);\r
\r
protected override void Dispose (bool disposing) \r
{\r
- Exception exc = null;\r
- if (!DisposedAlready && disposing && internalStream != null && !leave_open) {\r
- try {\r
- Flush();\r
- } catch (Exception e) {\r
- exc = e;\r
- }\r
- DisposedAlready = true;\r
- try {\r
+ if (byte_buf == null || !disposing)\r
+ return;\r
+\r
+ try {\r
+ Flush ();\r
+ } finally {\r
+ byte_buf = null;\r
+ internalEncoding = null;\r
+ decode_buf = null;\r
+\r
+ if (!leave_open) {\r
internalStream.Close ();\r
- } catch (Exception e) {\r
- if (exc == null)\r
- exc = e;\r
}\r
- }\r
\r
- internalStream = null;\r
- byte_buf = null;\r
- internalEncoding = null;\r
- decode_buf = null;\r
- if (exc != null)\r
- throw exc;\r
+ internalStream = null;\r
+ }\r
}\r
\r
public override void Flush ()\r
{\r
CheckState ();\r
+ FlushCore ();\r
+ }\r
\r
+ // Keep in sync with FlushCoreAsync\r
+ void FlushCore ()\r
+ {\r
Decode ();\r
if (byte_pos > 0) {\r
FlushBytes ();\r
internalStream.Write (byte_buf, 0, byte_pos);\r
byte_pos = 0;\r
}\r
- \r
+\r
void Decode () \r
{\r
if (byte_pos > 0)\r
decode_pos = 0;\r
}\r
}\r
- \r
- public override void Write (char[] buffer, int index, int count) \r
- {\r
- if (buffer == null)\r
- throw new ArgumentNullException ("buffer");\r
- if (index < 0)\r
- throw new ArgumentOutOfRangeException ("index", "< 0");\r
- if (count < 0)\r
- throw new ArgumentOutOfRangeException ("count", "< 0");\r
- // re-ordered to avoid possible integer overflow\r
- if (index > buffer.Length - count)\r
- throw new ArgumentException ("index + count > buffer.Length");\r
-\r
- CheckState ();\r
\r
- LowLevelWrite (buffer, index, count);\r
- if (iflush)\r
- Flush();\r
- }\r
- \r
void LowLevelWrite (char[] buffer, int index, int count)\r
{\r
while (count > 0) {\r
index += todo;\r
decode_pos += todo;\r
}\r
+ } \r
+\r
+#if NET_4_5\r
+ async Task FlushCoreAsync ()\r
+ {\r
+ await DecodeAsync ().ConfigureAwait (false);\r
+ if (byte_pos > 0) {\r
+ await FlushBytesAsync ().ConfigureAwait (false);\r
+ await internalStream.FlushAsync ().ConfigureAwait (false);\r
+ }\r
+ }\r
+\r
+ async Task FlushBytesAsync ()\r
+ {\r
+ // write the encoding preamble only at the start of the stream\r
+ if (!preamble_done && byte_pos > 0) {\r
+ byte[] preamble = internalEncoding.GetPreamble ();\r
+ if (preamble.Length > 0)\r
+ await internalStream.WriteAsync (preamble, 0, preamble.Length).ConfigureAwait (false);\r
+ preamble_done = true;\r
+ }\r
+\r
+ await internalStream.WriteAsync (byte_buf, 0, byte_pos).ConfigureAwait (false);\r
+ byte_pos = 0;\r
}\r
\r
+ async Task DecodeAsync () \r
+ {\r
+ if (byte_pos > 0)\r
+ await FlushBytesAsync ().ConfigureAwait (false);\r
+ if (decode_pos > 0) {\r
+ int len = internalEncoding.GetBytes (decode_buf, 0, decode_pos, byte_buf, byte_pos);\r
+ byte_pos += len;\r
+ decode_pos = 0;\r
+ }\r
+ } \r
+\r
+ async Task LowLevelWriteAsync (char[] buffer, int index, int count)\r
+ {\r
+ while (count > 0) {\r
+ int todo = decode_buf.Length - decode_pos;\r
+ if (todo == 0) {\r
+ await DecodeAsync ().ConfigureAwait (false);\r
+ todo = decode_buf.Length;\r
+ }\r
+ if (todo > count)\r
+ todo = count;\r
+ Buffer.BlockCopy (buffer, index * 2, decode_buf, decode_pos * 2, todo * 2);\r
+ count -= todo;\r
+ index += todo;\r
+ decode_pos += todo;\r
+ }\r
+ }\r
+ \r
+ async Task LowLevelWriteAsync (string s)\r
+ {\r
+ int count = s.Length;\r
+ int index = 0;\r
+ while (count > 0) {\r
+ int todo = decode_buf.Length - decode_pos;\r
+ if (todo == 0) {\r
+ await DecodeAsync ().ConfigureAwait (false);\r
+ todo = decode_buf.Length;\r
+ }\r
+ if (todo > count)\r
+ todo = count;\r
+ \r
+ for (int i = 0; i < todo; i ++)\r
+ decode_buf [i + decode_pos] = s [i + index];\r
+ \r
+ count -= todo;\r
+ index += todo;\r
+ decode_pos += todo;\r
+ }\r
+ } \r
+#endif\r
+\r
+ public override void Write (char[] buffer, int index, int count) \r
+ {\r
+ if (buffer == null)\r
+ throw new ArgumentNullException ("buffer");\r
+ if (index < 0)\r
+ throw new ArgumentOutOfRangeException ("index", "< 0");\r
+ if (count < 0)\r
+ throw new ArgumentOutOfRangeException ("count", "< 0");\r
+ // re-ordered to avoid possible integer overflow\r
+ if (index > buffer.Length - count)\r
+ throw new ArgumentException ("index + count > buffer.Length");\r
+\r
+ CheckState ();\r
+\r
+ LowLevelWrite (buffer, index, count);\r
+ if (iflush)\r
+ FlushCore ();\r
+ }\r
+ \r
public override void Write (char value)\r
{\r
CheckState ();\r
Decode ();\r
decode_buf [decode_pos++] = value;\r
if (iflush)\r
- Flush ();\r
+ FlushCore ();\r
}\r
\r
public override void Write (char[] buffer)\r
if (buffer != null)\r
LowLevelWrite (buffer, 0, buffer.Length);\r
if (iflush)\r
- Flush ();\r
+ FlushCore ();\r
}\r
\r
public override void Write (string value) \r
{\r
CheckState ();\r
\r
- if (value != null)\r
- LowLevelWrite (value);\r
+ if (value == null)\r
+ return;\r
+ \r
+ LowLevelWrite (value);\r
\r
if (iflush)\r
- Flush ();\r
+ FlushCore ();\r
}\r
\r
public override void Close()\r
Dispose (true);\r
}\r
\r
- ~StreamWriter ()\r
- {\r
- Dispose(false);\r
- }\r
-\r
void CheckState ()\r
{\r
- if (DisposedAlready)\r
+ if (byte_buf == null)\r
throw new ObjectDisposedException ("StreamWriter");\r
\r
#if NET_4_5\r
- if (async_task != null && async_task.IsCompleted)\r
+ if (async_task != null && !async_task.IsCompleted)\r
throw new InvalidOperationException ();\r
#endif\r
}\r
public override Task FlushAsync ()\r
{\r
CheckState ();\r
- return async_task = base.FlushAsync ();\r
+ DecoupledTask res;\r
+ async_task = res = new DecoupledTask (FlushCoreAsync ());\r
+ return res.Task;\r
}\r
\r
public override Task WriteAsync (char value)\r
{\r
CheckState ();\r
- return async_task = base.WriteAsync (value);\r
+\r
+ DecoupledTask res;\r
+ async_task = res = new DecoupledTask (WriteAsyncCore (value));\r
+ return res.Task;\r
+ }\r
+\r
+ async Task WriteAsyncCore (char value)\r
+ {\r
+ // the size of decode_buf is always > 0 and\r
+ // we check for overflow right away\r
+ if (decode_pos >= decode_buf.Length)\r
+ await DecodeAsync ().ConfigureAwait (false);\r
+ decode_buf [decode_pos++] = value;\r
+\r
+ if (iflush)\r
+ await FlushCoreAsync ().ConfigureAwait (false);\r
}\r
\r
public override Task WriteAsync (char[] buffer, int index, int count)\r
{\r
CheckState ();\r
- return async_task = base.WriteAsync (buffer, index, count);\r
+ if (buffer == null)\r
+ return TaskConstants.Finished;\r
+\r
+ DecoupledTask res;\r
+ async_task = res = new DecoupledTask (WriteAsyncCore (buffer, index, count));\r
+ return res.Task;\r
+ }\r
+\r
+ async Task WriteAsyncCore (char[] buffer, int index, int count)\r
+ {\r
+ // Debug.Assert (buffer == null);\r
+\r
+ await LowLevelWriteAsync (buffer, index, count).ConfigureAwait (false);\r
+\r
+ if (iflush)\r
+ await FlushCoreAsync ().ConfigureAwait (false);\r
}\r
\r
public override Task WriteAsync (string value)\r
{\r
CheckState ();\r
- return async_task = base.WriteAsync (value);\r
+\r
+ if (value == null)\r
+ return TaskConstants.Finished;\r
+\r
+ DecoupledTask res; \r
+ async_task = res = new DecoupledTask (WriteAsyncCore (value, false));\r
+ return res.Task;\r
}\r
\r
+ async Task WriteAsyncCore (string value, bool appendNewLine)\r
+ {\r
+ // Debug.Assert (value == null);\r
+\r
+ await LowLevelWriteAsync (value).ConfigureAwait (false);\r
+ if (appendNewLine)\r
+ await LowLevelWriteAsync (CoreNewLine, 0, CoreNewLine.Length).ConfigureAwait (false);\r
+ \r
+ if (iflush)\r
+ await FlushCoreAsync ().ConfigureAwait (false);\r
+ } \r
+\r
public override Task WriteLineAsync ()\r
{\r
CheckState ();\r
- return async_task = base.WriteLineAsync ();\r
+\r
+ DecoupledTask res;\r
+ async_task = res = new DecoupledTask (WriteAsyncCore (CoreNewLine, 0, CoreNewLine.Length));\r
+ return res.Task;\r
}\r
\r
public override Task WriteLineAsync (char value)\r
{\r
CheckState ();\r
- return async_task = base.WriteLineAsync (value);\r
+ DecoupledTask res;\r
+ async_task = res = new DecoupledTask (WriteLineAsyncCore (value));\r
+ return res.Task;\r
}\r
\r
+ async Task WriteLineAsyncCore (char value)\r
+ {\r
+ await WriteAsyncCore (value).ConfigureAwait (false);\r
+ await LowLevelWriteAsync (CoreNewLine, 0, CoreNewLine.Length).ConfigureAwait (false);\r
+ \r
+ if (iflush)\r
+ await FlushCoreAsync ().ConfigureAwait (false);\r
+ } \r
+\r
public override Task WriteLineAsync (char[] buffer, int index, int count)\r
{\r
+ if (buffer == null)\r
+ throw new ArgumentNullException ("buffer");\r
+ if (index < 0)\r
+ throw new ArgumentOutOfRangeException ("index", "< 0");\r
+ if (count < 0)\r
+ throw new ArgumentOutOfRangeException ("count", "< 0");\r
+ // re-ordered to avoid possible integer overflow\r
+ if (index > buffer.Length - count)\r
+ throw new ArgumentException ("index + count > buffer.Length");\r
+\r
CheckState ();\r
- return async_task = base.WriteLineAsync (buffer, index, count);\r
+ DecoupledTask res;\r
+ async_task = res = new DecoupledTask (WriteLineAsyncCore (buffer, index, count));\r
+ return res.Task;\r
}\r
\r
+ async Task WriteLineAsyncCore (char[] buffer, int index, int count)\r
+ {\r
+ // Debug.Assert (buffer == null);\r
+\r
+ await LowLevelWriteAsync (buffer, index, count).ConfigureAwait (false);\r
+ await LowLevelWriteAsync (CoreNewLine, 0, CoreNewLine.Length).ConfigureAwait (false);\r
+ \r
+ if (iflush)\r
+ await FlushCoreAsync ().ConfigureAwait (false);\r
+ } \r
+\r
public override Task WriteLineAsync (string value)\r
{\r
+ if (value == null)\r
+ return WriteLineAsync ();\r
+\r
CheckState ();\r
- return async_task = base.WriteLineAsync (value);\r
+ DecoupledTask res; \r
+ async_task = res = new DecoupledTask (WriteAsyncCore (value, true));\r
+ return res.Task;\r
}\r
#endif\r
}\r
projects / mono.git / blobdiff