Page MenuHomePhabricator
Files F13210046

D12675.id30440.diff
No OneTemporary
Actions

D12675.id30440.diff
View Options

diff --git a/src/applications/multimeter/data/MultimeterControl.php b/src/applications/multimeter/data/MultimeterControl.php
--- a/src/applications/multimeter/data/MultimeterControl.php
+++ b/src/applications/multimeter/data/MultimeterControl.php
@@ -91,6 +91,8 @@
throw new Exception(pht('Call setSampleRate() before saving events!'));
}
+ $this->addServiceEvents();
+
// Don't sample any of this stuff.
$this->pauseMultimeter();
@@ -191,7 +193,7 @@
if (isset($map[$name])) {
continue;
}
- $need[] = $name;
+ $need[$name] = $name;
}
foreach ($need as $name) {
@@ -204,4 +206,87 @@
return $map;
}
+ private function addServiceEvents() {
+ $events = PhutilServiceProfiler::getInstance()->getServiceCallLog();
+ foreach ($events as $event) {
+ $type = idx($event, 'type');
+ switch ($type) {
+ case 'exec':
+ $this->newEvent(
+ MultimeterEvent::TYPE_EXEC_TIME,
+ $label = $this->getLabelForCommandEvent($event['command']),
+ (1000000 * $event['duration']));
+ break;
+ }
+ }
+ }
+
+ private function getLabelForCommandEvent($command) {
+ $argv = preg_split('/\s+/', $command);
+
+ $bin = array_shift($argv);
+ $bin = basename($bin);
+ $bin = trim($bin, '"\'');
+
+ // It's important to avoid leaking details about command parameters,
+ // because some may be sensitive. Given this, it's not trivial to
+ // determine which parts of a command are arguments and which parts are
+ // flags.
+
+ // Rather than try too hard for now, just whitelist some workflows that we
+ // know about and record everything else generically. Overall, this will
+ // produce labels like "pygmentize" or "git log", discarding all flags and
+ // arguments.
+
+ $workflows = array(
+ 'git' => array(
+ 'log' => true,
+ 'for-each-ref' => true,
+ 'pull' => true,
+ 'clone' => true,
+ 'fetch' => true,
+ 'cat-file' => true,
+ 'init' => true,
+ 'config' => true,
+ 'remote' => true,
+ 'rev-parse' => true,
+ 'diff' => true,
+ 'ls-tree' => true,
+ ),
+ 'svn' => array(
+ 'log' => true,
+ 'diff' => true,
+ ),
+ 'hg' => array(
+ 'log' => true,
+ 'locate' => true,
+ 'pull' => true,
+ 'clone' => true,
+ 'init' => true,
+ 'diff' => true,
+ 'cat' => true,
+ ),
+ 'svnadmin' => array(
+ 'create' => true,
+ ),
+ );
+
+ $workflow = null;
+ $candidates = idx($workflows, $bin);
+ if ($candidates) {
+ foreach ($argv as $arg) {
+ if (isset($candidates[$arg])) {
+ $workflow = $arg;
+ break;
+ }
+ }
+ }
+
+ if ($workflow) {
+ return 'bin.'.$bin.' '.$workflow;
+ } else {
+ return 'bin.'.$bin;
+ }
+ }
+
}
diff --git a/src/applications/multimeter/storage/MultimeterEvent.php b/src/applications/multimeter/storage/MultimeterEvent.php
--- a/src/applications/multimeter/storage/MultimeterEvent.php
+++ b/src/applications/multimeter/storage/MultimeterEvent.php
@@ -4,6 +4,7 @@
const TYPE_STATIC_RESOURCE = 0;
const TYPE_REQUEST_TIME = 1;
+ const TYPE_EXEC_TIME = 2;
protected $eventType;
protected $eventLabelID;
@@ -32,6 +33,8 @@
return pht('Static Resource');
case self::TYPE_REQUEST_TIME:
return pht('Web Request');
+ case self::TYPE_EXEC_TIME:
+ return pht('Subprocesses');
}
return pht('Unknown ("%s")', $type);
@@ -46,6 +49,7 @@
case self::TYPE_STATIC_RESOURCE:
return pht('%s Req', new PhutilNumber($cost));
case self::TYPE_REQUEST_TIME:
+ case self::TYPE_EXEC_TIME:
return pht('%s us', new PhutilNumber($cost));
}

File Metadata

Mime Type
text/plain
Expires
Sat, May 18, 3:34 AM (4 w, 14 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6270672
Default Alt Text
D12675.id30440.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility