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

Issue 1843 - RCON worker threads synchronization corrected

Browse Source
This commit is contained in:
Milosz Danielewski 2014-08-07 10:19:23 +02:00
parent 269a10fadd
commit 5242e87026
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/network/rcon/RCON.php
View File

@ -85,11 +85,15 @@ class RCON{
}elseif($this->workers[$n]->isWaiting()){ }elseif($this->workers[$n]->isWaiting()){
if($this->workers[$n]->response !== ""){ if($this->workers[$n]->response !== ""){
MainLogger::getLogger()->info($this->workers[$n]->response); MainLogger::getLogger()->info($this->workers[$n]->response);
$this->workers[$n]->notify(); $this->workers[$n]->synchronized(function($thread){
$thread->notify();
}, $this->workers[$n]);
}else{ }else{
Server::getInstance()->dispatchCommand($response = new RemoteConsoleCommandSender(), $this->workers[$n]->cmd); Server::getInstance()->dispatchCommand($response = new RemoteConsoleCommandSender(), $this->workers[$n]->cmd);
$this->workers[$n]->response = TextFormat::clean($response->getMessage()); $this->workers[$n]->response = TextFormat::clean($response->getMessage());
$this->workers[$n]->notify(); $this->workers[$n]->synchronized(function($thread){
$thread->notify();
}, $this->workers[$n]);
} }
} }
} }

8
src/pocketmine/network/rcon/RCONInstance.php
View File

@ -133,7 +133,9 @@ class RCONInstance extends \Thread{
if($payload === $this->password){ if($payload === $this->password){
@socket_getpeername($client, $addr, $port); @socket_getpeername($client, $addr, $port);
$this->response = "[INFO] Successful Rcon connection from: /$addr:$port"; $this->response = "[INFO] Successful Rcon connection from: /$addr:$port";
$this->wait(); $this->synchronized(function($thread){
$thread->wait();
}, $this);
$this->response = ""; $this->response = "";
$this->writePacket($client, $requestID, 2, ""); $this->writePacket($client, $requestID, 2, "");
$this->{"status" . $n} = 1; $this->{"status" . $n} = 1;
@ -150,7 +152,9 @@ class RCONInstance extends \Thread{
} }
if(strlen($payload) > 0){ if(strlen($payload) > 0){
$this->cmd = ltrim($payload); $this->cmd = ltrim($payload);
$this->wait(); $this->synchronized(function($thread){
$thread->wait();
}, $this);
$this->writePacket($client, $requestID, 0, str_replace("\n", "\r\n", trim($this->response))); $this->writePacket($client, $requestID, 0, str_replace("\n", "\r\n", trim($this->response)));
$this->response = ""; $this->response = "";
$this->cmd = ""; $this->cmd = "";