Skip to content

Synchronize read/write accesses to NamingScope.GetUniqueName #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Jun 18, 2018
Merged

Synchronize read/write accesses to NamingScope.GetUniqueName #383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/Castle.Core/DynamicProxy/Generators/BaseProxyGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,9 @@ protected Type ObtainProxyType(CacheKey cacheKey, Func<string, INamingScope, Typ
}

// This is to avoid generating duplicate types under heavy multithreaded load.
Copy link
Contributor

@TimLovellSmith TimLovellSmith Jun 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, you could probably move the comment 'This is to avoid generating duplicate types under heavy multithreaded load' to just after 'See if an earlier lock holder populated the cache.'

using (var locker = Scope.Lock.ForReadingUpgradeable())
using (var locker = Scope.Lock.ForWriting())
{
// Only one thread at a time may enter an upgradable read lock.
// Only one thread at a time may enter a write lock.
// See if an earlier lock holder populated the cache.
cacheType = GetFromCache(cacheKey);
if (cacheType != null)
Expand All @@ -414,11 +414,8 @@ protected Type ObtainProxyType(CacheKey cacheKey, Func<string, INamingScope, Typ
var name = Scope.NamingScope.GetUniqueName("Castle.Proxies." + targetType.Name + "Proxy");
var proxyType = factory.Invoke(name, Scope.NamingScope.SafeSubScope());

// Upgrade the lock to a write lock.
using (locker.Upgrade())
{
AddToCache(cacheKey, proxyType);
}
AddToCache(cacheKey, proxyType);

return proxyType;
}
}
Expand Down