chore(profiler): optimize profiling loadings; add class Measure to hu…

…manize different measures

src/Module/Profiler/XHProf/ProfileBuilder.php

@@ -58,6 +58,7 @@ private function dataToPayload(array $data): array
  /** @var Tree<Edge> $tree */
  $tree = new Tree();
 
+ !\array_key_exists('main()', $data) && \array_key_exists('value', $data) and $data['main()'] = $data['value'];
  unset($data['value']);
 
  foreach (\array_reverse($data, true) as $key => $value) {

src/Proto/Frame/Profiler/Payload.php

@@ -22,6 +22,8 @@
  */
 final class Payload implements \JsonSerializable
 {
+ private ?Profile $profile = null;
+
  /**
  * @param PayloadType $type
  * @param \Closure(): Profile $callsProvider
@@ -58,7 +60,7 @@ public static function fromArray(array $data, ?PayloadType $type = null): static
 
  public function getProfile(): Profile
  {
- return ($this->callsProvider)();
+ return $this->profile ??= ($this->callsProvider)();
  }
 
  /**

src/Sender/Console/Renderer/Binary.php

@@ -8,7 +8,7 @@
 use Buggregator\Trap\ProtoType;
 use Buggregator\Trap\Sender\Console\Renderer;
 use Buggregator\Trap\Sender\Console\Support\Common;
-use Buggregator\Trap\Sender\Console\Support\Files;
+use Buggregator\Trap\Support\Measure;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -70,7 +70,7 @@ public function render(OutputInterface $output, Frame $frame): void
  $size = $frame->getSize();
  Common::renderMetadata($output, [
  'Time' => $frame->time,
- 'Size' => Files::normalizeSize($size) . ($size > 1024 ? \sprintf(' (%d bytes)', $size) : ''),
+ 'Size' => Measure::memory($size) . ($size > 1024 ? \sprintf(' (%d bytes)', $size) : ''),
  ]);
 
  if ($size === 0) {

src/Sender/Console/Renderer/Profiler.php

@@ -8,6 +8,8 @@
 use Buggregator\Trap\ProtoType;
 use Buggregator\Trap\Sender\Console\Renderer;
 use Buggregator\Trap\Sender\Console\Support\Common;
+use Buggregator\Trap\Sender\Console\Support\Tables;
+use Buggregator\Trap\Support\Measure;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -37,10 +39,28 @@ public function render(OutputInterface $output, Frame $frame): void
  and $data['Time'] = new \DateTimeImmutable('@' . $metadata['date']);
  isset($metadata['app_name']) and $data['App name'] = $metadata['app_name'];
  isset($metadata['hostname']) and $data['Hostname'] = $metadata['hostname'];
- isset($metadata['filename']) and $data['File name'] = $metadata['filename'];
+ isset($metadata['filename']) and $data['File name'] = $metadata['filename'] . (
+ isset($metadata['filesize']) && \is_int($metadata['filesize'])
+ ? ' (' . Measure::memory($metadata['filesize']) . ')'
+ : ''
+ );
  $data['Num edges'] = $profile->calls->count();
 
  Common::renderMetadata($output, $data);
- Common::renderTags($output, $profile->tags);
+ if ($profile->tags !== []) {
+ $output->writeln('');
+ Common::renderTags($output, $profile->tags);
+ $output->writeln('');
+ }
+
+ // Render peaks
+ $peaks = $profile->peaks;
+ Tables::renderKeyValueTable($output, 'Peak values', [
+ 'Memory usage' => Measure::memory($peaks->mu),
+ 'Peak memory usage' => Measure::memory($peaks->pmu),
+ 'Wall time' => $peaks->wt,
+ 'CPU time' => $peaks->cpu,
+ 'Calls count' => $peaks->ct,
+ ]);
  }
 }

src/Sender/Console/Renderer/Smtp.php

@@ -9,6 +9,7 @@
 use Buggregator\Trap\Sender\Console\Renderer;
 use Buggregator\Trap\Sender\Console\Support\Common;
 use Buggregator\Trap\Sender\Console\Support\Files;
+use Buggregator\Trap\Support\Measure;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -88,7 +89,7 @@ public function render(OutputInterface $output, Frame $frame): void
  \array_map(static fn($attach) => [
  'CID' => $attach->getEmbeddingId(),
  'Name' => $attach->getClientFilename(),
- 'Size' => Files::normalizeSize($attach->getSize()),
+ 'Size' => Measure::memory($attach->getSize()),
  'MIME' => $attach->getClientMediaType(),
  ], $embeddings),
  'compact',

src/Sender/Console/Support/Files.php

@@ -4,6 +4,7 @@
 
 namespace Buggregator\Trap\Sender\Console\Support;
 
+use Buggregator\Trap\Support\Measure;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -41,7 +42,7 @@ public static function renderFile(
  : \str_pad(\substr($fileName, $dotPos + 1), 3, ' ', \STR_PAD_BOTH);
 
  // File size
- $sizeStr = self::normalizeSize($size) ?? 'unknown size';
+ $sizeStr = Measure::memory($size) ?? 'unknown size';
 
  // Header with top border
  $output->writeln("<bg=black;fg=magenta> ┌───┐</> <info>$fileName</info>");
@@ -58,22 +59,4 @@ public static function renderFile(
  // MIME type
  $output->writeln("<bg=black;fg=magenta> └───┘</> <fg=gray>$type</>");
  }
-
- /**
- * @param int<0, max>|null $size
- */
- public static function normalizeSize(?int $size): ?string
- {
- if ($size === null) {
- return null;
- }
-
- $units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB'];
- $power = (int) \floor(\log($size, 1024));
- $float = $power > 0 ? \round($size / (1024 ** $power), 2) : $size;
-
- \assert($power >= 0 && $power <= 5);
-
- return \sprintf('%s %s', \number_format($float, 2), $units[$power]);
- }
 }

src/Service/FilesObserver/Converter/XHProf.php

@@ -52,6 +52,7 @@ public function convert(FileInfo $file): \Traversable
  metadata: [
  'hostname' => \gethostname(),
  'filename' => $file->getName(),
+ 'filesize' => $file->size,
  ],
  calls: $data,
  );

src/Support/Measure.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buggregator\Trap\Support;
+
+/**
+ * @internal
+ * @psalm-internal Buggregator\Trap
+ */
+final class Measure
+{
+ /**
+ * @param int<0, max>|null $size
+ * @return non-empty-string|null
+ */
+ public static function memory(?int $size): ?string
+ {
+ if ($size === null) {
+ return null;
+ }
+
+ $units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB'];
+ $power = (int) \floor(\log($size, 1024));
+ $float = $power > 0 ? \round($size / (1024 ** $power), 2) : $size;
+
+ \assert($power >= 0 && $power <= 5);
+
+ return \sprintf('%s %s', \number_format($float, 2), $units[$power]);
+ }
+}