Skip to content
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

Jump to bottom

Avoid modifying surface cache while updating it #2260

Closed
wants to merge 1 commit into from
Closed

Avoid modifying surface cache while updating it #2260

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 19 additions & 9 deletions ...-surface/.jvm/src/main/scala-2/wvlet/airframe/surface/reflect/ReflectSurfaceFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ object ReflectSurfaceFactory extends LogSupport {
new ConcurrentHashMap[TypeName, Seq[MethodSurface]].asScala
private[surface] val typeMap = new ConcurrentHashMap[Surface, ru.Type].asScala

//private def surfaceCacheCheat = surfaceCache.asInstanceOf[scala.collection.convert.JavaCollectionWrappers.JConcurrentMapWrapper]
import language.reflectiveCalls
private def surfaceCacheCheat = surfaceCache.asInstanceOf[AnyRef { def underlying: ConcurrentHashMap[TypeName, Surface] }]

private def belongsToScalaDefault(t: ru.Type) = {
t match {
case ru.TypeRef(prefix, _, _) =>
Expand Down Expand Up @@ -133,7 +137,11 @@ object ReflectSurfaceFactory extends LogSupport {
}

def apply(tpe: ru.Type): Surface = {
surfaceCache.getOrElseUpdate(fullTypeNameOf(tpe), new SurfaceFinder().surfaceOf(tpe))
val fullName = fullTypeNameOf(tpe)
surfaceCacheCheat.underlying.computeIfAbsent(fullName, fn => new SurfaceFinder().surfaceOf(tpe, fn)) match {
case null => LazySurface(resolveClass(tpe), fullName) // Recursive type
case surface => surface
}
}

def methodsOf(s: Surface): Seq[MethodSurface] = {
Expand Down Expand Up @@ -312,13 +320,17 @@ object ReflectSurfaceFactory extends LogSupport {
}

def surfaceOf(tpe: ru.Type): Surface = {
val fullName = fullTypeNameOf(tpe)
surfaceCacheCheat.underlying.computeIfAbsent(fullName, fn => surfaceOf(tpe, fn)) match {
case null => LazySurface(resolveClass(tpe), fullName) // Recursive type
case surface => surface
}
}

def surfaceOf(tpe: ru.Type, fullName: TypeName): Surface = {
try {
val fullName = fullTypeNameOf(tpe)
if (surfaceCache.contains(fullName)) {
surfaceCache(fullName)
} else if (seen.contains(tpe)) {
// Recursive type
LazySurface(resolveClass(tpe), fullName)
if (seen.contains(tpe)) {
null // Recursive type
} else {
seen += tpe
val m = surfaceFactories.orElse[ru.Type, Surface] { case _ =>
Expand All @@ -333,8 +345,6 @@ object ReflectSurfaceFactory extends LogSupport {
// Failed to create surface (Not found in cache)
AnyRefSurface
}
// Cache if not yet cached
surfaceCache.getOrElseUpdate(fullName, surface)
typeMap.getOrElseUpdate(surface, tpe)
trace(s"surfaceOf(${tpe}) Surface: ${surface}, Surface class:${surface.getClass}, tpe: ${showRaw(tpe)}")
surface
Expand Down