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

RegionLoader: mark area as garbage in removeChunk()

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-12-27 19:16:05 +00:00
parent 5920b0ba40
commit 15401d740f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,6 +182,23 @@ class RegionLoader{
return $this->isChunkGenerated(self::getChunkOffset($x, $z)); return $this->isChunkGenerated(self::getChunkOffset($x, $z));
} }
private function disposeGarbageArea(RegionLocationTableEntry $oldLocation) : void{
/* release the area containing the old copy to the garbage pool */
$this->garbageTable->add($oldLocation);
$endGarbage = $this->garbageTable->end();
$nextSector = $this->nextSector;
for(; $endGarbage !== null and $endGarbage->getLastSector() + 1 === $nextSector; $endGarbage = $this->garbageTable->end()){
$nextSector = $endGarbage->getFirstSector();
$this->garbageTable->remove($endGarbage);
}
if($nextSector !== $this->nextSector){
$this->nextSector = $nextSector;
ftruncate($this->filePointer, $this->nextSector << 12);
}
}
/** /**
* @return void * @return void
* @throws ChunkException * @throws ChunkException
@ -226,20 +243,7 @@ class RegionLoader{
$this->writeLocationIndex($index); $this->writeLocationIndex($index);
if($oldLocation !== null){ if($oldLocation !== null){
/* release the area containing the old copy to the garbage pool */ $this->disposeGarbageArea($oldLocation);
$this->garbageTable->add($oldLocation);
$endGarbage = $this->garbageTable->end();
$nextSector = $this->nextSector;
for(; $endGarbage !== null and $endGarbage->getLastSector() + 1 === $nextSector; $endGarbage = $this->garbageTable->end()){
$nextSector = $endGarbage->getFirstSector();
$this->garbageTable->remove($endGarbage);
}
if($nextSector !== $this->nextSector){
$this->nextSector = $nextSector;
ftruncate($this->filePointer, $this->nextSector << 12);
}
} }
} }
@ -249,8 +253,12 @@ class RegionLoader{
*/ */
public function removeChunk(int $x, int $z){ public function removeChunk(int $x, int $z){
$index = self::getChunkOffset($x, $z); $index = self::getChunkOffset($x, $z);
$oldLocation = $this->locationTable[$index];
$this->locationTable[$index] = null; $this->locationTable[$index] = null;
$this->writeLocationIndex($index); $this->writeLocationIndex($index);
if($oldLocation !== null){
$this->disposeGarbageArea($oldLocation);
}
} }
/** /**