jenkins-bot has submitted this change and it was merged.
Change subject: Added profiling to MWHttpRequest and Http.
......................................................................
Added profiling to MWHttpRequest and Http.
Added profile calls to various functions in
MWHttpRequest as well as to the wrapper
function Http::request.
Change-Id: I7f2819a075891dbc565a7524d56e7bf077ab089a
---
M includes/HttpFunctions.php
1 file changed, 30 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index dc65c67..98d36d3 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -58,6 +58,8 @@
*/
public static function request( $method, $url, $options = array() ) {
wfDebug( "HTTP: $method: $url\n" );
+ wfProfileIn( __METHOD__ . "-$method" );
+
$options['method'] = strtoupper( $method );
if ( !isset( $options['timeout'] ) ) {
@@ -68,8 +70,11 @@
$status = $req->execute();
if ( $status->isOK() ) {
- return $req->getContent();
+ $content = $req->getContent();
+ wfProfileOut( __METHOD__ . "-$method" );
+ return $content;
} else {
+ wfProfileOut( __METHOD__ . "-$method" );
return false;
}
}
@@ -427,6 +432,8 @@
public function execute() {
global $wgTitle;
+ wfProfileIn( __METHOD__ );
+
$this->content = "";
if ( strtoupper( $this->method ) == "HEAD" ) {
@@ -446,6 +453,8 @@
if ( !isset( $this->reqHeaders['User-Agent'] ) ) {
$this->setUserAgent( Http::userAgent() );
}
+
+ wfProfileOut( __METHOD__ );
}
/**
@@ -454,6 +463,8 @@
* found in an array in the member variable headerList.
*/
protected function parseHeader() {
+ wfProfileIn( __METHOD__ );
+
$lastname = "";
foreach ( $this->headerList as $header ) {
@@ -470,6 +481,8 @@
}
$this->parseCookies();
+
+ wfProfileOut( __METHOD__ );
}
/**
@@ -603,6 +616,8 @@
* Parse the cookies in the response headers and store them in the
cookie jar.
*/
protected function parseCookies() {
+ wfProfileIn( __METHOD__ );
+
if ( !$this->cookieJar ) {
$this->cookieJar = new CookieJar;
}
@@ -613,6 +628,8 @@
$this->cookieJar->parseCookieResponseHeader(
$cookie, $url['host'] );
}
}
+
+ wfProfileIn( __METHOD__ );
}
/**
@@ -700,9 +717,12 @@
}
public function execute() {
+ wfProfileIn( __METHOD__ );
+
parent::execute();
if ( !$this->status->isOK() ) {
+ wfProfileOut( __METHOD__ );
return $this->status;
}
@@ -746,6 +766,7 @@
$curlHandle = curl_init( $this->url );
if ( !curl_setopt_array( $curlHandle, $this->curlOptions ) ) {
+ wfProfileOut( __METHOD__ );
throw new MWException( "Error setting curl options." );
}
@@ -776,6 +797,8 @@
$this->parseHeader();
$this->setStatus();
+
+ wfProfileOut( __METHOD__ );
return $this->status;
}
@@ -811,6 +834,8 @@
}
public function execute() {
+ wfProfileIn( __METHOD__ );
+
parent::execute();
if ( is_array( $this->postData ) ) {
@@ -903,11 +928,13 @@
if ( $fh === false ) {
$this->status->fatal( 'http-request-error' );
+ wfProfileOut( __METHOD__ );
return $this->status;
}
if ( $result['timed_out'] ) {
$this->status->fatal( 'http-timed-out', $this->url );
+ wfProfileOut( __METHOD__ );
return $this->status;
}
@@ -930,6 +957,8 @@
}
fclose( $fh );
+ wfProfileOut( __METHOD__ );
+
return $this->status;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/54579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f2819a075891dbc565a7524d56e7bf077ab089a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Parent5446 <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
