Page MenuHomePhorge
Files F584944

No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/includes/libs/filebackend/FileBackendStore.php b/includes/libs/filebackend/FileBackendStore.php
index 524a83aa6fc..f06d358dab6 100644
--- a/includes/libs/filebackend/FileBackendStore.php
+++ b/includes/libs/filebackend/FileBackendStore.php
@@ -395,9 +395,9 @@ abstract class FileBackendStore extends FileBackend {
$scopeLockS = $this->getScopedFileLocks( $params['srcs'], LockManager::LOCK_UW, $status );
if ( $status->isOK() ) {
// Actually do the file concatenation...
- $start_time = microtime( true );
+ $hrStart = hrtime( true );
$status->merge( $this->doConcatenate( $params ) );
- $sec = microtime( true ) - $start_time;
+ $sec = ( hrtime( true ) - $hrStart ) / 1e9;
if ( !$status->isOK() ) {
$this->logger->error( static::class . "-{$this->name}" .
" failed to concatenate " . count( $params['srcs'] ) . " file(s) [$sec sec]" );
diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index d2661d68bd7..64ce81c95a3 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1150,7 +1150,7 @@ class WANObjectCache implements
* $cache->makeGlobalKey( 'wikibase-item', $id ),
* self::INITIAL_TTV, // initial time-till-verify
* function ( $oldValue, &$ttv, &$setOpts, $oldAsOf ) use ( $checkKeys, $cache ) {
- * $now = microtime( true );
+ * $now = time();
* // Use $oldValue if it passes max ultimate age and "check" key comparisons
* if ( $oldValue &&
* $oldAsOf > max( $cache->getMultiCheckKeyTime( $checkKeys ) ) &&

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jul 5, 5:31 AM (8 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
227423
Default Alt Text
(1 KB)

Event Timeline