GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Revert "add some timing comments to output to debug poor performance"

Browse Source 
This reverts commit a2782523d7.
This commit is contained in:
Evan Prodromou
2011-04-07 00:07:39 -04:00
parent a1fa47d904
commit ca0f59d46a
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/action.php
View File

@@ -118,7 +118,7 @@ class Action extends HTMLOutputter // lawsuit
}
}
function timingComment()
function endHTML()
{
global $_startTime;
@@ -127,15 +127,10 @@ class Action extends HTMLOutputter // lawsuit
$diff = round(($endTime - $_startTime) * 1000);
$this->raw("<!-- ${diff}ms -->");
}
}
function endHTML()
{
$this->timingComment();
return parent::endHTML();
}
/**
* Show head, a template method.
*
@@ -144,7 +139,6 @@ class Action extends HTMLOutputter // lawsuit
function showHead()
{
// XXX: attributes (profile?)
$this->timingComment();
$this->elementStart('head');
if (Event::handle('StartShowHeadElements', array($this))) {
if (Event::handle('StartShowHeadTitle', array($this))) {
@@ -160,7 +154,6 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowHeadElements', array($this));
}
$this->elementEnd('head');
$this->timingComment();
}
/**
@@ -474,31 +467,25 @@ class Action extends HTMLOutputter // lawsuit
*/
function showBody()
{
$this->timingComment();
$this->elementStart('body', (common_current_user()) ? array('id' => strtolower($this->trimmed('action')),
'class' => 'user_in')
: array('id' => strtolower($this->trimmed('action'))));
$this->elementStart('div', array('id' => 'wrap'));
if (Event::handle('StartShowHeader', array($this))) {
$this->timingComment();
$this->showHeader();
$this->flush();
$this->timingComment();
Event::handle('EndShowHeader', array($this));
}
$this->showCore();
$this->flush();
if (Event::handle('StartShowFooter', array($this))) {
$this->timingComment();
$this->showFooter();
$this->flush();
$this->timingComment();
Event::handle('EndShowFooter', array($this));
}
$this->elementEnd('div');
$this->showScripts();
$this->elementEnd('body');
$this->timingComment();
}
/**
@@ -716,24 +703,18 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('div', array('id' => 'content_wrapper'));
$this->elementStart('div', array('id' => 'site_nav_local_views_wrapper'));
if (Event::handle('StartShowLocalNavBlock', array($this))) {
$this->timingComment();
$this->showLocalNavBlock();
$this->flush();
$this->timingComment();
Event::handle('EndShowLocalNavBlock', array($this));
}
if (Event::handle('StartShowContentBlock', array($this))) {
$this->timingComment();
$this->showContentBlock();
$this->flush();
$this->timingComment();
Event::handle('EndShowContentBlock', array($this));
}
if (Event::handle('StartShowAside', array($this))) {
$this->timingComment();
$this->showAside();
$this->flush();
$this->timingComment();
Event::handle('EndShowAside', array($this));
}
$this->elementEnd('div');