Followup r86228 (profiling cleanup):

* Move autoloader up in Maintenance as well
* Add setInstance() method to Profiler, dumpHTML will need it
* Move get/setProfileId() up a level to Profiler. ProfilerSimple subclasses use it, behavior is harmless for Stub.

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 63f9a54..2e02d29 100644 (file)
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -61,6 +61,7 @@ class Profiler {
        var $mStack = array (), $mWorkStack = array (), $mCollated = array ();
        var $mCalls = array (), $mTotals = array ();
        var $mTemplated = false;
+       protected $mProfileID = false;
        private static $__instance = null;
 
        function __construct() {
@@ -102,6 +103,18 @@ class Profiler {
                self::$__instance = $p;
        }
 
+       public function setProfileID( $id ) {
+               $this->mProfileID = $id;
+       }
+
+       public function getProfileID() {
+               if ( $this->mProfileID === false ) {
+                       return wfWikiID();
+               } else {
+                       return $this->mProfileID;
+               }
+       }
+
        /**
         * Called by wfProfieIn()
         *

diff --git a/includes/profiler/ProfilerSimple.php b/includes/profiler/ProfilerSimple.php
index d1b20bc..35cbae0 100644 (file)
--- a/includes/profiler/ProfilerSimple.php
+++ b/includes/profiler/ProfilerSimple.php
@@ -11,7 +11,6 @@
  */
 class ProfilerSimple extends Profiler {
        var $mMinimumTime = 0;
-       var $mProfileID = false;
 
        function __construct() {
                global $wgRequestTime, $wgRUstart;
@@ -38,18 +37,6 @@ class ProfilerSimple extends Profiler {
                $this->mMinimumTime = $min;
        }
 
-       function setProfileID( $id ) {
-               $this->mProfileID = $id;
-       }
-
-       function getProfileID() {
-               if ( $this->mProfileID === false ) {
-                       return wfWikiID();
-               } else {
-                       return $this->mProfileID;
-               }
-       }
-
        function profileIn($functionname) {
                global $wgDebugFunctionEntry;
                if ($wgDebugFunctionEntry) {

diff --git a/includes/profiler/ProfilerSimpleTrace.php b/includes/profiler/ProfilerSimpleTrace.php
index 0d73e49..664a6d9 100644 (file)
--- a/includes/profiler/ProfilerSimpleTrace.php
+++ b/includes/profiler/ProfilerSimpleTrace.php
@@ -11,7 +11,6 @@
  */
 class ProfilerSimpleTrace extends ProfilerSimple {
        var $mMinimumTime = 0;
-       var $mProfileID = false;
        var $trace = "";
        var $memory = 0;