// Dietmar Maurer (dietmar@ximian.com)
// Dan Lewis (dihlewis@yahoo.co.uk)
// Gonzalo Paniagua Javier (gonzalo@ximian.com)
+// Marek Safar (marek.safar@gmail.com)
//
// (C) 2001-2003 Ximian, Inc. http://www.ximian.com
-// Copyright (C) 2004-2005, 2008 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005, 2008, 2010 Novell, Inc (http://www.novell.com)
+// Copyright 2011 Xamarin Inc (http://www.xamarin.com).
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Remoting.Messaging;
+using System.Security;
using System.Security.Permissions;
using System.Threading;
-
using Microsoft.Win32.SafeHandles;
+
#if NET_2_1
using System.IO.IsolatedStorage;
-using System.Security;
#else
using System.Security.AccessControl;
#endif
+#if NET_4_5
+using System.Threading.Tasks;
+#endif
+
namespace System.IO
{
[ComVisible (true)]
: this (handle, access, ownsHandle, bufferSize, isAsync, false) {}
[SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
- internal FileStream (IntPtr handle, FileAccess access, bool ownsHandle, int bufferSize, bool isAsync, bool noBuffering)
+ internal FileStream (IntPtr handle, FileAccess access, bool ownsHandle, int bufferSize, bool isAsync, bool isZeroSize)
{
this.handle = MonoIO.InvalidHandle;
if (handle == this.handle)
}
this.handle = handle;
+ ExposeHandle ();
this.access = access;
this.owner = ownsHandle;
this.async = isAsync;
-#if NET_2_1 && !MONOTOUCH
- // default the browser to 'all' anonymous files and let other usage (like smcs) with 'normal'
- // (i.e. non-anonymous except for isolated storage) files and paths
- this.anonymous = SecurityManager.SecurityEnabled;
-#else
this.anonymous = false;
-#endif
-
- InitBuffer (bufferSize, noBuffering);
-
if (canseek) {
buf_start = MonoIO.Seek (handle, 0, SeekOrigin.Current, out error);
if (error != MonoIOError.ERROR_SUCCESS) {
}
public FileStream (string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, bool useAsync)
- : this (path, mode, access, share, bufferSize, useAsync, FileOptions.None)
+ : this (path, mode, access, share, bufferSize, useAsync ? FileOptions.Asynchronous : FileOptions.None)
{
}
-#if !NET_2_1
public FileStream (string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options)
: this (path, mode, access, share, bufferSize, false, options)
{
}
+#if !NET_2_1
public FileStream (SafeFileHandle handle, FileAccess access)
:this(handle, access, DefaultBufferSize, false)
{
throw new ArgumentException ("Path is empty");
}
+ this.anonymous = anonymous;
// ignore the Inheritable flag
share &= ~FileShare.Inheritable;
}
if (access < FileAccess.Read || access > FileAccess.ReadWrite) {
-#if NET_2_1
- if (anonymous)
- throw new IsolatedStorageException ("Enum value for FileAccess was out of legal range.");
- else
-#endif
throw new ArgumentOutOfRangeException ("access", "Enum value was out of legal range.");
}
if (share < FileShare.None || share > (FileShare.ReadWrite | FileShare.Delete)) {
-#if NET_2_1
- if (anonymous)
- throw new IsolatedStorageException ("Enum value for FileShare was out of legal range.");
- else
-#endif
throw new ArgumentOutOfRangeException ("share", "Enum value was out of legal range.");
}
throw new ArgumentException (string.Format (msg, access, mode));
}
- string dname = Path.GetDirectoryName (path);
+ SecurityManager.EnsureElevatedPermissions (); // this is a no-op outside moonlight
+
+ string dname;
+ if (Path.DirectorySeparatorChar != '/' && path.IndexOf ('/') >= 0)
+ dname = Path.GetDirectoryName (Path.GetFullPath (path));
+ else
+ dname = Path.GetDirectoryName (path);
if (dname.Length > 0) {
string fp = Path.GetFullPath (dname);
if (!Directory.Exists (fp)) {
// don't leak the path information for isolated storage
string msg = Locale.GetText ("Could not find a part of the path \"{0}\".");
string fname = (anonymous) ? dname : Path.GetFullPath (path);
-#if NET_2_1
- // don't use GetSecureFileName for the directory name
- throw new IsolatedStorageException (String.Format (msg, fname));
-#else
throw new DirectoryNotFoundException (String.Format (msg, fname));
-#endif
}
}
// don't leak the path information for isolated storage
string msg = Locale.GetText ("Could not find file \"{0}\".");
string fname = GetSecureFileName (path);
-#if NET_2_1
- throw new IsolatedStorageException (String.Format (msg, fname));
-#else
throw new FileNotFoundException (String.Format (msg, fname), fname);
-#endif
}
// IsolatedStorage needs to keep the Name property to the default "[Unknown]"
this.access = access;
this.owner = true;
- this.anonymous = anonymous;
/* Can we open non-files by name? */
public string Name {
get {
- return name;
+ return name;
}
}
if (handle == MonoIO.InvalidHandle)
throw new ObjectDisposedException ("Stream has been closed");
- if(CanSeek == false)
+ if (CanSeek == false)
throw new NotSupportedException("The stream does not support seeking");
-
+
+ if (safeHandle != null) {
+ // If the handle was leaked outside we always ask the real handle
+ MonoIOError error;
+
+ long ret = MonoIO.Seek (handle, 0,SeekOrigin.Current,out error);
+
+ if (error != MonoIOError.ERROR_SUCCESS) {
+ // don't leak the path information for isolated storage
+ throw MonoIO.GetException (GetSecureFileName (name), error);
+ }
+
+ return ret;
+ }
+
return(buf_start + buf_offset);
}
set {
- if (handle == MonoIO.InvalidHandle)
- throw new ObjectDisposedException ("Stream has been closed");
-
- if(CanSeek == false) {
- throw new NotSupportedException("The stream does not support seeking");
- }
-
if(value < 0) {
throw new ArgumentOutOfRangeException("Attempt to set the position to a negative value");
}
[SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
[SecurityPermission (SecurityAction.InheritanceDemand, UnmanagedCode = true)]
get {
+ if (safeHandle == null) {
+ ExposeHandle ();
+ }
return handle;
}
}
[SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
[SecurityPermission (SecurityAction.InheritanceDemand, UnmanagedCode = true)]
get {
- SafeFileHandle ret;
-
- if (safeHandle != null)
- ret = safeHandle;
- else
- ret = new SafeFileHandle (handle, owner);
-
- FlushBuffer ();
- return ret;
+ if (safeHandle == null) {
+ ExposeHandle ();
+ }
+ return safeHandle;
}
}
// methods
+ void ExposeHandle ()
+ {
+ safeHandle = new SafeFileHandle (handle, false);
+ FlushBuffer ();
+ InitBuffer (0, true);
+ }
+
public override int ReadByte ()
{
if (handle == MonoIO.InvalidHandle)
int ReadInternal (byte [] dest, int offset, int count)
{
- int copied = 0;
-
int n = ReadSegment (dest, offset, count);
- copied += n;
- count -= n;
-
- if (count == 0) {
- /* If there was already enough
- * buffered, no need to read
- * more from the file.
- */
- return (copied);
+ if (n == count) {
+ return count;
}
-
+
+ int copied = n;
+ count -= n;
if (count > buf_size) {
/* Read as much as we can, up
* to count bytes
*/
FlushBuffer();
n = ReadData (handle, dest,
- offset+copied,
+ offset+n,
count);
/* Make the next buffer read
count);
}
- copied += n;
-
- return copied;
+ return copied + n;
}
delegate int ReadDelegate (byte [] buffer, int offset, int count);
MemoryStream ms = new MemoryStream ();
FlushBuffer (ms);
ms.Write (array, offset, numBytes);
+
+ // Set arguments to new compounded buffer
offset = 0;
- numBytes = (int) ms.Length;
+ array = ms.ToArray ();
+ numBytes = array.Length;
}
- WriteDelegate w = new WriteDelegate (WriteInternal);
+ WriteDelegate w = WriteInternal;
return w.BeginInvoke (array, offset, numBytes, userCallback, stateObject);
}
protected override void Dispose (bool disposing)
{
+ Exception exc = null;
if (handle != MonoIO.InvalidHandle) {
- FlushBuffer ();
+ try {
+ // If the FileStream is in "exposed" status
+ // it means that we do not have a buffer(we write the data without buffering)
+ // therefor we don't and can't flush the buffer becouse we don't have one.
+ FlushBuffer ();
+ } catch (Exception e) {
+ exc = e;
+ }
if (owner) {
MonoIOError error;
canseek = false;
access = 0;
- if (disposing) {
+
+ if (disposing && buf != null) {
+ if (buf.Length == DefaultBufferSize && buf_recycle == null) {
+ lock (buf_recycle_lock) {
+ if (buf_recycle == null) {
+ buf_recycle = buf;
+ }
+ }
+ }
+
buf = null;
- }
- if (disposing)
GC.SuppressFinalize (this);
+ }
+ if (exc != null)
+ throw exc;
}
#if !NET_2_1
public FileSecurity GetAccessControl ()
{
- throw new NotImplementedException ();
+ return new FileSecurity (SafeFileHandle,
+ AccessControlSections.Owner |
+ AccessControlSections.Group |
+ AccessControlSections.Access);
}
public void SetAccessControl (FileSecurity fileSecurity)
{
- throw new NotImplementedException ();
+ if (null == fileSecurity)
+ throw new ArgumentNullException ("fileSecurity");
+
+ fileSecurity.PersistModifications (SafeFileHandle);
+ }
+#endif
+
+#if NET_4_5
+ public override Task FlushAsync (CancellationToken cancellationToken)
+ {
+ return base.FlushAsync (cancellationToken);
+ }
+
+ public override Task<int> ReadAsync (byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+ {
+ return base.ReadAsync (buffer, offset, count, cancellationToken);
+ }
+
+ public override Task WriteAsync (byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+ {
+ return base.WriteAsync (buffer, offset, count, cancellationToken);
}
#endif
private int ReadSegment (byte [] dest, int dest_offset, int count)
{
- if (count > buf_length - buf_offset) {
- count = buf_length - buf_offset;
- }
+ count = Math.Min (count, buf_length - buf_offset);
if (count > 0) {
- Buffer.BlockCopy (buf, buf_offset,
- dest, dest_offset,
- count);
+ // Use the fastest method, all range checks has been done
+ Buffer.BlockCopyInternal (buf, buf_offset, dest, dest_offset, count);
buf_offset += count;
}
- return(count);
+ return count;
}
private int WriteSegment (byte [] src, int src_offset,
if (buf_dirty) {
MonoIOError error;
- if (CanSeek == true) {
+ if (CanSeek == true && safeHandle == null) {
MonoIO.Seek (handle, buf_start,
SeekOrigin.Begin,
out error);
return(amount);
}
- private void InitBuffer (int size, bool noBuffering)
+ void InitBuffer (int size, bool isZeroSize)
{
- if (noBuffering) {
+ if (isZeroSize) {
size = 0;
- // We need a buffer for the ReadByte method. This buffer won't
- // be used for anything else since buf_size==0.
- buf = new byte [1];
- }
- else {
+ buf = new byte[1];
+ } else {
if (size <= 0)
throw new ArgumentOutOfRangeException ("bufferSize", "Positive number required.");
- if (size < 8)
- size = 8;
- buf = new byte [size];
+
+ size = Math.Max (size, 8);
+
+ //
+ // Instead of allocating a new default buffer use the
+ // last one if there is any available
+ //
+ if (size <= DefaultBufferSize && buf_recycle != null) {
+ lock (buf_recycle_lock) {
+ if (buf_recycle != null) {
+ buf = buf_recycle;
+ buf_recycle = null;
+ }
+ }
+ }
+
+ if (buf == null)
+ buf = new byte [size];
+ else
+ Array.Clear (buf, 0, size);
}
buf_size = size;
- buf_start = 0;
- buf_offset = buf_length = 0;
- buf_dirty = false;
+// buf_start = 0;
+// buf_offset = buf_length = 0;
+// buf_dirty = false;
}
private string GetSecureFileName (string filename)
// fields
- internal const int DefaultBufferSize = 8192;
+ internal const int DefaultBufferSize = 4096;
+
+ // Input buffer ready for recycling
+ static byte[] buf_recycle;
+ static readonly object buf_recycle_lock = new object ();
+
+ private byte [] buf; // the buffer
+ private string name = "[Unknown]"; // name of file.
+
+ SafeFileHandle safeHandle; // set only when using one of the
+ // constructors taking SafeFileHandle
+
+ private long append_startpos;
+ IntPtr handle; // handle to underlying file
private FileAccess access;
private bool owner;
private bool async;
private bool canseek;
- private long append_startpos;
private bool anonymous;
+ private bool buf_dirty; // true if buffer has been written to
- private byte [] buf; // the buffer
private int buf_size; // capacity in bytes
private int buf_length; // number of valid bytes in buffer
private int buf_offset; // position of next byte
- private bool buf_dirty; // true if buffer has been written to
private long buf_start; // location of buffer in file
- private string name = "[Unknown]"; // name of file.
-
- IntPtr handle; // handle to underlying file
- SafeFileHandle safeHandle; // set only when using one of the
- // constructors taking SafeFileHandle
}
}
projects / mono.git / blobdiff