Index: trunk/extensions/DumpHTML/dumpHTML.inc |
— | — | @@ -1163,16 +1163,14 @@ |
1164 | 1164 | $this->udpProfileInit = true; |
1165 | 1165 | $this->udpProfileCounter = 0; |
1166 | 1166 | } elseif ( $this->udpProfileCounter == 1 % $this->udpProfile ) { |
1167 | | - wfProfileOut( '-total' ); |
1168 | | - Profiler::instance()->getFunctionReport(); |
1169 | | - Profiler::setInstance( new DumpHTML_ProfilerStub ); |
| 1167 | + Profiler::instance()->logData(); |
| 1168 | + Profiler::setInstance( new ProfilerStub( array() ) ); |
1170 | 1169 | } |
1171 | 1170 | if ( $this->udpProfileCounter == 0 ) { |
1172 | | - Profiler::setInstance( new ProfilerSimpleUDP ); |
1173 | | - Profiler::instance()->setProfileID( 'dumpHTML' ); |
1174 | 1171 | $wgRequestTime = microtime( true ); |
1175 | 1172 | $wgRUstart = getrusage(); |
1176 | | - wfProfileIn( '-total' ); |
| 1173 | + Profiler::setInstance( new ProfilerSimpleUDP( array() ) ); |
| 1174 | + Profiler::instance()->setProfileID( 'dumpHTML' ); |
1177 | 1175 | } |
1178 | 1176 | $this->udpProfileCounter = ( $this->udpProfileCounter + 1 ) % $this->udpProfile; |
1179 | 1177 | } |
— | — | @@ -1192,15 +1190,6 @@ |
1193 | 1191 | } |
1194 | 1192 | } |
1195 | 1193 | |
1196 | | -class DumpHTML_ProfilerStub extends Profiler { |
1197 | | - function profileIn() {} |
1198 | | - function profileOut() {} |
1199 | | - function getOutput() {} |
1200 | | - function close() {} |
1201 | | - function getFunctionReport() {} |
1202 | | - function getCurrentSection() { return '';} |
1203 | | -} |
1204 | | - |
1205 | 1194 | class DumpHTML_ProxyRepoGroup extends RepoGroup { |
1206 | 1195 | var $dump, $backendRG; |
1207 | 1196 | |