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

Removed restart command due to a huge memory leak

Browse Source 
... Caused by free'd objects looped looping around itself calling each
one and become HAL
This commit is contained in:
Shoghi Cervantes Pueyo 2012-12-12 00:27:14 +01:00
parent fb019a88c1
commit c15f8cfda6
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/API/ConsoleAPI.php
View File

@ -48,11 +48,11 @@ class ConsoleAPI{
console("[INFO] Stopping the server..."); console("[INFO] Stopping the server...");
$this->server->close(); $this->server->close();
break; break;
case "restart": /*case "restart":
console("[INFO] Restarting the server..."); console("[INFO] Restarting the server...");
$this->server->api->restart = true; $this->server->api->restart = true;
$this->server->close(); $this->server->close();
break; break;*/
case "banip": case "banip":
$p = strtolower(array_shift($params)); $p = strtolower(array_shift($params));
switch($p){ switch($p){
@ -179,7 +179,7 @@ class ConsoleAPI{
console("[INFO] /whitelist: Manages whitelisting"); console("[INFO] /whitelist: Manages whitelisting");
console("[INFO] /banip: Manages IP ban"); console("[INFO] /banip: Manages IP ban");
console("[INFO] /stop: Stops the server"); console("[INFO] /stop: Stops the server");
console("[INFO] /restart: Restarts the server"); //console("[INFO] /restart: Restarts the server");
foreach($this->help as $c => $h){ foreach($this->help as $c => $h){
console("[INFO] /$c: ".$h[0]); console("[INFO] /$c: ".$h[0]);
} }

2
classes/API/ServerAPI.php
View File

@ -260,6 +260,8 @@ class ServerAPI extends stdClass{ //Yay! I can add anything to this class in run
public function start(){ public function start(){
$this->server->start(); $this->server->start();
unregister_tick_function(array($this->server, "tick"));
unset($this->server);
return $this->restart; return $this->restart;
} }

2
classes/PocketMinecraftServer.class.php
View File

@ -242,7 +242,7 @@ class PocketMinecraftServer extends stdClass{
public function start(){ public function start(){
declare(ticks=15); declare(ticks=15);
register_tick_function(array($this, "tick")); register_tick_function(array($this, "tick"));
$this->event("onTick", "tickerFunction", true); $this->event("onTick", array($this, "tickerFunction"));
$this->event("onReceivedPacket", "packetHandler", true); $this->event("onReceivedPacket", "packetHandler", true);
register_shutdown_function(array($this, "close")); register_shutdown_function(array($this, "close"));
$this->loadMap(); $this->loadMap();

1
common/config.php
View File

@ -26,6 +26,7 @@ the Free Software Foundation, either version 3 of the License, or
*/ */
set_time_limit(0); set_time_limit(0);
gc_enable();
error_reporting(E_ALL ^ E_NOTICE); error_reporting(E_ALL ^ E_NOTICE);
ini_set("display_errors", 1); ini_set("display_errors", 1);
ini_set('default_charset', 'utf-8'); ini_set('default_charset', 'utf-8');

4
server.php
View File

@ -35,6 +35,8 @@ while(true){
if($server->start() !== true){ if($server->start() !== true){
break; break;
}else{
$server = null;
console("[NOTICE] The server is restarting... (".gc_collect_cycles()." cycles collected)", true, true, 0);
} }
console("[NOTICE] The server is restarting...", true, true, 0);
} }