explicitly release all semaphores

Author: g5bot

src/Module/Control/GameController.php

@@ -59,6 +59,7 @@ public function __construct(
         private readonly GameStateInterface $gameState,
         private readonly JavascriptExecutionInterface $javascriptExecution,
         private readonly SessionStringFactoryInterface $sessionStringFactory,
+        private readonly SemaphoreUtilInterface $semaphoreUtil,
         private readonly BenchmarkResultInterface $benchmarkResult
     ) {
         $this->gameData = new GameData();
@@ -285,6 +286,8 @@ public function main(
             $this->fallbackRouter->showFallbackSite($e, $this);
         }
 
+        $this->semaphoreUtil->releaseAllSemaphores();
+
         $isTemplateSet = $this->twigPage->isTemplateSet();
 
         if (!$isTemplateSet) {

src/Module/Control/SemaphoreUtil.php

@@ -6,24 +6,16 @@
 use Stu\Component\Game\SemaphoreConstants;
 use Stu\Exception\SemaphoreException;
 use Stu\Module\Config\StuConfigInterface;
-use Stu\Module\Logging\LogLevelEnum;
-use Stu\Module\Logging\LoggerUtilFactoryInterface;
-use Stu\Module\Logging\LoggerUtilInterface;
+use Stu\Module\Logging\LogTypeEnum;
+use Stu\Module\Logging\StuLogger;
 use SysvSemaphore;
 
 final class SemaphoreUtil implements SemaphoreUtilInterface
 {
     /** @var array<int, SysvSemaphore> */
     public static array $semaphores = [];
 
-    private LoggerUtilInterface $loggerUtil;
-
-    public function __construct(
-        private readonly StuConfigInterface $stuConfig,
-        LoggerUtilFactoryInterface $loggerUtilFactory
-    ) {
-        $this->loggerUtil = $loggerUtilFactory->getLoggerUtil();
-    }
+    public function __construct(private readonly StuConfigInterface $stuConfig) {}
 
     #[Override]
     public function isSemaphoreAlreadyAcquired(int $key): bool
@@ -83,18 +75,36 @@ public function releaseSemaphore(null|int|SysvSemaphore $semaphore, bool $doRemo
         $this->release($semaphore, $doRemove);
     }
 
+    #[Override]
+    public function releaseAllSemaphores(bool $doRemove = false): void
+    {
+        if (!$this->isSemaphoreUsageActive()) {
+            return;
+        }
+
+        foreach (self::$semaphores as $semaphore) {
+            $this->release($semaphore, $doRemove);
+        }
+    }
+
     private function release(SysvSemaphore $semaphore, bool $doRemove): void
     {
+        $key = array_search($semaphore, self::$semaphores, true);
+        if ($key === false) {
+            return;
+        }
+        unset(self::$semaphores[$key]);
+
         if (!sem_release($semaphore)) {
-            $this->loggerUtil->init('semaphores', LogLevelEnum::ERROR);
-            $this->loggerUtil->log("Error releasing Semaphore!");
+            StuLogger::log(sprintf("Error releasing Semaphore with key %d!", $key), LogTypeEnum::SEMAPHORE);
             return;
             //throw new SemaphoreException("Error releasing Semaphore!");
+        } else {
+            StuLogger::log(sprintf('  Released semaphore %d', $key), LogTypeEnum::SEMAPHORE);
         }
 
         if ($doRemove && !sem_remove($semaphore)) {
-            $this->loggerUtil->init('semaphores', LogLevelEnum::ERROR);
-            $this->loggerUtil->log("Error removing Semaphore!");
+            StuLogger::log(sprintf("Error removing Semaphore with key %d!", $key), LogTypeEnum::SEMAPHORE);
             //throw new SemaphoreException("Error removing Semaphore!");
         }
     }

src/Module/Control/SemaphoreUtilInterface.php

@@ -11,4 +11,6 @@ public function isSemaphoreAlreadyAcquired(int $key): bool;
     public function acquireSemaphore(int $key): null|int|SysvSemaphore;
 
     public function releaseSemaphore(null|int|SysvSemaphore $semaphore, bool $doRemove = false): void;
+
+    public function releaseAllSemaphores(bool $doRemove = false): void;
 }

src/Module/Spacecraft/Lib/SpacecraftLoader.php

@@ -247,6 +247,11 @@ private function acquireSemaphoreForSpacecraft(Spacecraft|int $spacecraft): ?Spa
         }
 
         $key = $spacecraft->getUser()->getId();
+        StuLogger::log(sprintf(
+            'spacecraft %d with key %d',
+            $spacecraft->getId(),
+            $key
+        ), LogTypeEnum::SEMAPHORE);
         $this->semaphoreUtil->acquireSemaphore($key);
 
         return $this->spacecraftWrapperFactory->wrapSpacecraft($spacecraft);