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

Added EncapsulatedPacket reuse on broadcast

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-10-30 23:13:25 +01:00
parent 8f0527832f
commit f72d7284b9
3 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/Server.php
View File

@ -1720,6 +1720,9 @@ class Server{
foreach($players as $player){ foreach($players as $player){
$player->dataPacket($packet); $player->dataPacket($packet);
} }
if(isset($packet->__encapsulatedPacket)){
unset($packet->__encapsulatedPacket);
}
} }

33
src/pocketmine/network/CachedEncapsulatedPacket.php Normal file
View File

@ -0,0 +1,33 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\network;
use raklib\protocol\EncapsulatedPacket;
class CachedEncapsulatedPacket extends EncapsulatedPacket{
private $internalData = null;
public function toBinary($internal = false){
return $this->internalData === null ? ($this->internalData = parent::toBinary($internal)) : $this->internalData;
}
}

28
src/pocketmine/network/RakLibInterface.php
View File

@ -222,17 +222,31 @@ class RakLibInterface implements ServerInstance, SourceInterface{
public function putPacket(Player $player, DataPacket $packet, $needACK = false, $immediate = false){ public function putPacket(Player $player, DataPacket $packet, $needACK = false, $immediate = false){
if(isset($this->identifiers[$player])){ if(isset($this->identifiers[$player])){
$identifier = $this->identifiers[$player]; $identifier = $this->identifiers[$player];
$pk = null;
if(!$packet->isEncoded){ if(!$packet->isEncoded){
$packet->encode(); $packet->encode();
unset($packet->__encapsulatedPacket);
}elseif(!$needACK){
if(!isset($packet->__encapsulatedPacket)){
$packet->__encapsulatedPacket = new CachedEncapsulatedPacket;
$packet->__encapsulatedPacket->identifierACK = null;
$packet->__encapsulatedPacket->buffer = $packet->buffer;
$packet->__encapsulatedPacket->reliability = 2;
}
$pk = $packet->__encapsulatedPacket;
} }
$pk = EncapsulatedPacket::getPacketFromPool();
$pk->buffer = $packet->buffer; if($pk === null){
$pk->reliability = 2; $pk = EncapsulatedPacket::getPacketFromPool();
if($needACK === true){ $pk->buffer = $packet->buffer;
$pk->identifierACK = $this->identifiersACK[$identifier]++; $pk->reliability = 2;
}else{ if($needACK === true){
$pk->identifierACK = null; $pk->identifierACK = $this->identifiersACK[$identifier]++;
}else{
$pk->identifierACK = null;
}
} }
$this->interface->sendEncapsulated($identifier, $pk, ($needACK === true ? RakLib::FLAG_NEED_ACK : 0) | ($immediate === true ? RakLib::PRIORITY_IMMEDIATE : RakLib::PRIORITY_NORMAL)); $this->interface->sendEncapsulated($identifier, $pk, ($needACK === true ? RakLib::FLAG_NEED_ACK : 0) | ($immediate === true ? RakLib::PRIORITY_IMMEDIATE : RakLib::PRIORITY_NORMAL));
return $pk->identifierACK; return $pk->identifierACK;