Page MenuHomestyx hydra
Files F206757

No OneTemporary
Actions

View Options

diff --git a/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php b/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
index 484d0b0c83..d14f6b535e 100644
--- a/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
+++ b/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
@@ -1,187 +1,187 @@
<?php
/**
* @group console
* @phutil-external-symbol function xhprof_enable
* @phutil-external-symbol function xhprof_disable
*/
final class DarkConsoleXHProfPluginAPI {
private static $profilerStarted;
private static $profilerRunning;
private static $profileFilePHID;
public static function isProfilerAvailable() {
return extension_loaded('xhprof');
}
public static function getProfilerHeader() {
return 'X-Phabricator-Profiler';
}
public static function isProfilerRequested() {
if (!empty($_REQUEST['__profile__'])) {
return $_REQUEST['__profile__'];
}
$header = AphrontRequest::getHTTPHeader(self::getProfilerHeader());
if ($header) {
return $header;
}
return false;
}
private static function shouldStartProfiler() {
if (self::isProfilerRequested()) {
return true;
}
static $sample_request = null;
if ($sample_request === null) {
if (PhabricatorEnv::getEnvConfig('debug.profile-rate')) {
$rate = PhabricatorEnv::getEnvConfig('debug.profile-rate');
if (mt_rand(1, $rate) == 1) {
$sample_request = true;
} else {
$sample_request = false;
}
}
}
return $sample_request;
}
public static function isProfilerStarted() {
return self::$profilerStarted;
}
private static function isProfilerRunning() {
return self::$profilerRunning;
}
public static function includeXHProfLib() {
// TODO: this is incredibly stupid, but we may not have Phutil metamodule
// stuff loaded yet so we can't just phutil_get_library_root() our way
// to victory.
$root = __FILE__;
for ($ii = 0; $ii < 6; $ii++) {
$root = dirname($root);
}
require_once $root.'/externals/xhprof/xhprof_lib.php';
}
public static function saveProfilerSample(PhutilDeferredLog $access_log) {
$file_phid = self::getProfileFilePHID();
if (!$file_phid) {
return;
}
if (self::isProfilerRequested()) {
$sample_rate = 0;
} else {
$sample_rate = PhabricatorEnv::getEnvConfig('debug.profile-rate');
}
$profile_sample = id(new PhabricatorXHProfSample())
->setFilePHID($file_phid)
->setSampleRate($sample_rate)
->setUsTotal($access_log->getData('T'))
->setHostname($access_log->getData('h'))
->setRequestPath($access_log->getData('U'))
->setController($access_log->getData('C'))
->setUserPHID($access_log->getData('P'));
AphrontWriteGuard::allowDangerousUnguardedWrites(true);
$caught = null;
try {
$profile_sample->save();
} catch (Exception $ex) {
$caught = $ex;
}
AphrontWriteGuard::allowDangerousUnguardedWrites(false);
if ($caught) {
throw $caught;
}
}
public static function hookProfiler() {
if (!self::shouldStartProfiler()) {
return;
}
if (!self::isProfilerAvailable()) {
return;
}
if (self::$profilerStarted) {
return;
}
self::startProfiler();
}
private static function startProfiler() {
self::includeXHProfLib();
xhprof_enable();
self::$profilerStarted = true;
self::$profilerRunning = true;
}
public static function getProfileFilePHID() {
self::stopProfiler();
return self::$profileFilePHID;
}
private static function stopProfiler() {
if (!self::isProfilerRunning()) {
return;
}
$data = xhprof_disable();
- $data = serialize($data);
+ $data = @json_encode($data);
self::$profilerRunning = false;
// Since these happen on GET we can't do guarded writes. These also
// sometimes happen after we've disposed of the write guard; in this
// case we need to disable the whole mechanism.
$use_scope = AphrontWriteGuard::isGuardActive();
if ($use_scope) {
$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
} else {
AphrontWriteGuard::allowDangerousUnguardedWrites(true);
}
$caught = null;
try {
$file = call_user_func(
array('PhabricatorFile', 'newFromFileData'),
$data,
array(
'mime-type' => 'application/xhprof',
'name' => 'profile.xhprof',
));
} catch (Exception $ex) {
$caught = $ex;
}
if ($use_scope) {
unset($unguarded);
} else {
AphrontWriteGuard::allowDangerousUnguardedWrites(false);
}
if ($caught) {
throw $caught;
}
self::$profileFilePHID = $file->getPHID();
}
}
diff --git a/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php b/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
index 089fa8bd3f..48cf29d1f4 100644
--- a/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
+++ b/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
@@ -1,53 +1,53 @@
<?php
final class PhabricatorXHProfProfileController
extends PhabricatorXHProfController {
private $phid;
public function willProcessRequest(array $data) {
$this->phid = $data['phid'];
}
public function processRequest() {
$request = $this->getRequest();
$file = id(new PhabricatorFileQuery())
->setViewer($request->getUser())
->withPHIDs(array($this->phid))
->executeOne();
if (!$file) {
return new Aphront404Response();
}
$data = $file->loadFileData();
- $data = unserialize($data);
+ $data = @json_decode($data, true);
if (!$data) {
throw new Exception("Failed to unserialize XHProf profile!");
}
$symbol = $request->getStr('symbol');
$is_framed = $request->getBool('frame');
if ($symbol) {
$view = new PhabricatorXHProfProfileSymbolView();
$view->setSymbol($symbol);
} else {
$view = new PhabricatorXHProfProfileTopLevelView();
$view->setFile($file);
$view->setLimit(100);
}
$view->setBaseURI($request->getRequestURI()->getPath());
$view->setIsFramed($is_framed);
$view->setProfileData($data);
return $this->buildStandardPageResponse(
$view,
array(
'title' => 'Profile',
'frame' => $is_framed,
));
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jul 1, 2:06 PM (3 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
164364
Default Alt Text
(6 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)