move CallTraceReader to its own namespace

sj-i · sj-i · commit d09c778a9ab8 · 2023-11-13T07:46:43.000+09:00
diff --git a/resources/templates/compat.php b/resources/templates/compat.php
@@ -12,7 +12,7 @@
 declare(strict_types=1);
 
 use Reli\Inspector\Output\TraceFormatter\Compat\CompatCallTraceFormatter;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 /** @var CallTrace $call_trace */
 
diff --git a/resources/templates/json_lines.php b/resources/templates/json_lines.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 /** @var CallTrace $call_trace */
 ?>
 <?= json_encode($call_trace, JSON_UNESCAPED_UNICODE) ?>
diff --git a/resources/templates/phpspy.php b/resources/templates/phpspy.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 /** @var CallTrace $call_trace */
 ?>
 <?php foreach ($call_trace->call_frames as $depth => $frame): ?>
diff --git a/resources/templates/phpspy_with_opcode.php b/resources/templates/phpspy_with_opcode.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 /** @var CallTrace $call_trace */
 $depth_offset = 0;
 ?>
diff --git a/src/Command/Inspector/GetTraceCommand.php b/src/Command/Inspector/GetTraceCommand.php
@@ -28,9 +28,9 @@
 use Reli\Lib\Elf\Tls\TlsFinderException;
 use Reli\Lib\PhpProcessReader\PhpGlobalsFinder;
 use Reli\Lib\PhpProcessReader\PhpVersionDetector;
-use Reli\Lib\PhpProcessReader\TraceCache;
 use Reli\Lib\Process\MemoryReader\MemoryReaderException;
-use Reli\Lib\PhpProcessReader\PhpMemoryReader\CallTraceReader;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTraceReader;
+use Reli\Lib\PhpProcessReader\CallTraceReader\TraceCache;
 use Reli\Lib\Process\ProcessStopper\ProcessStopper;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Command/Inspector/TopLikeCommand.php b/src/Command/Inspector/TopLikeCommand.php
@@ -27,7 +27,7 @@
 use Reli\Inspector\Settings\TraceLoopSettings\TraceLoopSettingsFromConsoleInput;
 use Reli\Lib\Console\EchoBackCanceller;
 use Reli\Lib\Log\Log;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 use Revolt\EventLoop;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Inspector/Daemon/Reader/Protocol/Message/TraceMessage.php b/src/Inspector/Daemon/Reader/Protocol/Message/TraceMessage.php
