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

Switch back to using fast-serialize for chunk send prepare

Browse Source 
network serialize on the main thread is 3-5x more expensive than fast-serialize right now.
This commit is contained in:
Dylan K. Taylor 2019-06-27 19:28:47 +01:00
parent 0e4966dfdf
commit 872b6ed708
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/network/mcpe/ChunkRequestTask.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\network\mcpe;
use pocketmine\network\mcpe\protocol\FullChunkDataPacket; use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
use pocketmine\scheduler\AsyncTask; use pocketmine\scheduler\AsyncTask;
use pocketmine\world\format\Chunk; use pocketmine\world\format\Chunk;
use pocketmine\world\format\io\FastChunkSerializer;
class ChunkRequestTask extends AsyncTask{ class ChunkRequestTask extends AsyncTask{
private const TLS_KEY_PROMISE = "promise"; private const TLS_KEY_PROMISE = "promise";
@ -40,19 +41,24 @@ class ChunkRequestTask extends AsyncTask{
protected $compressionLevel; protected $compressionLevel;
/** @var string */
private $tiles = "";
public function __construct(int $chunkX, int $chunkZ, Chunk $chunk, CompressBatchPromise $promise, ?\Closure $onError = null){ public function __construct(int $chunkX, int $chunkZ, Chunk $chunk, CompressBatchPromise $promise, ?\Closure $onError = null){
$this->compressionLevel = NetworkCompression::$LEVEL; $this->compressionLevel = NetworkCompression::$LEVEL;
$this->chunk = ChunkSerializer::serialize($chunk); $this->chunk = FastChunkSerializer::serialize($chunk);
$this->chunkX = $chunkX; $this->chunkX = $chunkX;
$this->chunkZ = $chunkZ; $this->chunkZ = $chunkZ;
$this->tiles = ChunkSerializer::serializeTiles($chunk);
$this->storeLocal(self::TLS_KEY_PROMISE, $promise); $this->storeLocal(self::TLS_KEY_PROMISE, $promise);
$this->storeLocal(self::TLS_KEY_ERROR_HOOK, $onError); $this->storeLocal(self::TLS_KEY_ERROR_HOOK, $onError);
} }
public function onRun() : void{ public function onRun() : void{
$this->setResult(NetworkCompression::compress(PacketBatch::fromPackets(FullChunkDataPacket::create($this->chunkX, $this->chunkZ, $this->chunk))->getBuffer(), $this->compressionLevel)); $chunk = ChunkSerializer::serialize(FastChunkSerializer::deserialize($this->chunk), $this->tiles);
$this->setResult(NetworkCompression::compress(PacketBatch::fromPackets(FullChunkDataPacket::create($this->chunkX, $this->chunkZ, $chunk))->getBuffer(), $this->compressionLevel));
} }
public function onError() : void{ public function onError() : void{

17
src/pocketmine/network/mcpe/ChunkSerializer.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\network\mcpe;
use pocketmine\block\tile\Spawnable; use pocketmine\block\tile\Spawnable;
use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping; use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping;
use pocketmine\utils\BinaryStream;
use pocketmine\world\format\Chunk; use pocketmine\world\format\Chunk;
use function count; use function count;
use function pack; use function pack;
@ -36,11 +37,13 @@ final class ChunkSerializer{
} }
/** /**
* @param Chunk $chunk * @param Chunk $chunk
*
* @param string|null $tiles
* *
* @return string * @return string
*/ */
public static function serialize(Chunk $chunk) : string{ public static function serialize(Chunk $chunk, ?string $tiles = null) : string{
$stream = new NetworkBinaryStream(); $stream = new NetworkBinaryStream();
$subChunkCount = $chunk->getSubChunkSendCount(); $subChunkCount = $chunk->getSubChunkSendCount();
$stream->putByte($subChunkCount); $stream->putByte($subChunkCount);
@ -66,6 +69,16 @@ final class ChunkSerializer{
$stream->putByte(0); //border block array count $stream->putByte(0); //border block array count
//Border block entry format: 1 byte (4 bits X, 4 bits Z). These are however useless since they crash the regular client. //Border block entry format: 1 byte (4 bits X, 4 bits Z). These are however useless since they crash the regular client.
if($tiles !== null){
$stream->put($tiles);
}else{
$stream->put(self::serializeTiles($chunk));
}
return $stream->getBuffer();
}
public static function serializeTiles(Chunk $chunk) : string{
$stream = new BinaryStream();
foreach($chunk->getTiles() as $tile){ foreach($chunk->getTiles() as $tile){
if($tile instanceof Spawnable){ if($tile instanceof Spawnable){
$stream->put($tile->getSerializedSpawnCompound()); $stream->put($tile->getSerializedSpawnCompound());