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

Fix triggered analyses in PKECPropertyStore #252

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix triggered analyses in PKECPropertyStore #252

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
26 changes: 13 additions & 13 deletions OPAL/si/src/main/scala/org/opalj/fpcf/par/PKECPropertyStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import scala.util.control.ControlThrowable

import com.typesafe.config.Config

import org.opalj.control.foreachWithIndex
import org.opalj.fpcf.PropertyKey.fallbackPropertyBasedOnPKId
import org.opalj.log.LogContext

Expand Down Expand Up @@ -52,8 +53,6 @@ class PKECPropertyStore(
private[this] val initialQueues: Array[java.util.ArrayDeque[QualifiedTask]] =
Array.fill(THREAD_COUNT) { new java.util.ArrayDeque[QualifiedTask](50000 / THREAD_COUNT) }

private[this] var setAndPreinitializedValues: List[SomeEPK] = List.empty

override def shutdown(): Unit = {}

var idle = true
Expand Down Expand Up @@ -181,11 +180,6 @@ class PKECPropertyStore(
pk: PropertyKey[P],
pc: PropertyComputation[E]
): Unit = {

// Recall that the scheduler has to take care of registering a triggered computation
// before the first analysis derives a respective value!
// Hence, there is no need to immediately check that we have to trigger a computation.

val pkId = pk.id
val oldComputations: Array[SomePropertyComputation] = triggeredComputations(pkId)
var newComputations: Array[SomePropertyComputation] = null
Expand All @@ -206,7 +200,6 @@ class PKECPropertyStore(
if (oldP ne null) {
throw new IllegalStateException(s"$e already had the property $oldP")
}
setAndPreinitializedValues ::= EPK(e, p.key)
}

override protected[this] def doPreInitialize[E <: Entity, P <: Property](
Expand All @@ -220,7 +213,6 @@ class PKECPropertyStore(
oldEPKState match {
case null =>
val epk = EPK(e, pk)
setAndPreinitializedValues ::= epk
pc(epk)
case epkState =>
pc(epkState.eOptP.asInstanceOf[EOptionP[E, P]])
Expand Down Expand Up @@ -488,10 +480,18 @@ class PKECPropertyStore(
override def waitOnPhaseCompletion(): Unit = handleExceptions {
idle = false

// If some values were explicitly set, we have to trigger corresponding triggered
// computations.
setAndPreinitializedValues.foreach { epk => triggerComputations(epk.e, epk.pk.id) }
setAndPreinitializedValues = List.empty
if (triggeredComputations.exists(_ ne null)) {
// Let's trigger triggered computations for those entities, which have values!
foreachWithIndex(ps) { (epss, pkId) =>
if (propertyKindsComputedInThisPhase(pkId) && (triggeredComputations(pkId) ne null)) {
epss.forEach { (e, eOptionP) =>
if (eOptionP.eOptP.isEPS) {
triggerComputations(e, pkId)
}
}
}
}
}

activeTasks.addAndGet(initialQueues.iterator.map(_.size()).sum)

Expand Down