@@ -13,7 +13,7 @@
 
 namespace Reli\Inspector\Daemon\Reader\Protocol\Message;
 
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 final class TraceMessage
 {
diff --git a/src/Inspector/Daemon/Reader/Worker/PhpReaderTraceLoop.php b/src/Inspector/Daemon/Reader/Worker/PhpReaderTraceLoop.php
@@ -18,8 +18,8 @@
 use Reli\Inspector\Daemon\Reader\Protocol\Message\TraceMessage;
 use Reli\Inspector\Settings\GetTraceSettings\GetTraceSettings;
 use Reli\Inspector\Settings\TraceLoopSettings\TraceLoopSettings;
-use Reli\Lib\PhpProcessReader\PhpMemoryReader\CallTraceReader;
-use Reli\Lib\PhpProcessReader\TraceCache;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTraceReader;
+use Reli\Lib\PhpProcessReader\CallTraceReader\TraceCache;
 use Reli\Lib\Process\ProcessStopper\ProcessStopper;
 
 use function is_null;
diff --git a/src/Inspector/Output/TopLike/Stat.php b/src/Inspector/Output/TopLike/Stat.php
@@ -13,8 +13,8 @@
 
 namespace Reli\Inspector\Output\TopLike;
 
-use Reli\Lib\PhpProcessReader\CallFrame;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 final class Stat
 {
diff --git a/src/Inspector/Output/TopLike/TopLikeFormatter.php b/src/Inspector/Output/TopLike/TopLikeFormatter.php
@@ -14,7 +14,7 @@
 namespace Reli\Inspector\Output\TopLike;
 
 use Reli\Lib\DateTime\Clock;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 final class TopLikeFormatter
 {
diff --git a/src/Inspector/Output/TraceFormatter/CallTraceFormatter.php b/src/Inspector/Output/TraceFormatter/CallTraceFormatter.php
@@ -13,7 +13,7 @@
 
 namespace Reli\Inspector\Output\TraceFormatter;
 
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 interface CallTraceFormatter
 {
diff --git a/src/Inspector/Output/TraceFormatter/Compat/CompatCallFrameFormatter.php b/src/Inspector/Output/TraceFormatter/Compat/CompatCallFrameFormatter.php
@@ -13,7 +13,7 @@
 
 namespace Reli\Inspector\Output\TraceFormatter\Compat;
 
-use Reli\Lib\PhpProcessReader\CallFrame;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;
 
 use function is_null;
 
diff --git a/src/Inspector/Output/TraceFormatter/Compat/CompatCallTraceFormatter.php b/src/Inspector/Output/TraceFormatter/Compat/CompatCallTraceFormatter.php
@@ -14,7 +14,7 @@
 namespace Reli\Inspector\Output\TraceFormatter\Compat;
 
 use Reli\Inspector\Output\TraceFormatter\CallTraceFormatter;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 use function join;
 
diff --git a/src/Inspector/Output/TraceFormatter/Templated/TemplatedCallTraceFormatter.php b/src/Inspector/Output/TraceFormatter/Templated/TemplatedCallTraceFormatter.php
@@ -14,7 +14,7 @@
 namespace Reli\Inspector\Output\TraceFormatter\Templated;
 
 use Reli\Inspector\Output\TraceFormatter\CallTraceFormatter;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 use function assert;
 use function is_string;
diff --git a/src/Inspector/Output/TraceOutput/FormattedTraceOutput.php b/src/Inspector/Output/TraceOutput/FormattedTraceOutput.php
@@ -15,7 +15,7 @@
 
 use Reli\Inspector\Output\OutputChannel\OutputChannel;
 use Reli\Inspector\Output\TraceFormatter\CallTraceFormatter;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 final class FormattedTraceOutput implements TraceOutput
 {
diff --git a/src/Inspector/Output/TraceOutput/TraceOutput.php b/src/Inspector/Output/TraceOutput/TraceOutput.php
@@ -13,7 +13,7 @@
 
 namespace Reli\Inspector\Output\TraceOutput;
 
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 interface TraceOutput
 {
diff --git a/src/Lib/PhpProcessReader/CallTraceReader/CallFrame.php b/src/Lib/PhpProcessReader/CallTraceReader/CallFrame.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Reli\Lib\PhpProcessReader;
+namespace Reli\Lib\PhpProcessReader\CallTraceReader;
 
 use Reli\Lib\PhpInternals\Types\Zend\Opline;
 
diff --git a/src/Lib/PhpProcessReader/CallTraceReader/CallTrace.php b/src/Lib/PhpProcessReader/CallTraceReader/CallTrace.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Reli\Lib\PhpProcessReader;
+namespace Reli\Lib\PhpProcessReader\CallTraceReader;
 
 /** @psalm-immutable */
 final class CallTrace
diff --git a/src/Lib/PhpProcessReader/CallTraceReader/CallTraceReader.php b/src/Lib/PhpProcessReader/CallTraceReader/CallTraceReader.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Reli\Lib\PhpProcessReader\PhpMemoryReader;
+namespace Reli\Lib\PhpProcessReader\CallTraceReader;
 
 use Reli\Lib\PhpInternals\Opcodes\OpcodeFactory;
 use Reli\Lib\PhpInternals\Types\C\RawDouble;
@@ -23,9 +23,6 @@
 use Reli\Lib\PhpInternals\Types\Zend\ZendOp;
 use Reli\Lib\PhpInternals\ZendTypeReader;
 use Reli\Lib\PhpInternals\ZendTypeReaderCreator;
-use Reli\Lib\PhpProcessReader\CallFrame;
-use Reli\Lib\PhpProcessReader\CallTrace;
-use Reli\Lib\PhpProcessReader\TraceCache;
 use Reli\Lib\Process\MemoryReader\MemoryReaderInterface;
 use Reli\Lib\Process\MemoryReader\MemoryReaderException;
 use Reli\Lib\Process\Pointer\Dereferencer;
diff --git a/src/Lib/PhpProcessReader/CallTraceReader/TraceCache.php b/src/Lib/PhpProcessReader/CallTraceReader/TraceCache.php
@@ -11,8 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Reli\Lib\PhpProcessReader;
+namespace Reli\Lib\PhpProcessReader\CallTraceReader;
 
+use Reli\Lib\Process\Pointer\Dereferencable as T;
 use Reli\Lib\Process\Pointer\Dereferencer;
 use Reli\Lib\Process\Pointer\Pointer;
 
diff --git a/tests/Inspector/Daemon/Reader/Controller/PhpReaderControllerTest.php b/tests/Inspector/Daemon/Reader/Controller/PhpReaderControllerTest.php
@@ -24,8 +24,8 @@
 use Reli\Lib\Amphp\ContextInterface;
 use Reli\Lib\PhpInternals\ZendTypeReader;
 use PHPUnit\Framework\TestCase;
-use Reli\Lib\PhpProcessReader\CallFrame;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 final class PhpReaderControllerTest extends TestCase
 {
diff --git a/tests/Inspector/Daemon/Reader/Worker/PhpReaderEntryPointTest.php b/tests/Inspector/Daemon/Reader/Worker/PhpReaderEntryPointTest.php
@@ -25,8 +25,8 @@
 use Reli\Inspector\Settings\TraceLoopSettings\TraceLoopSettings;
 use Reli\Lib\Loop\LoopCondition\OnlyOnceCondition;
 use Reli\Lib\PhpInternals\ZendTypeReader;
-use Reli\Lib\PhpProcessReader\CallFrame;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 use PHPUnit\Framework\TestCase;
 
 class PhpReaderEntryPointTest extends TestCase
diff --git a/tests/Inspector/Output/TopLike/StatTest.php b/tests/Inspector/Output/TopLike/StatTest.php
@@ -13,8 +13,8 @@
 
 namespace Reli\Inspector\Output\TopLike;
 
-use Reli\Lib\PhpProcessReader\CallFrame;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 use PHPUnit\Framework\TestCase;
 
 class StatTest extends TestCase
diff --git a/tests/Inspector/Output/TopLike/TopLikeFormatterTest.php b/tests/Inspector/Output/TopLike/TopLikeFormatterTest.php
@@ -14,7 +14,7 @@
 namespace Reli\Inspector\Output\TopLike;
 
 use Reli\Lib\DateTime\FixedClock;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 use PHPUnit\Framework\TestCase;
 
 use function PHPUnit\Framework\assertSame;
diff --git a/tests/Inspector/Output/TraceFormatter/Compat/CompatCallTraceFormatterTest.php b/tests/Inspector/Output/TraceFormatter/Compat/CompatCallTraceFormatterTest.php
@@ -15,8 +15,8 @@
 
 use Reli\Lib\PhpInternals\Opcodes\OpcodeV80;
 use Reli\Lib\PhpInternals\Types\Zend\Opline;
-use Reli\Lib\PhpProcessReader\CallFrame;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 use PHPUnit\Framework\TestCase;
 
 class CompatCallTraceFormatterTest extends TestCase
diff --git a/tests/Inspector/Output/TraceFormatter/Templated/TemplatedCallTraceFormatterTest.php b/tests/Inspector/Output/TraceFormatter/Templated/TemplatedCallTraceFormatterTest.php
@@ -13,8 +13,8 @@
 
 namespace Reli\Inspector\Output\TraceFormatter\Templated;
 
-use Reli\Lib\PhpProcessReader\CallFrame;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 use PHPUnit\Framework\TestCase;
 
 class TemplatedCallTraceFormatterTest extends TestCase
diff --git a/tests/Inspector/Output/TraceFormatter/Templated/templates/test.php b/tests/Inspector/Output/TraceFormatter/Templated/templates/test.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 
 /** @var CallTrace $call_trace */
 
diff --git a/tests/Inspector/Output/TraceOutput/TraceOutputFactoryTest.php b/tests/Inspector/Output/TraceOutput/TraceOutputFactoryTest.php
@@ -16,8 +16,8 @@
 use Reli\Inspector\Output\TraceFormatter\CallTraceFormatter;
 use Reli\Inspector\Output\TraceFormatter\Templated\TraceFormatterFactory;
 use Reli\Inspector\Settings\OutputSettings\OutputSettings;
-use Reli\Lib\PhpProcessReader\CallFrame;
-use Reli\Lib\PhpProcessReader\CallTrace;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;
+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Output\StreamOutput;
 
diff --git a/tests/Lib/PhpProcessReader/CallTraceReader/CallFrameTest.php b/tests/Lib/PhpProcessReader/CallTraceReader/CallFrameTest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Reli\Lib\PhpProcessReader;
+namespace Reli\Lib\PhpProcessReader\CallTraceReader;
 
+use PHPUnit\Framework\TestCase;
 use Reli\Lib\PhpInternals\Opcodes\OpcodeV70;
 use Reli\Lib\PhpInternals\Types\Zend\Opline;
-use PHPUnit\Framework\TestCase;
 
 class CallFrameTest extends TestCase
 {
diff --git a/tests/Lib/PhpProcessReader/CallTraceReader/CallTraceReaderTest.php b/tests/Lib/PhpProcessReader/CallTraceReader/CallTraceReaderTest.php
@@ -11,33 +11,24 @@
 
 declare(strict_types=1);
 
-namespace Reli\Lib\PhpProcessReader\PhpMemoryReader;
+namespace Reli\Lib\PhpProcessReader\CallTraceReader;
 
+use PHPUnit\Framework\TestCase;
 use Reli\Inspector\Settings\TargetPhpSettings\TargetPhpSettings;
-use Reli\Inspector\Settings\TargetProcessSettings\TargetProcessSettings;
 use Reli\Lib\ByteStream\IntegerByteSequence\LittleEndianReader;
 use Reli\Lib\Elf\Parser\Elf64Parser;
 use Reli\Lib\Elf\Process\PerBinarySymbolCacheRetriever;
 use Reli\Lib\Elf\Process\ProcessModuleSymbolReaderCreator;
 use Reli\Lib\Elf\SymbolResolver\Elf64SymbolResolverCreator;
 use Reli\Lib\File\CatFileReader;
 use Reli\Lib\PhpInternals\Opcodes\OpcodeFactory;
-use Reli\Lib\PhpInternals\Types\Zend\ZendCastedTypeProvider;
-use Reli\Lib\PhpInternals\Types\Zend\ZendExecuteData;
-use Reli\Lib\PhpInternals\Types\Zend\ZendExecutorGlobals;
-use Reli\Lib\PhpInternals\Types\Zend\ZendFunction;
-use Reli\Lib\PhpInternals\Types\Zend\ZendString;
 use Reli\Lib\PhpInternals\ZendTypeReader;
 use Reli\Lib\PhpInternals\ZendTypeReaderCreator;
-use Reli\Lib\PhpProcessReader\TraceCache;
-use Reli\Lib\Process\MemoryMap\ProcessMemoryMapCreator;
-use Reli\Lib\Process\MemoryReader\MemoryReader;
 use Reli\Lib\PhpProcessReader\PhpGlobalsFinder;
 use Reli\Lib\PhpProcessReader\PhpSymbolReaderCreator;
-use Reli\Lib\Process\Pointer\Pointer;
-use Reli\Lib\Process\Pointer\RemoteProcessDereferencer;
+use Reli\Lib\Process\MemoryMap\ProcessMemoryMapCreator;
+use Reli\Lib\Process\MemoryReader\MemoryReader;
 use Reli\Lib\Process\ProcessSpecifier;
-use PHPUnit\Framework\TestCase;
 
 class CallTraceReaderTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace Reli\Inspector\Daemon\Reader\Protocol\Message;`
`15`	`15`
`16`		`-use Reli\Lib\PhpProcessReader\CallTrace;`
	`16`	`+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;`
`17`	`17`
`18`	`18`	`final class TraceMessage`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`
`14`	`14`	`namespace Reli\Inspector\Output\TopLike;`
`15`	`15`
`16`		`-use Reli\Lib\PhpProcessReader\CallFrame;`
`17`		`-use Reli\Lib\PhpProcessReader\CallTrace;`
	`16`	`+use Reli\Lib\PhpProcessReader\CallTraceReader\CallFrame;`
	`17`	`+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;`
`18`	`18`
`19`	`19`	`final class Stat`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`namespace Reli\Inspector\Output\TopLike;`
`15`	`15`
`16`	`16`	`use Reli\Lib\DateTime\Clock;`
`17`		`-use Reli\Lib\PhpProcessReader\CallTrace;`
	`17`	`+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;`
`18`	`18`
`19`	`19`	`final class TopLikeFormatter`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`use Reli\Inspector\Output\OutputChannel\OutputChannel;`
`17`	`17`	`use Reli\Inspector\Output\TraceFormatter\CallTraceFormatter;`
`18`		`-use Reli\Lib\PhpProcessReader\CallTrace;`
	`18`	`+use Reli\Lib\PhpProcessReader\CallTraceReader\CallTrace;`
`19`	`19`
`20`	`20`	`final class FormattedTraceOutput implements TraceOutput`
`21`	`21`	`{`