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

Fixed thread generator crashing, added thread generator garbage collector, fixed generation queues

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-06-14 23:59:31 +02:00
parent 30318569e1
commit 6977833b1a
6 changed files with 90 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/pocketmine/level/generator/GenerationManager.php
View File

@ -22,6 +22,7 @@
namespace pocketmine\level\generator;
use pocketmine\level\format\SimpleChunk;
use pocketmine\level\Level;
use pocketmine\utils\Binary;
class GenerationManager{
@ -97,6 +98,8 @@ class GenerationManager{
/** @var GenerationChunkManager[] */
protected $levels = [];
protected $generatedQueue = [];
/** @var \SplQueue */
protected $requestQueue;
@ -131,16 +134,23 @@ class GenerationManager{
protected function openLevel($levelID, $seed, $class, array $options){
if(!isset($this->levels[$levelID])){
$this->levels[$levelID] = new GenerationChunkManager($this, $levelID, $seed, $class, $options);
$this->generatedQueue[$levelID] = [];
}
}
protected function generateChunk($levelID, $chunkX, $chunkZ){
if(isset($this->levels[$levelID])){
if(isset($this->levels[$levelID]) and !isset($this->generatedQueue[$levelID][$index = Level::chunkHash($chunkX, $chunkZ)])){
$this->levels[$levelID]->populateChunk($chunkX, $chunkZ); //Request population directly
if(isset($this->levels[$levelID])){
$this->sendChunk($levelID, $this->levels[$levelID]->getChunk($chunkX, $chunkZ));
$this->generatedQueue[$levelID][$index] = true;
if(count($this->generatedQueue[$levelID]) > 6){
$this->levels[$levelID]->doGarbageCollection();
foreach($this->levels[$levelID]->getChangedChunks(true) as $chunk){
$this->sendChunk($levelID, $chunk);
}
$this->generatedQueue[$levelID] = [];
}
}
//TODO: wait for queue generation (to wait for extra chunk changes)
}
}
@ -148,6 +158,7 @@ class GenerationManager{
if(!isset($this->levels[$levelID])){
$this->levels[$levelID]->shutdown();
unset($this->levels[$levelID]);
unset($this->generatedQueue[$levelID]);
}
}
@ -193,13 +204,24 @@ class GenerationManager{
@socket_write($this->socket, Binary::writeInt(strlen($binary)) . $binary);
}
protected function socketRead($len){
$buffer = "";
while(strlen($buffer) < $len){
$buffer .= @socket_read($this->socket, $len - strlen($buffer));
}
return $buffer;
}
protected function readPacket(){
$len = @socket_read($this->socket, 4);
if($len === false or $len === ""){
$len = $this->socketRead(4);
if(($len = Binary::readInt($len)) <= 0){
$this->shutdown = true;
$this->getLogger()->critical("Generation Thread found a stream error, shutting down");
return;
}
$packet = socket_read($this->socket, Binary::readInt($len));
$packet = $this->socketRead($len);
$pid = ord($packet{0});
$offset = 1;
if($pid === self::PACKET_REQUEST_CHUNK){
@ -209,13 +231,11 @@ class GenerationManager{
$offset += 4;
$chunkZ = Binary::readInt(substr($packet, $offset, 4));
$this->enqueueChunk($levelID, $chunkX, $chunkZ);
}elseif($pid === self::PACKET_SEND_CHUNK){
$levelID = Binary::readInt(substr($packet, $offset, 4));
$offset += 4;
$chunk = SimpleChunk::fromBinary(substr($packet, $offset));
$this->receiveChunk($levelID, $chunk);
}elseif($pid === self::PACKET_OPEN_LEVEL){
$levelID = Binary::readInt(substr($packet, $offset, 4));
$offset += 4;
@ -227,7 +247,6 @@ class GenerationManager{
$offset += $len;
$options = unserialize(substr($packet, $offset));
$this->openLevel($levelID, $seed, $class, $options);
}elseif($pid === self::PACKET_CLOSE_LEVEL){
$levelID = Binary::readInt(substr($packet, $offset, 4));
$this->closeLevel($levelID);