Runtime optimisation; minor cleanup

.jvmopts

@@ -0,0 +1,3 @@
+-XX:+UseG1GC
+-XX:+UseStringDeduplication
+-Xmx8G

.scalafix.conf

@@ -0,0 +1,14 @@
+rules = [
+  OrganizeImports
+]
+
+OrganizeImports {
+  coalesceToWildcardImportThreshold = 2147483647 # Int.MaxValue
+  expandRelative = false
+  groupExplicitlyImportedImplicitsSeparately = false
+  groupedImports = Merge
+  groups = ["re:javax?\\.", "scala.", "*"]
+  importSelectorsOrder = Ascii
+  importsOrder = Ascii
+  removeUnused = true
+}

build.sbt

@@ -1,4 +1,4 @@
-ThisBuild / baseVersion := "0.1.3"
+ThisBuild / baseVersion := "0.1.4"
 ThisBuild / organization := "ai.entrolution"
 ThisBuild / organizationName := "Entrolution"
 ThisBuild / publishGithubUser := "gvonness"
@@ -21,8 +21,6 @@ ThisBuild / sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
 
 name := "bengal-stm"
 
-version := "0.1.3"
-
 scalaVersion := "2.13.8"
 crossScalaVersions := Seq("2.12.15", "2.13.8")
 

src/main/scala/bengal/stm/TxnRuntimeContext.scala

@@ -74,14 +74,9 @@ private[stm] trait TxnRuntimeContext[F[_]] {
         txnId: TxnId
     )(implicit F: Concurrent[F]): F[Unit] =
       for {
-        _                <- waitingSemaphore.acquire
-        _                <- withRunningLock(F.pure(runningMap -= txnId))
-        waitingPopulated <- F.pure(waitingBuffer.nonEmpty)
-        _ <- if (waitingPopulated)
-               triggerReprocessing
-             else {
-               F.unit
-             }
+        _ <- waitingSemaphore.acquire
+        _ <- withRunningLock(F.pure(runningMap -= txnId))
+        _ <- if (waitingBuffer.nonEmpty) triggerReprocessing else F.unit
         _ <- waitingSemaphore.release
       } yield ()
 
@@ -91,8 +86,8 @@ private[stm] trait TxnRuntimeContext[F[_]] {
       for {
         _ <- waitingSemaphore.acquire
         _ <- F.pure(waitingBuffer.append(analysedTxn))
-        _ <- triggerReprocessing
         _ <- waitingSemaphore.release
+        _ <- triggerReprocessing
       } yield ()
 
     private def attemptExecution(
@@ -118,9 +113,7 @@ private[stm] trait TxnRuntimeContext[F[_]] {
                       _ <- runningSemaphore.release
                     } yield innerResult
                   } else {
-                    for {
-                      _ <- runningSemaphore.release
-                    } yield IdClosure.empty
+                    runningSemaphore.release.map(_ => IdClosure.empty)
                   }
       } yield result
 
@@ -133,20 +126,24 @@ private[stm] trait TxnRuntimeContext[F[_]] {
         _          <- schedulerTrigger.get.flatMap(_.get)
         _          <- waitingSemaphore.acquire
         _          <- schedulerTrigger.set(newTrigger)
-        _ <- for {
-               bufferLocked   <- F.pure(waitingBuffer.toList)
-               _              <- F.pure(waitingBuffer.clear())
-               runningClosure <- getRunningClosure
-               _ <- bufferLocked.foldLeftM(runningClosure) { (i, j) =>
-                      for {
-                        _ <- if (j.idClosure.isCompatibleWith(i)) {
-                               attemptExecution(j)
-                             } else {
-                               F.pure(waitingBuffer.append(j))
-                             }
-                      } yield i.mergeWith(j.idClosure)
-                    }
-             } yield ()
+        _ <- if (waitingBuffer.nonEmpty) {
+               for {
+                 bufferLocked   <- F.pure(waitingBuffer.toList)
+                 _              <- F.pure(waitingBuffer.clear())
+                 runningClosure <- getRunningClosure
+                 _ <- bufferLocked.foldLeftM(runningClosure) { (i, j) =>
+                        for {
+                          _ <- if (j.idClosure.isCompatibleWith(i)) {
+                                 attemptExecution(j)
+                               } else {
+                                 F.pure(waitingBuffer.append(j))
+                               }
+                        } yield i.mergeWith(j.idClosure)
+                      }
+               } yield ()
+             } else {
+               F.pure(println("waiting buffer is empty"))
+             }
         _ <- waitingSemaphore.release
       } yield ()