Merge "Revert "Use display name in category page subheadings if provided""

[lhc/web/wiklou.git] / includes / libs / objectcache / WinCacheBagOStuff.php

diff --git a/includes/libs/objectcache/WinCacheBagOStuff.php b/includes/libs/objectcache/WinCacheBagOStuff.php
index 8b01610..6996ce5 100644 (file)
--- a/includes/libs/objectcache/WinCacheBagOStuff.php
+++ b/includes/libs/objectcache/WinCacheBagOStuff.php
@@ -51,7 +51,7 @@ class WinCacheBagOStuff extends BagOStuff {
 
                /* wincache_ucache_set returns an empty array on success if $value
                   was an array, bool otherwise */
-               return ( is_array( $result ) && $result === array() ) || $result;
+               return ( is_array( $result ) && $result === [] ) || $result;
        }
 
        protected function cas( $casToken, $key, $value, $exptime = 0 ) {
@@ -64,11 +64,14 @@ class WinCacheBagOStuff extends BagOStuff {
                return true;
        }
 
-       public function merge( $key, $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-               if ( !is_callable( $callback ) ) {
-                       throw new Exception( "Got invalid callback." );
+       public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
+               if ( wincache_lock( $key ) ) { // optimize with FIFO lock
+                       $ok = $this->mergeViaLock( $key, $callback, $exptime, $attempts, $flags );
+                       wincache_unlock( $key );
+               } else {
+                       $ok = false;
                }
 
-               return $this->mergeViaCas( $key, $callback, $exptime, $attempts );
+               return $ok;
        }
 }