From f30a5600732eca25a55df2578af0fa8554bd0c9d Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 17 Feb 2022 17:16:08 +0100
Subject: [PATCH] Revert accidentally committed change

TMP Reuse Profiler instance to collect statistics

This reverts commit 56267a68955fd94ba36f79ce526fd198a8c630a2.
---
 .../reactor/core/internal/EvaluationSessionImpl.kt    | 11 ++++-------
 .../logic/reactor/core/internal/SessionTokenImpl.kt   |  4 +---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt
index 0adebe56..4711e976 100644
--- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt
+++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt
@@ -171,23 +171,19 @@ internal class EvaluationSessionImpl private constructor (
             @Suppress("UNCHECKED_CAST")
             val durations = parameters[ParameterKey.of("profiling.data", MutableMap::class.java)]
                 as MutableMap<String, String>?
-            val profiler = durations?.let { (token as? SessionTokenImpl)?.profiler ?: Profiler() }
+            val profiler = durations?.let { Profiler() }
 
             session = EvaluationSessionImpl(ispec, program, supervisor, evaluationTrace, profiler, parameters)
             Backend.ourBackend.ourSession.set(session)
             try {
                 val main = parameters[ParameterKey.of("main", Constraint::class.java)] as Constraint
-                val result = session.launch(token, main)
-                if (profiler != null) {
-                    ((result as EvaluationResultImpl).token as SessionTokenImpl).profiler = profiler
-                }
-                return result
+                return session.launch(token, main)
             }
             finally {
                 try {
                     profiler?.run {
                         formattedData().entries.forEach { e -> durations.put(e.key, e.value) }
-//                        clear()
+                        clear()
                     }
                 }
                 catch (t: Throwable) {
@@ -195,6 +191,7 @@ internal class EvaluationSessionImpl private constructor (
                 }
                 Backend.ourBackend.ourSession.set(null)
             }
+
         }
 
     }
diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/SessionTokenImpl.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/SessionTokenImpl.kt
index 3fa07816..f0fc6d49 100644
--- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/SessionTokenImpl.kt
+++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/SessionTokenImpl.kt
@@ -22,7 +22,6 @@ import jetbrains.mps.logic.reactor.core.RuleIndex
 import jetbrains.mps.logic.reactor.evaluation.MatchJournalView
 import jetbrains.mps.logic.reactor.evaluation.SessionToken
 import jetbrains.mps.logic.reactor.program.Rule
-import jetbrains.mps.logic.reactor.util.Profiler
 
 data class SessionTokenImpl(
     private val journalView: MatchJournal.View,
@@ -30,8 +29,7 @@ data class SessionTokenImpl(
     private val frontState: DispatchingFrontState,
     val ruleIndex: RuleIndex,
     val logicalState: LogicalState,
-    val principalObservers: PrincipalObserverDispatcher = PrincipalObserverDispatcher.EMPTY,
-    var profiler: Profiler? = null
+    val principalObservers: PrincipalObserverDispatcher = PrincipalObserverDispatcher.EMPTY
 ) : SessionToken
 {
     override fun getJournalView(): MatchJournalView = journalView