mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-08 20:58:34 +00:00
Code Issues Projects Releases Wiki Activity

RegionLoader: avoid hitting the disk twice during chunk reads

Browse Source 
this provides some performance improvement (although it's difficult to measure because of cache).
this does mean that we read some garbage data during chunk reads, but it's less costly than hitting the disk twice.
This commit is contained in:
Dylan K. Taylor 2021-01-20 21:05:44 +00:00
parent ecc1e1f698
commit e8ffab1787
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/pocketmine/level/format/io/region/RegionLoader.php
View File

@ -27,6 +27,8 @@ use pocketmine\level\format\ChunkException;
use pocketmine\level\format\io\exception\CorruptedChunkException; use pocketmine\level\format\io\exception\CorruptedChunkException;
use pocketmine\utils\AssumptionFailedError; use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\Binary; use pocketmine\utils\Binary;
use pocketmine\utils\BinaryDataException;
use pocketmine\utils\BinaryStream;
use function assert; use function assert;
use function ceil; use function ceil;
use function chr; use function chr;
@ -145,34 +147,34 @@ class RegionLoader{
fseek($this->filePointer, $this->locationTable[$index]->getFirstSector() << 12); fseek($this->filePointer, $this->locationTable[$index]->getFirstSector() << 12);
$prefix = fread($this->filePointer, 4); /*
if($prefix === false or strlen($prefix) !== 4){ * this might cause us to read some junk, but under normal circumstances it won't be any more than 4096 bytes wasted.
throw new CorruptedChunkException("Corrupted chunk header detected (unexpected end of file reading length prefix)"); * doing this in a single call is faster than making two seeks and reads to fetch the chunk.
} * this relies on the assumption that the end of the file is always padded to a multiple of 4096 bytes.
$length = Binary::readInt($prefix); */
$bytesToRead = $this->locationTable[$index]->getSectorCount() << 12;
$payload = fread($this->filePointer, $bytesToRead);
if($length <= 0){ //TODO: if we reached here, the locationTable probably needs updating if($payload === false || strlen($payload) !== $bytesToRead){
return null; throw new CorruptedChunkException("Corrupted chunk detected (unexpected EOF, truncated or non-padded chunk found)");
}
if($length > self::MAX_SECTOR_LENGTH){ //corrupted
throw new CorruptedChunkException("Length for chunk x=$x,z=$z ($length) is larger than maximum " . self::MAX_SECTOR_LENGTH);
} }
$stream = new BinaryStream($payload);
if($length > ($this->locationTable[$index]->getSectorCount() << 12)){ //Invalid chunk, bigger than defined number of sectors try{
throw new CorruptedChunkException("Chunk length mismatch (expected " . ($this->locationTable[$index]->getSectorCount() << 12) . " sectors, got $length sectors)"); $length = $stream->getInt();
} if($length <= 0){ //TODO: if we reached here, the locationTable probably needs updating
return null;
}
$chunkData = fread($this->filePointer, $length); $compression = $stream->getByte();
if($chunkData === false or strlen($chunkData) !== $length){ if($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
throw new CorruptedChunkException("Corrupted chunk detected (unexpected end of file reading chunk data)"); throw new CorruptedChunkException("Invalid compression type (got $compression, expected " . self::COMPRESSION_ZLIB . " or " . self::COMPRESSION_GZIP . ")");
} }
$compression = ord($chunkData[0]); return $stream->get($length - 1); //length prefix includes the compression byte
if($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){ }catch(BinaryDataException $e){
throw new CorruptedChunkException("Invalid compression type (got $compression, expected " . self::COMPRESSION_ZLIB . " or " . self::COMPRESSION_GZIP . ")"); throw new CorruptedChunkException("Corrupted chunk detected: " . $e->getMessage(), 0, $e);
} }
return substr($chunkData, 1);
} }
/** /**