yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NuCache: reorg some classes

Browse Source
This commit is contained in:
Stephan
2019-02-22 16:03:39 +01:00
parent 13a8548d3a
commit c56b8863ee
7 changed files with 87 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/Cache/SnapDictionaryTests.cs
View File

@@ -5,6 +5,7 @@ using Moq;
using NUnit.Framework;
using Umbraco.Core.Scoping;
using Umbraco.Web.PublishedCache.NuCache;
using Umbraco.Web.PublishedCache.NuCache.Snap;
namespace Umbraco.Tests.Cache
{
@@ -388,8 +389,7 @@ namespace Umbraco.Tests.Cache
// collect liveGen
GC.Collect();
SnapDictionary<int, string>.GenObj genObj;
Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
Assert.IsTrue(d.Test.GenObjs.TryPeek(out var genObj));
genObj = null;
// in Release mode, it works, but in Debug mode, the weak reference is still alive

53
src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
View File

@@ -8,6 +8,7 @@ using CSharpTest.Net.Collections;
using Umbraco.Core.Logging;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Scoping;
using Umbraco.Web.PublishedCache.NuCache.Snap;
namespace Umbraco.Web.PublishedCache.NuCache
{
@@ -1061,24 +1062,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
#region Classes
private class LinkedNode<TValue>
where TValue: class
{
public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
{
Value = value;
Gen = gen;
Next = next;
}
internal readonly long Gen;
// reading & writing references is thread-safe on all .NET platforms
// mark as volatile to ensure we always read the correct value
internal volatile TValue Value;
internal volatile LinkedNode<TValue> Next;
}
public class Snapshot : IDisposable
{
private readonly ContentStore _store;
@@ -1210,40 +1193,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
}
}
internal class GenObj
{
public GenObj(long gen)
{
Gen = gen;
WeakGenRef = new WeakReference(null);
}
public GenRef GetGenRef()
{
// not thread-safe but always invoked from within a lock
var genRef = (GenRef) WeakGenRef.Target;
if (genRef == null)
WeakGenRef.Target = genRef = new GenRef(this, Gen);
return genRef;
}
public readonly long Gen;
public readonly WeakReference WeakGenRef;
public int Count;
}
internal class GenRef
{
public GenRef(GenObj genObj, long gen)
{
GenObj = genObj;
Gen = gen;
}
public readonly GenObj GenObj;
public readonly long Gen;
}
#endregion
}
}

37
src/Umbraco.Web/PublishedCache/NuCache/Snap/GenObj.cs Normal file
View File

@@ -0,0 +1,37 @@
using System;
using System.Threading;
namespace Umbraco.Web.PublishedCache.NuCache.Snap
{
internal class GenObj
{
public GenObj(long gen)
{
Gen = gen;
WeakGenRef = new WeakReference(null);
}
public GenRef GetGenRef()
{
// not thread-safe but always invoked from within a lock
var genRef = (GenRef)WeakGenRef.Target;
if (genRef == null)
WeakGenRef.Target = genRef = new GenRef(this);
return genRef;
}
public readonly long Gen;
public readonly WeakReference WeakGenRef;
public int Count;
public void Reference()
{
Interlocked.Increment(ref Count);
}
public void Release()
{
Interlocked.Decrement(ref Count);
}
}
}

13
src/Umbraco.Web/PublishedCache/NuCache/Snap/GenRef.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace Umbraco.Web.PublishedCache.NuCache.Snap
{
internal class GenRef
{
public GenRef(GenObj genObj)
{
GenObj = genObj;
}
public readonly GenObj GenObj;
public long Gen => GenObj.Gen;
}
}

20
src/Umbraco.Web/PublishedCache/NuCache/Snap/LinkedNode.cs Normal file
View File

@@ -0,0 +1,20 @@
namespace Umbraco.Web.PublishedCache.NuCache.Snap
{
internal class LinkedNode<TValue>
where TValue : class
{
public LinkedNode(TValue value, long gen, LinkedNode<TValue> next = null)
{
Value = value;
Gen = gen;
Next = next;
}
public readonly long Gen;
// reading & writing references is thread-safe on all .NET platforms
// mark as volatile to ensure we always read the correct value
public volatile TValue Value;
public volatile LinkedNode<TValue> Next;
}
}

80
src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs
View File

