From ee9502880bfa815fbb996acb4ef8ad2192ebf9e8 Mon Sep 17 00:00:00 2001
From: pkanavos <pkanavos@gmail.com>
Date: Mon, 21 May 2012 20:03:07 +0300
Subject: [PATCH] Added BufferManager

---
 .../Preferences/PreferencesView.xaml               |    1 -
 trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs    |    1 +
 trunk/Pithos.Core/Agents/FileAgent.cs              |    2 ++
 trunk/Pithos.Core/Agents/PollAgent.cs              |    2 +-
 trunk/Pithos.Network/BlockHashAlgorithms.cs        |   16 +++++++++-
 trunk/Pithos.sln                                   |   32 ++++++++++++++++++++
 6 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index 8df0473..63dee68 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -207,7 +207,6 @@
                     </StackPanel>
                 </TabItem.Header>
                 <WrapPanel Orientation="Vertical">
-                    <CheckBox Content="Activate Shell Extensions" Height="16" HorizontalAlignment="Left" Margin="5" Name="ExtensionsActivated" VerticalAlignment="Top" />
                     <Button Content="Refresh Overlays" Name="RefreshOverlays" HorizontalAlignment="Left" Margin="5" Style="{StaticResource ButtonStyle}" Width="Auto" />
                     <TextBlock Text="Polling Interval (secs)" Margin="5"/>
                     <extToolkit:IntegerUpDown x:Name="Settings_PollingInterval" HorizontalAlignment="Left" Width="100" Margin="5,0" Watermark="Enter seconds" Minimum="1" />                    
diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index 7966319..c5bf87f 100644
--- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@ -503,6 +503,7 @@ namespace Pithos.Client.WPF {
 		public void ShowPreferences(string currentTab)
 		{
 			//Settings.Reload();
+            
 		    var preferences = new PreferencesViewModel(_windowManager, _events, this, Settings,currentTab);
 		    _windowManager.ShowDialog(preferences);
 			
diff --git a/trunk/Pithos.Core/Agents/FileAgent.cs b/trunk/Pithos.Core/Agents/FileAgent.cs
index 903cd02..65c0579 100644
--- a/trunk/Pithos.Core/Agents/FileAgent.cs
+++ b/trunk/Pithos.Core/Agents/FileAgent.cs
@@ -415,10 +415,12 @@ namespace Pithos.Core.Agents
             var oldFullPath = e.OldFullPath;
             var fullPath = e.FullPath;
             
+
             //If the source path is one of the ignored folders, ignore
             if (IgnorePaths(oldFullPath)) 
                 return;
 
+            //TODO: Must prevent move propagation if the source folder is blocked by selective sync
             //Ignore takes into account Selective Sync
             if (Ignore(fullPath))
                 return;
diff --git a/trunk/Pithos.Core/Agents/PollAgent.cs b/trunk/Pithos.Core/Agents/PollAgent.cs
index a3ff53e..ba1d799 100644
--- a/trunk/Pithos.Core/Agents/PollAgent.cs
+++ b/trunk/Pithos.Core/Agents/PollAgent.cs
@@ -132,7 +132,7 @@ namespace Pithos.Core.Agents
 
             Debug.Assert(Thread.CurrentThread.IsBackground, "Polling Ended up in the main thread!");
 
-            GC.Collect();
+            //GC.Collect();
 
             using (ThreadContext.Stacks["Retrieve Remote"].Push("All accounts"))
             {
diff --git a/trunk/Pithos.Network/BlockHashAlgorithms.cs b/trunk/Pithos.Network/BlockHashAlgorithms.cs
index 42df962..f9ea743 100644
--- a/trunk/Pithos.Network/BlockHashAlgorithms.cs
+++ b/trunk/Pithos.Network/BlockHashAlgorithms.cs
@@ -44,6 +44,8 @@ using System.Diagnostics.Contracts;
 using System.IO;
 using System.Reflection;
 using System.Security.Cryptography;
+using System.ServiceModel.Channels;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 
@@ -218,6 +220,16 @@ namespace Pithos.Network
         }
 */
 
+        private static BufferManager _bufferMgr;
+
+        private static BufferManager GetBufferManager(int blockSize,int parallelism)
+        {
+            Interlocked.CompareExchange(ref _bufferMgr,
+                                        BufferManager.CreateBufferManager(parallelism*blockSize, blockSize),
+                                        null);
+            return _bufferMgr;
+        }
+
         public static async Task<ConcurrentDictionary<long, byte[]>> CalculateBlockHashesInPlacePFor(FileStream stream, int blockSize, string algorithm, int parallelism)
         {
             if (stream == null)
@@ -237,9 +249,10 @@ namespace Pithos.Network
 
             var buffer = new byte[parallelism][];
             var hashers = new HashAlgorithm[parallelism];
+            var bufferManager = GetBufferManager(blockSize, parallelism);
             for (var i = 0; i < parallelism; i++)
             {
-                buffer[i] = new byte[blockSize];
+                buffer[i] = bufferManager.TakeBuffer(blockSize);// new byte[blockSize];
                 hashers[i] = HashAlgorithm.Create(algorithm);
             }
             try
@@ -288,6 +301,7 @@ namespace Pithos.Network
                 {
                     if (hashers[i] != null)
                         hashers[i].Dispose();
+                    bufferManager.ReturnBuffer(buffer[i]);
                 }
 
             }
diff --git a/trunk/Pithos.sln b/trunk/Pithos.sln
index 0aea32e..982c71a 100644
--- a/trunk/Pithos.sln
+++ b/trunk/Pithos.sln
@@ -45,6 +45,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pithos.Client.WPF.Test", "P
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pithos.Interfaces.Test", "Pithos.Interfaces.Test\Pithos.Interfaces.Test.csproj", "{881F7260-CA40-40FD-AEEC-860B346DC2DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4netViewer", "log4netViewer\log4netViewer\log4netViewer.csproj", "{FF08C711-3DBC-4767-9600-CF68A64CFD55}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug All|Any CPU = Debug All|Any CPU
@@ -596,6 +598,36 @@ Global
 		{881F7260-CA40-40FD-AEEC-860B346DC2DC}.Test|Mixed Platforms.Build.0 = Release|Any CPU
 		{881F7260-CA40-40FD-AEEC-860B346DC2DC}.Test|x64.ActiveCfg = Release|Any CPU
 		{881F7260-CA40-40FD-AEEC-860B346DC2DC}.Test|x86.ActiveCfg = Release|Any CPU
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug All|Any CPU.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug All|Mixed Platforms.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug All|Mixed Platforms.Build.0 = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug All|x64.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug All|x86.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug All|x86.Build.0 = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug|x64.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug|x86.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Debug|x86.Build.0 = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Premium Debug|Any CPU.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Premium Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Premium Debug|Mixed Platforms.Build.0 = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Premium Debug|x64.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Premium Debug|x86.ActiveCfg = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Premium Debug|x86.Build.0 = Debug|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Release|Any CPU.ActiveCfg = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Release|Mixed Platforms.Build.0 = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Release|x64.ActiveCfg = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Release|x86.ActiveCfg = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Release|x86.Build.0 = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Test|Any CPU.ActiveCfg = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Test|Mixed Platforms.ActiveCfg = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Test|Mixed Platforms.Build.0 = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Test|x64.ActiveCfg = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Test|x86.ActiveCfg = Release|x86
+		{FF08C711-3DBC-4767-9600-CF68A64CFD55}.Test|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
-- 
1.7.10.4