Added real memory and thread usage

This commit is contained in:
Shoghi Cervantes
2015-03-16 11:56:00 +01:00
parent 4383e272eb
commit 4ec584d800
4 changed files with 69 additions and 27 deletions

View File

@ -30,6 +30,7 @@ namespace pocketmine\utils;
class Utils{
public static $online = true;
public static $ip = false;
public static $os;
/**
* Generates an unique identifier to a callable
@ -149,27 +150,31 @@ class Utils{
*
* @return string
*/
public static function getOS(){
$uname = php_uname("s");
if(stripos($uname, "Darwin") !== false){
if(strpos(php_uname("m"), "iP") === 0){
return "ios";
public static function getOS($recalculate = false){
if(self::$os === null or $recalculate){
$uname = php_uname("s");
if(stripos($uname, "Darwin") !== false){
if(strpos(php_uname("m"), "iP") === 0){
self::$os = "ios";
}else{
self::$os = "mac";
}
}elseif(stripos($uname, "Win") !== false or $uname === "Msys"){
self::$os = "win";
}elseif(stripos($uname, "Linux") !== false){
if(@file_exists("/system/build.prop")){
self::$os = "android";
}else{
self::$os = "linux";
}
}elseif(stripos($uname, "BSD") !== false or $uname === "DragonFly"){
self::$os = "bsd";
}else{
return "mac";
self::$os = "other";
}
}elseif(stripos($uname, "Win") !== false or $uname === "Msys"){
return "win";
}elseif(stripos($uname, "Linux") !== false){
if(@file_exists("/system/build.prop")){
return "android";
}else{
return "linux";
}
}elseif(stripos($uname, "BSD") !== false or $uname === "DragonFly"){
return "bsd";
}else{
return "other";
}
return self::$os;
}
/**