mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

START_TIME START_MEM 更改为 THINK_START_TIME THINK_START_MEM

Browse Source
This commit is contained in:
thinkphp
2016-07-01 14:03:32 +08:00
parent afa2bd8bbe
commit 2d85cf4a7f
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base.php
View File

@@ -9,9 +9,9 @@
// | Author: liu21st <liu21st@gmail.com> // | Author: liu21st <liu21st@gmail.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
define('THINK_VERSION', '5.0.0 RC3'); define('THINK_VERSION', '5.0.0 RC4');
define('START_TIME', number_format(microtime(true), 8, '.', '')); define('THINK_START_TIME', number_format(microtime(true), 8, '.', ''));
define('START_MEM', memory_get_usage()); define('THINK_START_MEM', memory_get_usage());
define('EXT', '.php'); define('EXT', '.php');
define('DS', DIRECTORY_SEPARATOR); define('DS', DIRECTORY_SEPARATOR);
defined('THINK_PATH') or define('THINK_PATH', __DIR__ . DS); defined('THINK_PATH') or define('THINK_PATH', __DIR__ . DS);

2
library/think/Debug.php
View File

@@ -63,7 +63,7 @@ class Debug
*/ */
public static function getUseTime($dec = 6) public static function getUseTime($dec = 6)
{ {
return number_format((microtime(true) - START_TIME), $dec); return number_format((microtime(true) - THINK_START_TIME), $dec);
} }
/** /**

4
library/think/debug/Console.php
View File

@@ -42,9 +42,9 @@ class Console
public function output(array $log = []) 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); $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'])) { if (isset($_SERVER['HTTP_HOST'])) {
$uri = $_SERVER['SERVER_PROTOCOL'] . ' ' . $_SERVER['REQUEST_METHOD'] . ' : ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; $uri = $_SERVER['SERVER_PROTOCOL'] . ' ' . $_SERVER['REQUEST_METHOD'] . ' : ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];

4
library/think/debug/Html.php
View File

@@ -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); $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信息 // 页面Trace信息
if (isset($_SERVER['HTTP_HOST'])) { if (isset($_SERVER['HTTP_HOST'])) {

4
library/think/debug/Socket.php
View File

@@ -65,10 +65,10 @@ class Socket
if (!$this->check()) { if (!$this->check()) {
return false; 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); $reqs = number_format(1 / number_format($runtime, 8), 2);
$time_str = " [运行时间：{$runtime}s][吞吐率：{$reqs}req/s]"; $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]"; $memory_str = " [内存消耗：{$memory_use}kb]";
$file_load = " [文件加载：" . count(get_included_files()) . "]"; $file_load = " [文件加载：" . count(get_included_files()) . "]";

4
library/think/log/driver/File.php
View File

@@ -54,10 +54,10 @@ class File
} else { } else {
$current_uri = "cmd:" . implode(' ', $_SERVER['argv']); $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); $reqs = number_format(1 / $runtime, 2);
$time_str = " [运行时间：{$runtime}s] [吞吐率：{$reqs}req/s]"; $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]"; $memory_str = " [内存消耗：{$memory_use}kb]";
$file_load = " [文件加载：" . count(get_included_files()) . "]"; $file_load = " [文件加载：" . count(get_included_files()) . "]";

4
library/think/log/driver/Sae.php
View File

@@ -33,10 +33,10 @@ class Sae
} else { } else {
$current_uri = "cmd:" . implode(' ', $_SERVER['argv']); $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); $reqs = number_format(1 / $runtime, 2);
$time_str = " [运行时间：{$runtime}s] [吞吐率：{$reqs}req/s]"; $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]"; $memory_str = " [内存消耗：{$memory_use}kb]";
$file_load = " [文件加载：" . count(get_included_files()) . "]"; $file_load = " [文件加载：" . count(get_included_files()) . "]";

4
tests/thinkphp/baseTest.php
View File

@@ -16,8 +16,8 @@ class baseTest extends \PHPUnit_Framework_TestCase
{ {
public function testConstants() public function testConstants()
{ {
$this->assertNotEmpty(START_TIME); $this->assertNotEmpty(THINK_START_TIME);
$this->assertNotEmpty(START_MEM); $this->assertNotEmpty(THINK_START_MEM);
$this->assertNotEmpty(THINK_VERSION); $this->assertNotEmpty(THINK_VERSION);
$this->assertNotEmpty(DS); $this->assertNotEmpty(DS);
$this->assertNotEmpty(THINK_PATH); $this->assertNotEmpty(THINK_PATH);