@@ -5,6 +5,7 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Umbraco.Core.Scoping;
using Umbraco.Web.PublishedCache.NuCache.Snap;
namespace Umbraco.Web.PublishedCache.NuCache
{
@@ -20,7 +21,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
// This class is optimized for many readers, few writers
// Readers are lock-free
private readonly ConcurrentDictionary<TKey, LinkedNode> _items;
private readonly ConcurrentDictionary<TKey, LinkedNode<TValue>> _items;
private readonly ConcurrentQueue<GenObj> _genObjs;
private GenObj _genObj;
private readonly object _wlocko = new object();
@@ -40,7 +41,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
public SnapDictionary()
{
_items = new ConcurrentDictionary<TKey, LinkedNode>();
_items = new ConcurrentDictionary<TKey, LinkedNode<TValue>>();
_genObjs = new ConcurrentQueue<GenObj>();
_genObj = null; // no initial gen exists
_liveGen = _floorGen = 0;
@@ -198,9 +199,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
public int Count => _items.Count;
private LinkedNode GetHead(TKey key)
private LinkedNode<TValue> GetHead(TKey key)
{
_items.TryGetValue(key, out LinkedNode link); // else null
_items.TryGetValue(key, out var link); // else null
return link;
}
@@ -221,7 +222,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
// for an older gen - if value is different then insert a new
// link for the new gen, with the new value
if (link.Value != value)
_items.TryUpdate(key, new LinkedNode(value, _liveGen, link), link);
_items.TryUpdate(key, new LinkedNode<TValue>(value, _liveGen, link), link);
}
else
{
@@ -235,7 +236,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
}
else
{
_items.TryAdd(key, new LinkedNode(value, _liveGen));
_items.TryAdd(key, new LinkedNode<TValue>(value, _liveGen));
}
}
finally
@@ -261,7 +262,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
if (kvp.Value.Gen < _liveGen)
{
var link = new LinkedNode(null, _liveGen, kvp.Value);
var link = new LinkedNode<TValue>(null, _liveGen, kvp.Value);
_items.TryUpdate(kvp.Key, link, kvp.Value);
}
else
@@ -425,7 +426,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
Collect(_items);
}
private void Collect(ConcurrentDictionary<TKey, LinkedNode> dict)
private void Collect(ConcurrentDictionary<TKey, LinkedNode<TValue>> dict)
{
// it is OK to enumerate a concurrent dictionary and it does not lock
// it - and here it's not an issue if we skip some items, they will be
@@ -460,7 +461,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
// not live, null value, no next link = remove that one -- but only if
// the dict has not been updated, have to do it via ICollection<> (thanks
// Mr Toub) -- and if the dict has been updated there is nothing to collect
var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode>>;
var idict = dict as ICollection<KeyValuePair<TKey, LinkedNode<TValue>>>;
/*var removed =*/ idict.Remove(kvp);
//Console.WriteLine("remove (" + (removed ? "true" : "false") + ")");
continue;
@@ -526,7 +527,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
public GenVal[] GetValues(TKey key)
{
_dict._items.TryGetValue(key, out LinkedNode link); // else null
_dict._items.TryGetValue(key, out var link); // else null
if (link == null)
return new GenVal[0];
@@ -559,23 +560,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
#region Classes
private class LinkedNode
{
public LinkedNode(TValue value, long gen, LinkedNode next = null)
{
Value = value;
Gen = gen;
Next = next;
}
internal readonly long Gen;
// reading & writing references is thread-safe on all .NET platforms
// mark as volatile to ensure we always read the correct value
internal volatile TValue Value;
internal volatile LinkedNode Next;
}
public class Snapshot : IDisposable
{
private readonly SnapDictionary<TKey, TValue> _store;
@@ -639,48 +623,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
}
}
internal class GenObj
{
public GenObj(long gen)
{
Gen = gen;
WeakGenRef = new WeakReference(null);
}
public GenerationReference GetGenRef()
{
// not thread-safe but always invoked from within a lock
var generationReference = (GenerationReference) WeakGenRef.Target;
if (generationReference == null)
WeakGenRef.Target = generationReference = new GenerationReference(this);
return generationReference;
}
public readonly long Gen;
public readonly WeakReference WeakGenRef;
public int Count;
public void Reference()
{
Interlocked.Increment(ref Count);
}
public void Release()
{
Interlocked.Decrement(ref Count);
}
}
internal class GenerationReference
{
public GenerationReference(GenObj genObj)
{
GenObj = genObj;
}
public readonly GenObj GenObj;
}
#endregion
}
}

3
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -205,6 +205,9 @@
<Compile Include="Models\PublishedContent\HybridVariationContextAccessor.cs" />
<Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
<Compile Include="Mvc\SurfaceControllerTypeCollectionBuilder.cs" />
<Compile Include="PublishedCache\NuCache\Snap\GenObj.cs" />
<Compile Include="PublishedCache\NuCache\Snap\GenRef.cs" />
<Compile Include="PublishedCache\NuCache\Snap\LinkedNode.cs" />
<Compile Include="Routing\IPublishedRouter.cs" />
<Compile Include="Services\DashboardService.cs" />
<Compile Include="Services\IDashboardService.cs" />