Skip to content

[minor] Remove whileQuiescent* methods #116

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

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

[minor] Remove whileQuiescent* methods #116

Show file tree
Hide file tree
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
14 changes: 0 additions & 14 deletions core/src/main/scala/com/phaller/rasync/HandlerPool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,20 +117,6 @@ class HandlerPool(
p.future
}

def whileQuiescentResolveCell[K <: Key[V], V]: Unit = {
while (!cellsNotDone.isEmpty) {
val fut = this.quiescentResolveCell
Await.ready(fut, 15.minutes)
}
}

def whileQuiescentResolveDefault[K <: Key[V], V]: Unit = {
while (!cellsNotDone.isEmpty) {
val fut = this.quiescentResolveDefaults
Await.ready(fut, 15.minutes)
}
}

/**
* Wait for a quiescent state when no more tasks are being executed. Afterwards, it will resolve
* unfinished cycles (cSCCs) of cells using the keys resolve function and recursively wait for resolution.
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/com/phaller/rasync/test/LazySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package test
import java.util.concurrent.CountDownLatch

import com.phaller.rasync.lattice.{ DefaultKey, Updater }
import com.phaller.rasync.test.lattice.{ StringIntKey, StringIntUpdater }
import lattice.{ StringIntKey, StringIntUpdater }
import org.scalatest.FunSuite

import scala.concurrent.Await
Expand Down
2 changes: 0 additions & 2 deletions core/src/test/scala/com/phaller/rasync/test/base.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,7 +1731,6 @@ class BaseSuite extends FunSuite {
}

// resolve cells
pool.whileQuiescentResolveDefault
val fut = pool.quiescentResolveDefaults
Await.result(fut, 2.second)
latch.await()
Expand Down Expand Up @@ -1778,7 +1777,6 @@ class BaseSuite extends FunSuite {
}

// resolve cells
pool.whileQuiescentResolveDefault
val fut = pool.quiescentResolveDefaults
Await.result(fut, 2.second)
latch.await()
Expand Down
6 changes: 4 additions & 2 deletions core/src/test/scala/com/phaller/rasync/test/opal/ImmutabilityAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ object ImmutabilityAnalysis extends DefaultOneStepAnalysis {
typeImmutabilityAnalysis(project, classFileToObjectTypeCellCompleter, manager, classFile)
})
}
pool.whileQuiescentResolveDefault
val fut = pool.quiescentResolveDefaults
Await.ready(fut, 30.minutes)
pool.shutdown()

val endTime = System.currentTimeMillis
Expand Down Expand Up @@ -191,7 +192,8 @@ object ImmutabilityAnalysis extends DefaultOneStepAnalysis {
typeImmutabilityAnalysis(project, classFileToObjectTypeCellCompleter, manager, classFile)
})
}
pool.whileQuiescentResolveCell
val fut = pool.quiescentResolveCell
Await.ready(fut, 30.minutes)
pool.shutdown()

/* Fixes the results so the output looks good */
Expand Down