Author: alanmc
Date: 2008-02-08 20:25:28 -0500 (Fri, 08 Feb 2008)
New Revision: 95316
Added:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/DiskWriter.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/IPieceWriter.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/MemoryWriter.cs
Log:
Begin the refactor to enable an in-memory buffer.
Added:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/DiskWriter.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/DiskWriter.cs
2008-02-09 01:21:30 UTC (rev 95315)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/DiskWriter.cs
2008-02-09 01:25:28 UTC (rev 95316)
@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using MonoTorrent.Common;
+using System.IO;
+
+namespace MonoTorrent.Client.PieceWriter
+{
+ public class DiskWriter : IPieceWriter
+ {
+ public void Dispose()
+ {
+ }
+
+ public DiskWriter()
+ {
+ //this.streamsBuffer = new
FileStreamBuffer(engine.Settings.MaxOpenFiles);
+ }
+ internal void CloseFileStreams(TorrentManager manager)
+ {
+ Array.ForEach<TorrentFile>(manager.Torrent.Files,
delegate(TorrentFile f) { streamsBuffer.CloseStream(f); });
+ }
+ private FileStreamBuffer streamsBuffer;
+
+ public int OpenFiles
+ {
+ get { return streamsBuffer.Count; }
+ }
+ /// <summary>
+ /// Generates the full path to the supplied TorrentFile
+ /// </summary>
+ /// <param name="file">The TorrentFile to generate the full path
to</param>
+ /// <param name="baseDirectory">The name of the directory that the
files are contained in</param>
+ /// <param name="savePath">The path to the directory that contains the
BaseDirectory</param>
+ /// <returns>The full path to the TorrentFile</returns>
+ private static string GenerateFilePath(TorrentFile file, string
baseDirectory, string savePath)
+ {
+ string path;
+
+ path = Path.Combine(savePath, baseDirectory);
+ path = Path.Combine(path, file.Path);
+
+ if (!Directory.Exists(Path.GetDirectoryName(path)) &&
!string.IsNullOrEmpty(Path.GetDirectoryName(path)))
+ Directory.CreateDirectory(Path.GetDirectoryName(path));
+
+ return path;
+ }
+
+
+ /// <summary>
+ /// Opens all the filestreams with the specified file access
+ /// </summary>
+ /// <param name="fileAccess"></param>
+ internal TorrentFileStream GetStream(FileManager manager, TorrentFile
file, FileAccess access)
+ {
+ string filePath = GenerateFilePath(file, manager.BaseDirectory,
manager.SavePath);
+ return streamsBuffer.GetStream(file, filePath, access);
+ }
+
+
+ public int Read(FileManager manager, byte[] buffer, int bufferOffset,
long offset, int count)
+ {
+ if (buffer == null)
+ throw new ArgumentNullException("buffer");
+
+ if (offset < 0 || offset + count > manager.FileSize)
+ throw new ArgumentOutOfRangeException("offset");
+
+ int i = 0;
+ int bytesRead = 0;
+ int totalRead = 0;
+
+ for (i = 0; i < manager.Files.Length; i++) // This section
loops through all the available
+ { // files until
we find the file which contains
+ if (offset < manager.Files[i].Length) // the
start of the data we want to read
+ break;
+
+ offset -= manager.Files[i].Length; // Offset now
contains the index of the data we want
+ } // to read
from fileStream[i].
+
+ while (totalRead < count) // We keep
reading until we have read 'count' bytes.
+ {
+ if (i == manager.Files.Length)
+ break;
+
+ lock (manager.Files[i])
+ {
+ TorrentFileStream s = GetStream(manager, manager.Files[i],
FileAccess.Read);
+ s.Seek(offset, SeekOrigin.Begin);
+ offset = 0; // Any further files need to be read from the
beginning
+ bytesRead = s.Read(buffer, bufferOffset + totalRead, count
- totalRead);
+ totalRead += bytesRead;
+ i++;
+ }
+ }
+ //monitor.BytesSent(totalRead, TransferType.Data);
+ return totalRead;
+ }
+
+ public void Write(BufferedIO io, byte[] buffer, int bufferOffset, long
offset, int count)
+ {
+ FileManager manager = io.Id.TorrentManager.FileManager;
+ if (buffer == null)
+ throw new ArgumentNullException("buffer");
+
+ if (offset < 0 || offset + count > manager.FileSize)
+ throw new ArgumentOutOfRangeException("offset");
+
+ int i = 0;
+ long bytesWritten = 0;
+ long totalWritten = 0;
+ long bytesWeCanWrite = 0;
+
+ for (i = 0; i < manager.Files.Length; i++) // This
section loops through all the available
+ { // files until
we find the file which contains
+ if (offset < manager.Files[i].Length) // the start
of the data we want to write
+ break;
+
+ offset -= manager.Files[i].Length; // Offset now
contains the index of the data we want
+ } // to write to
fileStream[i].
+
+ while (totalWritten < count) // We keep
writing until we have written 'count' bytes.
+ {
+ lock (manager.Files[i])
+ {
+ TorrentFileStream stream = GetStream(manager,
manager.Files[i], FileAccess.ReadWrite);
+ stream.Seek(offset, SeekOrigin.Begin);
+
+ // Find the maximum number of bytes we can write before we
reach the end of the file
+ bytesWeCanWrite = manager.Files[i].Length - offset;
+
+ // Any further files need to be written from the beginning
of the file
+ offset = 0;
+
+ // If the amount of data we are going to write is larger
than the amount we can write, just write the allowed
+ // amount and let the rest of the data be written with the
next filestream
+ bytesWritten = ((count - totalWritten) > bytesWeCanWrite)
? bytesWeCanWrite : (count - totalWritten);
+
+ // Write the data
+ stream.Write(buffer, bufferOffset + (int)totalWritten,
(int)bytesWritten);
+
+ // Any further data should be written to the next
available file
+ totalWritten += bytesWritten;
+ i++;
+ }
+ }
+
+ //monitor.BytesReceived((int)totalWritten, TransferType.Data);
+ }
+ }
+}
Property changes on:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/DiskWriter.cs
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/IPieceWriter.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/IPieceWriter.cs
2008-02-09 01:21:30 UTC (rev 95315)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/IPieceWriter.cs
2008-02-09 01:25:28 UTC (rev 95316)
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MonoTorrent.Client.PieceWriter
+{
+ interface IPieceWriter : IDisposable
+ {
+ int Read(FileManager manager, byte[] buffer, int bufferOffset, long
offset, int count);
+
+ void Write(BufferedIO io, byte[] buffer, int bufferOffset, long
offset, int count);
+ }
+}
Property changes on:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/IPieceWriter.cs
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/MemoryWriter.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/MemoryWriter.cs
2008-02-09 01:21:30 UTC (rev 95315)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/MemoryWriter.cs
2008-02-09 01:25:28 UTC (rev 95316)
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using MonoTorrent.Client;
+using MonoTorrent.Common;
+
+namespace MonoTorrent.Client.PieceWriter
+{
+ public class MemoryWriter : IPieceWriter
+ {
+ public void Dispose()
+ {
+ }
+ private int bufferSize;
+ private List <BufferedIO> memoryBuffer;
+ public int BufferSize = 8 * 1024 * 1024;
+
+ public int Used
+ {
+ get
+ {
+ int count = 0;
+ memoryBuffer.ForEach(delegate(BufferedIO i) { count +=
i.Buffer.Count; });
+ return count;
+ }
+ }
+
+ public MemoryWriter()
+ {
+ memoryBuffer = new List<BufferedIO>();
+ }
+
+
+ public int Read(FileManager manager, byte[] buffer, int bufferOffset,
long offset, int count)
+ {/*
+ if (buffer == null)
+ throw new ArgumentNullException("buffer");
+
+ if (offset < 0 || offset + count > manager.FileSize)
+ throw new ArgumentOutOfRangeException("offset");
+
+ int i = 0;
+ int bytesRead = 0;
+ int totalRead = 0;
+
+ for (i = 0; i < manager.Files.Length; i++) // This section
loops through all the available
+ { // files until
we find the file which contains
+ if (offset < manager.Files[i].Length) // the
start of the data we want to read
+ break;
+
+ offset -= manager.Files[i].Length; // Offset now
contains the index of the data we want
+ } // to read
from fileStream[i].
+
+ while (totalRead < count) // We keep
reading until we have read 'count' bytes.
+ {
+ if (i == manager.Files.Length)
+ break;
+
+ lock (manager.Files[i])
+ {
+ TorrentFileStream s = GetStream(manager, manager.Files[i],
FileAccess.Read);
+ s.Seek(offset, SeekOrigin.Begin);
+ offset = 0; // Any further files need to be read from the
beginning
+ bytesRead = s.Read(buffer, bufferOffset + totalRead, count
- totalRead);
+ totalRead += bytesRead;
+ i++;
+ }
+ }
+ monitor.BytesSent(totalRead, TransferType.Data);
+ return totalRead;*/
+ return 1;
+ }
+
+ public void Write(BufferedIO io, byte[] buffer, int bufferOffset, long
offset, int count)
+ {/*
+ FileManager manager = io.Id.TorrentManager.FileManager;
+ if (buffer == null)
+ throw new ArgumentNullException("buffer");
+
+ if (offset < 0 || offset + count > manager.FileSize)
+ throw new ArgumentOutOfRangeException("offset");
+
+ int i = 0;
+ long bytesWritten = 0;
+ long totalWritten = 0;
+ long bytesWeCanWrite = 0;
+
+ for (i = 0; i < manager.Files.Length; i++) // This
section loops through all the available
+ { // files until
we find the file which contains
+ if (offset < manager.Files[i].Length) // the start
of the data we want to write
+ break;
+
+ offset -= manager.Files[i].Length; // Offset now
contains the index of the data we want
+ } // to write to
fileStream[i].
+
+ while (totalWritten < count) // We keep
writing until we have written 'count' bytes.
+ {
+ lock (manager.Files[i])
+ {
+ TorrentFileStream stream = GetStream(manager,
manager.Files[i], FileAccess.ReadWrite);
+ stream.Seek(offset, SeekOrigin.Begin);
+
+ // Find the maximum number of bytes we can write before we
reach the end of the file
+ bytesWeCanWrite = manager.Files[i].Length - offset;
+
+ // Any further files need to be written from the beginning
of the file
+ offset = 0;
+
+ // If the amount of data we are going to write is larger
than the amount we can write, just write the allowed
+ // amount and let the rest of the data be written with the
next filestream
+ bytesWritten = ((count - totalWritten) > bytesWeCanWrite)
? bytesWeCanWrite : (count - totalWritten);
+
+ // Write the data
+ stream.Write(buffer, bufferOffset + (int)totalWritten,
(int)bytesWritten);
+
+ // Any further data should be written to the next
available file
+ totalWritten += bytesWritten;
+ i++;
+ }
+ }
+
+ monitor.BytesReceived((int)totalWritten, TransferType.Data);*/
+ }
+ }
+}
Property changes on:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/MemoryWriter.cs
___________________________________________________________________
Name: svn:eol-style
+ native
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
