Merge pull request #31 from moufmouf/lock_cache_rebuild

Locks are placed before cache check

Author: moufmouf

src/GlobControllerQueryProvider.php

@@ -6,7 +6,7 @@
 use Mouf\Composer\ClassNameMapper;
 use Psr\Container\ContainerInterface;
 use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Lock\Store\SemaphoreStore;
+use Symfony\Component\Lock\Lock;
 use TheCodingMachine\ClassExplorer\Glob\GlobClassExplorer;
 use TheCodingMachine\GraphQLite\Mappers\RecursiveTypeMapperInterface;
 use Symfony\Component\Lock\Factory as LockFactory;
@@ -100,16 +100,24 @@ private function getInstancesList(): array
             $key = 'globQueryProvider_'.str_replace('\\', '_', $this->namespace);
             $this->instancesList = $this->cache->get($key);
             if ($this->instancesList === null) {
-                $this->instancesList = $this->lockAndBuildInstanceList();
+                $lock = $this->lockFactory->createLock('buildInstanceList_'.$this->namespace, 5);
+                if ($lock->isAcquired()) {
+                    // Lock is being held right now. Generation is happening.
+                    // Let's wait and fetch the result from the cache.
+                    $lock->acquire(true);
+                    $lock->release();
+                    return $this->getInstancesList();
+                }
+
+                $this->instancesList = $this->lockAndBuildInstanceList($lock);
                 $this->cache->set($key, $this->instancesList, $this->cacheTtl);
             }
         }
         return $this->instancesList;
     }
 
-    private function lockAndBuildInstanceList(): array
+    private function lockAndBuildInstanceList(Lock $lock): array
     {
-        $lock = $this->lockFactory->createLock('buildInstanceList_'.$this->namespace, 5);
         $lock->acquire(true);
         try {
             return $this->buildInstancesList();

src/Mappers/GlobTypeMapper.php

@@ -13,6 +13,7 @@
 use ReflectionClass;
 use ReflectionMethod;
 use Symfony\Component\Lock\Factory as LockFactory;
+use Symfony\Component\Lock\Lock;
 use Symfony\Component\Lock\Store\SemaphoreStore;
 use TheCodingMachine\ClassExplorer\Glob\GlobClassExplorer;
 use TheCodingMachine\GraphQLite\AnnotationReader;
@@ -167,7 +168,15 @@ private function getMaps(): array
                 $this->mapClassToFactory === null ||
                 $this->mapInputNameToFactory
             ) {
-                $this->lockAndBuildMap();
+                $lock = $this->lockFactory->createLock('buildmap_'.$this->namespace, 5);
+                if ($lock->isAcquired()) {
+                    // Lock is being held right now. Generation is happening.
+                    // Let's wait and fetch the result from the cache.
+                    $lock->acquire(true);
+                    $lock->release();
+                    return $this->getMaps();
+                }
+                $this->lockAndBuildMap($lock);
                 // This is a very short lived cache. Useful to avoid overloading a server in case of heavy load.
                 // Defaults to 2 seconds.
                 $this->cache->set($keyClassCache, $this->mapClassToTypeArray, $this->globTtl);
@@ -212,7 +221,16 @@ private function getMapClassToExtendTypeArray(): array
             $keyExtendClassCache = 'globTypeMapperExtend_'.$namespace;
             $this->mapClassToExtendTypeArray = $this->cache->get($keyExtendClassCache);
             if ($this->mapClassToExtendTypeArray === null) {
-                $this->buildMapClassToExtendTypeArray();
+                $lock = $this->lockFactory->createLock('buildmapclassextend_'.$this->namespace, 5);
+                if ($lock->isAcquired()) {
+                    // Lock is being held right now. Generation is happening.
+                    // Let's wait and fetch the result from the cache.
+                    $lock->acquire(true);
+                    $lock->release();
+                    return $this->getMapClassToExtendTypeArray();
+                }
+
+                $this->buildMapClassToExtendTypeArray($lock);
                 // This is a very short lived cache. Useful to avoid overloading a server in case of heavy load.
                 // Defaults to 2 seconds.
                 $this->cache->set($keyExtendClassCache, $this->mapClassToExtendTypeArray, $this->globTtl);
@@ -229,7 +247,16 @@ private function getMapNameToExtendType(RecursiveTypeMapperInterface $recursiveT
             $keyExtendNameCache = 'globTypeMapperExtend_names_'.$namespace;
             $this->mapNameToExtendType = $this->cache->get($keyExtendNameCache);
             if ($this->mapNameToExtendType === null) {
-                $this->buildMapNameToExtendTypeArray($recursiveTypeMapper);
+                $lock = $this->lockFactory->createLock('buildmapnameextend_'.$this->namespace, 5);
+                if ($lock->isAcquired()) {
+                    // Lock is being held right now. Generation is happening.
+                    // Let's wait and fetch the result from the cache.
+                    $lock->acquire(true);
+                    $lock->release();
+                    return $this->getMapNameToExtendType($recursiveTypeMapper);
+                }
+
+                $this->buildMapNameToExtendTypeArray($lock, $recursiveTypeMapper);
                 // This is a very short lived cache. Useful to avoid overloading a server in case of heavy load.
                 // Defaults to 2 seconds.
                 $this->cache->set($keyExtendNameCache, $this->mapNameToExtendType, $this->globTtl);
@@ -265,9 +292,8 @@ private function getClassList(): array
         return $this->classes;
     }
 
-    private function lockAndBuildMap(): void
+    private function lockAndBuildMap(Lock $lock): void
     {
-        $lock = $this->lockFactory->createLock('buildmap_'.$this->namespace, 5);
         $lock->acquire(true);
         try {
             $this->buildMap();
@@ -319,9 +345,8 @@ private function buildMap(): void
         }
     }
 
-    private function buildMapClassToExtendTypeArray(): void
+    private function buildMapClassToExtendTypeArray(Lock $lock): void
     {
-        $lock = $this->lockFactory->createLock('buildmapclassextend_'.$this->namespace, 5);
         $lock->acquire(true);
         try {
             $this->mapClassToExtendTypeArray = [];
@@ -338,9 +363,8 @@ private function buildMapClassToExtendTypeArray(): void
         }
     }
 
-    private function buildMapNameToExtendTypeArray(RecursiveTypeMapperInterface $recursiveTypeMapper): void
+    private function buildMapNameToExtendTypeArray(Lock $lock, RecursiveTypeMapperInterface $recursiveTypeMapper): void
     {
-        $lock = $this->lockFactory->createLock('buildmapnameextend_'.$this->namespace, 5);
         $lock->acquire(true);
         try {
             $this->mapNameToExtendType = [];