natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid storing DispatchingFront in SessionParts -- it can be stale 

ConstraintsProcessing can reassign front internally,
so SessionParts can store a stale one.
This commit is contained in:
Grigorii Kirgizov 2020-11-30 19:33:53 +03:00
parent f051e6bf19
commit 35335e3d15
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ConstraintsProcessing.kt
View File

@ -56,6 +56,8 @@ internal class ConstraintsProcessing(
fun getStateCleaner(): ProgramStateCleaner = ProgramStateCleaner()
fun getFrontState(): DispatchingFrontState = dispatchingFront.state()
fun engage(controller: Controller) {
logicalState.setController(controller)
}

25
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt
View File

@ -48,11 +48,12 @@ internal data class SessionParts(
val ruleIndex: RuleIndex,
val journal: MatchJournal,
val logicalState: LogicalState,
val dispatchingFront: Dispatcher.DispatchingFront,
val controller: ControllerImpl,
val processing: ConstraintsProcessing,
val strategy: ProcessingStrategy
)
) {
val frontState: DispatchingFrontState get() = processing.getFrontState()
}
internal class EvaluationSessionImpl private constructor (
@ -67,7 +68,7 @@ internal class EvaluationSessionImpl private constructor (
override fun <T : Any> parameter(key: ParameterKey<T>): T? = params ?.get(key) as T
private fun launch(token: SessionToken?, main: Constraint): EvaluationResult {
val sessionProccessing: ProcessingSession =
val sessionProcessing: ProcessingSession =
with(incrementality) {
when {
ability().allowed() && incrLevel() == IncrementalSpec.IncrLevel.Full ->
@ -79,7 +80,7 @@ internal class EvaluationSessionImpl private constructor (
}
}
with (sessionProccessing) {
with (sessionProcessing) {
val session =
if (token != null)
nextSession(token)
@ -112,7 +113,7 @@ internal class EvaluationSessionImpl private constructor (
val controller = ControllerImpl(supervisor, processing, incrementality, trace, profiler)
return SessionParts(program.preambleInfo(), ruleIndex, journal, logicalState, dispatchingFront, controller, processing, processingStrategy)
return SessionParts(program.preambleInfo(), ruleIndex, journal, logicalState, controller, processing, processingStrategy)
}
override fun endSession(session: SessionParts): SessionToken = with(session) {
@ -153,14 +154,14 @@ internal class EvaluationSessionImpl private constructor (
val controller = ControllerImpl(supervisor, processing, incrementality, trace, profiler)
return SessionParts(program.preambleInfo(), ruleIndex, journal, logicalState, front, controller, processing, processingStrategy)
return SessionParts(program.preambleInfo(), ruleIndex, journal, logicalState, controller, processing, processingStrategy)
}
override fun endSession(session: SessionParts): SessionToken = with(session) {
val histView = journal.view()
processing.resetStore() // clear observers
// todo: need clearing occurrenceContractObservers? (MPSCR-66)
val principalState = dispatchingFront.sessionState()
val principalState = sessionState(frontState)
return SessionTokenImpl(histView, ruleIndex.toRules(), principalState, logicalState, ruleIndex)
}
@ -168,8 +169,8 @@ internal class EvaluationSessionImpl private constructor (
* Preserve data needed between sessions:
* preserve only relevant and non-empty RuleMatchers
*/
protected fun Dispatcher.DispatchingFront.sessionState() =
this.state().filterValues { ruleMatcher ->
protected fun sessionState(frontState: DispatchingFrontState) =
frontState.filterValues { ruleMatcher ->
incrementality.isPrincipal(ruleMatcher.rule()) || ruleMatcher.probe().hasOccurrences()
}
}
@ -194,7 +195,7 @@ internal class EvaluationSessionImpl private constructor (
val controller = ControllerImpl(supervisor, processing, incrementality, trace, profiler)
this.tkn = tkn
return SessionParts(program.preambleInfo(), ruleIndex, journal, logicalState, front, controller, processing, processingStrategy)
return SessionParts(program.preambleInfo(), ruleIndex, journal, logicalState, controller, processing, processingStrategy)
}
// Compute Preamble token only once, after firstSession()
@ -206,8 +207,8 @@ internal class EvaluationSessionImpl private constructor (
processing.resetStore() // clear observers
// todo: need clearing occurrenceContractObservers? (MPSCR-66)
val principalState = dispatchingFront.sessionState().filterValues {
preambleInfo.inPreamble(it.rule())
val principalState = sessionState(frontState).filterValues { ruleMatcher ->
preambleInfo.inPreamble(ruleMatcher.rule())
}
val rules = ruleIndex.toRules().filter(preambleInfo::inPreamble)