diff --git a/base.php b/base.php index 78b3f920..66d53e9f 100644 --- a/base.php +++ b/base.php @@ -9,9 +9,9 @@ // | Author: liu21st // +---------------------------------------------------------------------- -define('THINK_VERSION', '5.0.0 RC3'); -define('START_TIME', number_format(microtime(true), 8, '.', '')); -define('START_MEM', memory_get_usage()); +define('THINK_VERSION', '5.0.0 RC4'); +define('THINK_START_TIME', number_format(microtime(true), 8, '.', '')); +define('THINK_START_MEM', memory_get_usage()); define('EXT', '.php'); define('DS', DIRECTORY_SEPARATOR); defined('THINK_PATH') or define('THINK_PATH', __DIR__ . DS); diff --git a/library/think/Debug.php b/library/think/Debug.php index 92ad638e..1c0d12a4 100644 --- a/library/think/Debug.php +++ b/library/think/Debug.php @@ -63,7 +63,7 @@ class Debug */ public static function getUseTime($dec = 6) { - return number_format((microtime(true) - START_TIME), $dec); + return number_format((microtime(true) - THINK_START_TIME), $dec); } /** diff --git a/library/think/debug/Console.php b/library/think/debug/Console.php index 6e89b9be..6eacf23c 100644 --- a/library/think/debug/Console.php +++ b/library/think/debug/Console.php @@ -42,9 +42,9 @@ class Console public function output(array $log = []) { // 获取基本信息 - $runtime = number_format(microtime(true), 8, '.', '') - START_TIME; + $runtime = number_format(microtime(true), 8, '.', '') - THINK_START_TIME; $reqs = number_format(1 / $runtime, 2); - $mem = number_format((memory_get_usage() - START_MEM) / 1024, 2); + $mem = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); if (isset($_SERVER['HTTP_HOST'])) { $uri = $_SERVER['SERVER_PROTOCOL'] . ' ' . $_SERVER['REQUEST_METHOD'] . ' : ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; diff --git a/library/think/debug/Html.php b/library/think/debug/Html.php index 0426fb41..7f16dc0e 100644 --- a/library/think/debug/Html.php +++ b/library/think/debug/Html.php @@ -43,9 +43,9 @@ class Html { // 获取基本信息 - $runtime = number_format(microtime(true), 8, '.', '') - START_TIME; + $runtime = number_format(microtime(true), 8, '.', '') - THINK_START_TIME; $reqs = number_format(1 / $runtime, 2); - $mem = number_format((memory_get_usage() - START_MEM) / 1024, 2); + $mem = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); // 页面Trace信息 if (isset($_SERVER['HTTP_HOST'])) { diff --git a/library/think/debug/Socket.php b/library/think/debug/Socket.php index 9433dd09..ae018a04 100644 --- a/library/think/debug/Socket.php +++ b/library/think/debug/Socket.php @@ -65,10 +65,10 @@ class Socket if (!$this->check()) { return false; } - $runtime = number_format(microtime(true), 8, '.', '') - START_TIME; + $runtime = number_format(microtime(true), 8, '.', '') - THINK_START_TIME; $reqs = number_format(1 / number_format($runtime, 8), 2); $time_str = " [运行时间:{$runtime}s][吞吐率:{$reqs}req/s]"; - $memory_use = number_format((memory_get_usage() - START_MEM) / 1024, 2); + $memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); $memory_str = " [内存消耗:{$memory_use}kb]"; $file_load = " [文件加载:" . count(get_included_files()) . "]"; diff --git a/library/think/log/driver/File.php b/library/think/log/driver/File.php index 76ade7ee..b3a077b2 100644 --- a/library/think/log/driver/File.php +++ b/library/think/log/driver/File.php @@ -54,10 +54,10 @@ class File } else { $current_uri = "cmd:" . implode(' ', $_SERVER['argv']); } - $runtime = number_format(microtime(true), 8, '.', '') - START_TIME; + $runtime = number_format(microtime(true), 8, '.', '') - THINK_START_TIME; $reqs = number_format(1 / $runtime, 2); $time_str = " [运行时间:{$runtime}s] [吞吐率:{$reqs}req/s]"; - $memory_use = number_format((memory_get_usage() - START_MEM) / 1024, 2); + $memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); $memory_str = " [内存消耗:{$memory_use}kb]"; $file_load = " [文件加载:" . count(get_included_files()) . "]"; diff --git a/library/think/log/driver/Sae.php b/library/think/log/driver/Sae.php index a45f3a62..c593c09e 100644 --- a/library/think/log/driver/Sae.php +++ b/library/think/log/driver/Sae.php @@ -33,10 +33,10 @@ class Sae } else { $current_uri = "cmd:" . implode(' ', $_SERVER['argv']); } - $runtime = number_format(microtime(true), 8, '.', '') - START_TIME; + $runtime = number_format(microtime(true), 8, '.', '') - THINK_START_TIME; $reqs = number_format(1 / $runtime, 2); $time_str = " [运行时间:{$runtime}s] [吞吐率:{$reqs}req/s]"; - $memory_use = number_format((memory_get_usage() - START_MEM) / 1024, 2); + $memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); $memory_str = " [内存消耗:{$memory_use}kb]"; $file_load = " [文件加载:" . count(get_included_files()) . "]"; diff --git a/tests/thinkphp/baseTest.php b/tests/thinkphp/baseTest.php index 3106a139..18f1d3dd 100644 --- a/tests/thinkphp/baseTest.php +++ b/tests/thinkphp/baseTest.php @@ -16,8 +16,8 @@ class baseTest extends \PHPUnit_Framework_TestCase { public function testConstants() { - $this->assertNotEmpty(START_TIME); - $this->assertNotEmpty(START_MEM); + $this->assertNotEmpty(THINK_START_TIME); + $this->assertNotEmpty(THINK_START_MEM); $this->assertNotEmpty(THINK_VERSION); $this->assertNotEmpty(DS); $this->assertNotEmpty(THINK_PATH);