Skip to content

Commit e575378

Browse files
committed
Remove whileQuiescentResolve* methods.
1 parent 15891d4 commit e575378

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

core/src/main/scala/cell/HandlerPool.scala

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,6 @@ class HandlerPool(parallelism: Int = 8, unhandledExceptionHandler: Throwable =>
114114
p.future
115115
}
116116

117-
def whileQuiescentResolveCell[K <: Key[V], V]: Unit = {
118-
while (!cellsNotDone.get().isEmpty) {
119-
val fut = this.quiescentResolveCell
120-
Await.ready(fut, 15.minutes)
121-
}
122-
}
123-
124-
def whileQuiescentResolveDefault[K <: Key[V], V]: Unit = {
125-
while (!cellsNotDone.get().isEmpty) {
126-
val fut = this.quiescentResolveDefaults
127-
Await.ready(fut, 15.minutes)
128-
}
129-
}
130-
131117
/**
132118
* Wait for a quiescent state when no more tasks are being executed. Afterwards, it will resolve
133119
* unfinished cells using the keys resolve function and recursively wait for resolution.

core/src/test/scala/cell/base.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,6 @@ class BaseSuite extends FunSuite {
17121712
}
17131713

17141714
// resolve cells
1715-
pool.whileQuiescentResolveDefault
17161715
val fut = pool.quiescentResolveDefaults
17171716
Await.result(fut, 2.second)
17181717
latch.await()
@@ -1759,7 +1758,6 @@ class BaseSuite extends FunSuite {
17591758
}
17601759

17611760
// resolve cells
1762-
pool.whileQuiescentResolveDefault
17631761
val fut = pool.quiescentResolveDefaults
17641762
Await.result(fut, 2.second)
17651763
latch.await()

core/src/test/scala/opal/ImmutabilityAnalysis.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ object ImmutabilityAnalysis extends DefaultOneStepAnalysis {
8989
typeImmutabilityAnalysis(project, classFileToObjectTypeCellCompleter, manager, classFile)
9090
})
9191
}
92-
pool.whileQuiescentResolveDefault
92+
val fut = pool.quiescentResolveDefaults
93+
Await.ready(fut, 30.minutes)
9394
pool.shutdown()
9495

9596
val endTime = System.currentTimeMillis
@@ -190,7 +191,8 @@ object ImmutabilityAnalysis extends DefaultOneStepAnalysis {
190191
typeImmutabilityAnalysis(project, classFileToObjectTypeCellCompleter, manager, classFile)
191192
})
192193
}
193-
pool.whileQuiescentResolveCell
194+
val fut = pool.quiescentResolveCell
195+
Await.ready(fut, 30.minutes)
194196
pool.shutdown()
195197

196198
/* Fixes the results so the output looks good */

0 commit comments

Comments
 (0)