From 0715c05ed959ea887fcc60c34757c89bd6a4ce24 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 4 Feb 2015 10:25:21 -0800 Subject: [PATCH] Remove obvious function-level profiling Change-Id: I85f65a65abb5b91b44441caa21fb9c5e8edb2ebe --- AbuseFilter.class.php | 38 ++------------------------------------ AbuseFilter.parser.php | 38 +++----------------------------------- 2 files changed, 5 insertions(+), 71 deletions(-) diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php index 34c638f8c..70d20d6bc 100644 --- a/AbuseFilter.class.php +++ b/AbuseFilter.class.php @@ -400,8 +400,6 @@ class AbuseFilter { static $parser, $lastVars; - wfProfileIn( __METHOD__ ); - if ( is_null( $parser ) || $vars !== $lastVars ) { /** @var $parser AbuseFilterParser */ $parser = new $wgAbuseFilterParserClass( $vars ); @@ -421,8 +419,6 @@ class AbuseFilter { } } - wfProfileOut( __METHOD__ ); - return $result; } @@ -436,8 +432,6 @@ class AbuseFilter { */ public static function checkAllFilters( $vars, $group = 'default' ) { // Fetch from the database. - wfProfileIn( __METHOD__ ); - $filter_matched = array(); $dbr = wfGetDB( DB_SLAVE ); @@ -494,8 +488,6 @@ class AbuseFilter { // Update statistics, and disable filters which are over-blocking. self::recordStats( $filter_matched, $group ); - wfProfileOut( __METHOD__ ); - return $filter_matched; } @@ -719,7 +711,6 @@ class AbuseFilter { */ public static function executeFilterActions( $filters, $title, $vars ) { global $wgMainCacheType; - wfProfileIn( __METHOD__ ); $actionsByFilter = self::getConsequencesForFilters( $filters ); $actionsTaken = array_fill_keys( $filters, array() ); @@ -814,10 +805,7 @@ class AbuseFilter { } } - $status = self::buildStatus( $actionsTaken, $messages ); - - wfProfileOut( __METHOD__ ); - return $status; + return self::buildStatus( $actionsTaken, $messages ); } /** @@ -855,8 +843,6 @@ class AbuseFilter { public static function filterAction( $vars, $title, $group = 'default' ) { global $wgUser, $wgTitle, $wgRequest; - wfProfileIn( __METHOD__ ); - $context = RequestContext::getMain(); $oldContextTitle = $context->getTitle(); @@ -921,8 +907,6 @@ class AbuseFilter { $context->setTitle( $oldContextTitle ); } - wfProfileOut( __METHOD__ ); - return $status; } @@ -935,7 +919,6 @@ class AbuseFilter { * @return mixed */ public static function addLogEntries( $actions_taken, $log_template, $action, $vars, $group = 'default' ) { - wfProfileIn( __METHOD__ ); $dbw = wfGetDB( DB_MASTER ); $central_log_template = array( @@ -977,7 +960,6 @@ class AbuseFilter { } if ( !count( $log_rows ) ) { - wfProfileOut( __METHOD__ ); return; } @@ -1089,8 +1071,6 @@ class AbuseFilter { self::checkEmergencyDisable( $group, $logged_local_filters, $total ); wfProfileOut( __METHOD__ . '-hitstats' ); - - wfProfileOut( __METHOD__ ); } /** @@ -1103,8 +1083,6 @@ class AbuseFilter { * @return int */ public static function storeVarDump( $vars, $global = false ) { - wfProfileIn( __METHOD__ ); - global $wgCompressRevisions; // Get all variables yet set and compute old and new wikitext if not yet done @@ -1134,7 +1112,6 @@ class AbuseFilter { if ( !$text ) { // Not mission-critical, just return nothing - wfProfileOut( __METHOD__ ); return null; } } @@ -1153,10 +1130,7 @@ class AbuseFilter { 'old_flags' => implode( ',', $flags ), ), __METHOD__ ); - $text_id = $dbw->insertId(); - wfProfileOut( __METHOD__ ); - - return $text_id; + return $dbw->insertId(); } /** @@ -1168,11 +1142,8 @@ class AbuseFilter { * @return object|AbuseFilterVariableHolder|bool */ public static function loadVarDump( $stored_dump ) { - wfProfileIn( __METHOD__ ); - // Back-compat if ( strpos( $stored_dump, 'stored-text:' ) === false ) { - wfProfileOut( __METHOD__ ); return unserialize( $stored_dump ); } @@ -1188,7 +1159,6 @@ class AbuseFilter { ); if ( !$text_row ) { - wfProfileOut( __METHOD__ ); return new AbuseFilterVariableHolder; } @@ -1213,7 +1183,6 @@ class AbuseFilter { } } - wfProfileOut( __METHOD__ ); return $obj; } @@ -1572,8 +1541,6 @@ class AbuseFilter { public static function recordStats( $filters, $group = 'default' ) { global $wgAbuseFilterConditionLimit, $wgMemc; - wfProfileIn( __METHOD__ ); - // Figure out if we've triggered overflows and blocks. $overflow_triggered = ( self::$condCount > $wgAbuseFilterConditionLimit ); @@ -1604,7 +1571,6 @@ class AbuseFilter { if ( $overflow_triggered ) { $wgMemc->incr( $overflow_key ); } - wfProfileOut( __METHOD__ ); } /** diff --git a/AbuseFilter.parser.php b/AbuseFilter.parser.php index 13a23ffe6..82a9ab729 100644 --- a/AbuseFilter.parser.php +++ b/AbuseFilter.parser.php @@ -719,13 +719,12 @@ class AbuseFilterParser { /** * @return AFPToken */ - protected function move( ) { - wfProfileIn( __METHOD__ ); + protected function move() { list( $val, $type, , $offset ) = self::nextToken( $this->mCode, $this->mPos ); $token = new AFPToken( $type, $val, $this->mPos ); $this->mPos = $offset; - wfProfileOut( __METHOD__ ); + return $this->mCur = $token; } @@ -757,7 +756,6 @@ class AbuseFilterParser { } $braces = 1; - wfProfileIn( __METHOD__ ); while ( $this->mCur->type != AFPToken::TNone && $braces > 0 ) { $this->move(); if ( $this->mCur->type == AFPToken::TBrace ) { @@ -768,7 +766,6 @@ class AbuseFilterParser { } } } - wfProfileOut( __METHOD__ ); if ( !( $this->mCur->type == AFPToken::TBrace && $this->mCur->value == ')' ) ) throw new AFPUserVisibleException( 'expectednotfound', $this->mCur->pos, array( ')' ) ); } @@ -1058,9 +1055,7 @@ class AbuseFilterParser { $this->doLevelCompares( $r2 ); - wfProfileIn( __METHOD__ ); $result = AFPData::boolOp( $result, $r2, $op ); - wfProfileOut( __METHOD__ ); } } @@ -1076,9 +1071,7 @@ class AbuseFilterParser { $this->move(); $r2 = new AFPData(); $this->doLevelSumRels( $r2 ); - wfProfileIn( __METHOD__ ); $result = AFPData::compareOp( $result, $r2, $op ); - wfProfileOut( __METHOD__ ); } } @@ -1087,7 +1080,6 @@ class AbuseFilterParser { */ protected function doLevelSumRels( &$result ) { $this->doLevelMulRels( $result ); - wfProfileIn( __METHOD__ ); $ops = array( '+', '-' ); while ( $this->mCur->type == AFPToken::TOp && in_array( $this->mCur->value, $ops ) ) { $op = $this->mCur->value; @@ -1101,7 +1093,6 @@ class AbuseFilterParser { $result = AFPData::sub( $result, $r2 ); } } - wfProfileOut( __METHOD__ ); } /** @@ -1109,7 +1100,6 @@ class AbuseFilterParser { */ protected function doLevelMulRels( &$result ) { $this->doLevelPow( $result ); - wfProfileIn( __METHOD__ ); $ops = array( '*', '/', '%' ); while ( $this->mCur->type == AFPToken::TOp && in_array( $this->mCur->value, $ops ) ) { $op = $this->mCur->value; @@ -1118,7 +1108,6 @@ class AbuseFilterParser { $this->doLevelPow( $r2 ); $result = AFPData::mulRel( $result, $r2, $op, $this->mCur->pos ); } - wfProfileOut( __METHOD__ ); } /** @@ -1126,14 +1115,12 @@ class AbuseFilterParser { */ protected function doLevelPow( &$result ) { $this->doLevelBoolInvert( $result ); - wfProfileIn( __METHOD__ ); while ( $this->mCur->type == AFPToken::TOp && $this->mCur->value == '**' ) { $this->move(); $expanent = new AFPData(); $this->doLevelBoolInvert( $expanent ); $result = AFPData::pow( $result, $expanent ); } - wfProfileOut( __METHOD__ ); } /** @@ -1143,9 +1130,7 @@ class AbuseFilterParser { if ( $this->mCur->type == AFPToken::TOp && $this->mCur->value == '!' ) { $this->move(); $this->doLevelSpecialWords( $result ); - wfProfileIn( __METHOD__ ); $result = AFPData::boolInvert( $result ); - wfProfileOut( __METHOD__ ); } else { $this->doLevelSpecialWords( $result ); } @@ -1176,12 +1161,9 @@ class AbuseFilterParser { return; // The result doesn't matter. } - wfProfileIn( __METHOD__ ); - wfProfileIn( __METHOD__ . "-$func" ); $result = AFPData::$func( $result, $r2, $this->mCur->pos ); wfProfileOut( __METHOD__ . "-$func" ); - wfProfileOut( __METHOD__ ); } } @@ -1193,11 +1175,9 @@ class AbuseFilterParser { if ( $this->mCur->type == AFPToken::TOp && ( $op == "+" || $op == "-" ) ) { $this->move(); $this->doLevelListElements( $result ); - wfProfileIn( __METHOD__ ); if ( $op == '-' ) { $result = AFPData::unaryMinus( $result ); } - wfProfileOut( __METHOD__ ); } else { $this->doLevelListElements( $result ); } @@ -1259,7 +1239,6 @@ class AbuseFilterParser { */ protected function doLevelFunction( &$result ) { if ( $this->mCur->type == AFPToken::TID && isset( self::$mFunctions[$this->mCur->value] ) ) { - wfProfileIn( __METHOD__ ); $func = self::$mFunctions[$this->mCur->value]; $this->move(); if ( $this->mCur->type != AFPToken::TBrace || $this->mCur->value != '(' ) { @@ -1276,7 +1255,6 @@ class AbuseFilterParser { if ( $this->mShortCircuit ) { $this->skipOverBraces(); $this->move(); - wfProfileOut( __METHOD__ ); return; // The result doesn't matter. } @@ -1319,7 +1297,6 @@ class AbuseFilterParser { } wfProfileOut( __METHOD__ . "-$func" ); - wfProfileOut( __METHOD__ ); } else { $this->doLevelAtom( $result ); } @@ -1331,7 +1308,6 @@ class AbuseFilterParser { * @return AFPData */ protected function doLevelAtom( &$result ) { - wfProfileIn( __METHOD__ ); $tok = $this->mCur->value; switch( $this->mCur->type ) { case AFPToken::TID: @@ -1358,7 +1334,6 @@ class AbuseFilterParser { } elseif ( $tok == "null" ) { $result = new AFPData(); } else { - wfProfileOut( __METHOD__ ); throw new AFPUserVisibleException( 'unrecognisedkeyword', $this->mCur->pos, @@ -1367,11 +1342,9 @@ class AbuseFilterParser { } break; case AFPToken::TNone: - wfProfileOut( __METHOD__ ); return; // Handled at entry level case AFPToken::TBrace: if ( $this->mCur->value == ')' ) { - wfProfileOut( __METHOD__ ); return; // Handled at the entry level } case AFPToken::TSquareBracket: @@ -1410,7 +1383,6 @@ class AbuseFilterParser { ); } $this->move(); - wfProfileOut( __METHOD__ ); } /* End of levels */ @@ -1421,22 +1393,18 @@ class AbuseFilterParser { * @throws AFPUserVisibleException */ protected function getVarValue( $var ) { - wfProfileIn( __METHOD__ ); $var = strtolower( $var ); $builderValues = AbuseFilter::getBuilderValues(); if ( !( array_key_exists( $var, $builderValues['vars'] ) || $this->mVars->varIsSet( $var ) ) ) { // If the variable is invalid, throw an exception - wfProfileOut( __METHOD__ ); throw new AFPUserVisibleException( 'unrecognisedvar', $this->mCur->pos, array( $var ) ); } else { - $val = $this->mVars->getVar( $var ); - wfProfileOut( __METHOD__ ); - return $val; + return $this->mVars->getVar( $var ); } }