mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-19 04:05:31 +00:00
Code Issues Projects Releases Wiki Activity

RegionLoader: clean up lastSector handling

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-05 13:18:14 +00:00
parent 07a9c35ee2
commit f2404804d7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,8 @@ class RegionLoader{
private const MAX_SECTOR_LENGTH = 255 << 12; //255 sectors (~0.996 MiB) private const MAX_SECTOR_LENGTH = 255 << 12; //255 sectors (~0.996 MiB)
private const REGION_HEADER_LENGTH = 8192; //4096 location table + 4096 timestamps private const REGION_HEADER_LENGTH = 8192; //4096 location table + 4096 timestamps
private const FIRST_SECTOR = 2; //location table occupies 0 and 1
public static $COMPRESSION_LEVEL = 7; public static $COMPRESSION_LEVEL = 7;
/** @var string */ /** @var string */
@ -65,7 +67,7 @@ class RegionLoader{
/** @var resource */ /** @var resource */
protected $filePointer; protected $filePointer;
/** @var int */ /** @var int */
protected $lastSector; protected $nextSector = self::FIRST_SECTOR;
/** @var RegionLocationTableEntry[] */ /** @var RegionLocationTableEntry[] */
protected $locationTable = []; protected $locationTable = [];
/** @var int */ /** @var int */
@ -193,11 +195,11 @@ class RegionLoader{
$offset = $this->locationTable[$index]->getFirstSector(); $offset = $this->locationTable[$index]->getFirstSector();
if($this->locationTable[$index]->getSectorCount() < $newSize){ if($this->locationTable[$index]->getSectorCount() < $newSize){
$offset = $this->lastSector + 1; $offset = $this->nextSector;
} }
$this->locationTable[$index] = new RegionLocationTableEntry($offset, $newSize, time()); $this->locationTable[$index] = new RegionLocationTableEntry($offset, $newSize, time());
$this->lastSector = max($this->lastSector, $this->locationTable[$index]->getLastSector()); $this->bumpNextFreeSector($this->locationTable[$index]);
fseek($this->filePointer, $offset << 12); fseek($this->filePointer, $offset << 12);
fwrite($this->filePointer, str_pad(Binary::writeInt($length) . chr(self::COMPRESSION_ZLIB) . $chunkData, $newSize << 12, "\x00", STR_PAD_RIGHT)); fwrite($this->filePointer, str_pad(Binary::writeInt($length) . chr(self::COMPRESSION_ZLIB) . $chunkData, $newSize << 12, "\x00", STR_PAD_RIGHT));
@ -260,7 +262,6 @@ class RegionLoader{
*/ */
protected function loadLocationTable() : void{ protected function loadLocationTable() : void{
fseek($this->filePointer, 0); fseek($this->filePointer, 0);
$this->lastSector = 1;
$headerRaw = fread($this->filePointer, self::REGION_HEADER_LENGTH); $headerRaw = fread($this->filePointer, self::REGION_HEADER_LENGTH);
if(($len = strlen($headerRaw)) !== self::REGION_HEADER_LENGTH){ if(($len = strlen($headerRaw)) !== self::REGION_HEADER_LENGTH){
@ -290,7 +291,7 @@ class RegionLoader{
} }
$this->locationTable[$i] = new RegionLocationTableEntry($offset, $index & 0xff, $timestamp); $this->locationTable[$i] = new RegionLocationTableEntry($offset, $index & 0xff, $timestamp);
$this->lastSector = max($this->lastSector, $this->locationTable[$i]->getLastSector()); $this->bumpNextFreeSector($this->locationTable[$i]);
} }
fseek($this->filePointer, 0); fseek($this->filePointer, 0);
@ -319,12 +320,15 @@ class RegionLoader{
protected function createBlank() : void{ protected function createBlank() : void{
fseek($this->filePointer, 0); fseek($this->filePointer, 0);
ftruncate($this->filePointer, 8192); // this fills the file with the null byte ftruncate($this->filePointer, 8192); // this fills the file with the null byte
$this->lastSector = 1;
for($i = 0; $i < 1024; ++$i){ for($i = 0; $i < 1024; ++$i){
$this->locationTable[$i] = new RegionLocationTableEntry(0, 0, 0); $this->locationTable[$i] = new RegionLocationTableEntry(0, 0, 0);
} }
} }
private function bumpNextFreeSector(RegionLocationTableEntry $entry) : void{
$this->nextSector = max($this->nextSector, $entry->getLastSector()) + 1;
}
public function getFilePath() : string{ public function getFilePath() : string{
return $this->filePath; return $this->filePath;
} }