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

Added separate timings for broadcast and session buffer compression

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-03-04 16:41:41 +00:00
parent f8893efb94
commit a523189149
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Server.php
View File

@ -1381,9 +1381,10 @@ class Server{
* *
* @param bool|null $sync Compression on the main thread (true) or workers (false). Default is automatic (null). * @param bool|null $sync Compression on the main thread (true) or workers (false). Default is automatic (null).
*/ */
public function prepareBatch(PacketBatch $stream, Compressor $compressor, ?bool $sync = null) : CompressBatchPromise{ public function prepareBatch(PacketBatch $stream, Compressor $compressor, ?bool $sync = null, ?TimingsHandler $timings = null) : CompressBatchPromise{
$timings ??= Timings::$playerNetworkSendCompress;
try{ try{
Timings::$playerNetworkSendCompress->startTiming(); $timings->startTiming();
$buffer = $stream->getBuffer(); $buffer = $stream->getBuffer();
@ -1402,7 +1403,7 @@ class Server{
return $promise; return $promise;
}finally{ }finally{
Timings::$playerNetworkSendCompress->stopTiming(); $timings->stopTiming();
} }
} }

2
src/network/mcpe/NetworkSession.php
View File

@ -528,7 +528,7 @@ class NetworkSession{
PacketBatch::encodeRaw($stream, $this->sendBuffer); PacketBatch::encodeRaw($stream, $this->sendBuffer);
if($this->enableCompression){ if($this->enableCompression){
$promise = $this->server->prepareBatch(new PacketBatch($stream->getBuffer()), $this->compressor, $syncMode); $promise = $this->server->prepareBatch(new PacketBatch($stream->getBuffer()), $this->compressor, $syncMode, Timings::$playerNetworkSendCompressSessionBuffer);
}else{ }else{
$promise = new CompressBatchPromise(); $promise = new CompressBatchPromise();
$promise->resolve($stream->getBuffer()); $promise->resolve($stream->getBuffer());

3
src/network/mcpe/StandardPacketBroadcaster.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\network\mcpe;
use pocketmine\network\mcpe\protocol\serializer\PacketBatch; use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
use pocketmine\network\mcpe\protocol\serializer\PacketSerializer; use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
use pocketmine\Server; use pocketmine\Server;
use pocketmine\timings\Timings;
use pocketmine\utils\BinaryStream; use pocketmine\utils\BinaryStream;
use function spl_object_id; use function spl_object_id;
use function strlen; use function strlen;
@ -70,7 +71,7 @@ final class StandardPacketBroadcaster implements PacketBroadcaster{
PacketBatch::encodeRaw($stream, $packetBuffers[$bufferId]); PacketBatch::encodeRaw($stream, $packetBuffers[$bufferId]);
$batchBuffer = $stream->getBuffer(); $batchBuffer = $stream->getBuffer();
$promise = $this->server->prepareBatch(new PacketBatch($batchBuffer), $compressor); $promise = $this->server->prepareBatch(new PacketBatch($batchBuffer), $compressor, timings: Timings::$playerNetworkSendCompressBroadcast);
foreach($compressorTargets as $target){ foreach($compressorTargets as $target){
$target->queueCompressed($promise); $target->queueCompressed($promise);
} }

6
src/timings/Timings.php
View File

@ -52,6 +52,10 @@ abstract class Timings{
public static $playerNetworkSend; public static $playerNetworkSend;
/** @var TimingsHandler */ /** @var TimingsHandler */
public static $playerNetworkSendCompress; public static $playerNetworkSendCompress;
public static TimingsHandler $playerNetworkSendCompressBroadcast;
public static TimingsHandler $playerNetworkSendCompressSessionBuffer;
/** @var TimingsHandler */ /** @var TimingsHandler */
public static $playerNetworkSendEncrypt; public static $playerNetworkSendEncrypt;
/** @var TimingsHandler */ /** @var TimingsHandler */
@ -153,6 +157,8 @@ abstract class Timings{
self::$playerNetworkSend = new TimingsHandler("Player Network Send"); self::$playerNetworkSend = new TimingsHandler("Player Network Send");
self::$playerNetworkSendCompress = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Compression", self::$playerNetworkSend); self::$playerNetworkSendCompress = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Compression", self::$playerNetworkSend);
self::$playerNetworkSendCompressBroadcast = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Compression (Broadcast)", self::$playerNetworkSendCompress);
self::$playerNetworkSendCompressSessionBuffer = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Compression (Session Buffer)", self::$playerNetworkSendCompress);
self::$playerNetworkSendEncrypt = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Encryption", self::$playerNetworkSend); self::$playerNetworkSendEncrypt = new TimingsHandler(self::INCLUDED_BY_OTHER_TIMINGS_PREFIX . "Player Network Send - Encryption", self::$playerNetworkSend);
self::$playerNetworkReceive = new TimingsHandler("Player Network Receive"); self::$playerNetworkReceive = new TimingsHandler("Player Network Receive");