diff options
author | Keith Davis <keith.davis@arm.com> | 2020-03-30 10:43:41 +0100 |
---|---|---|
committer | Finn Williams <Finn.Williams@arm.com> | 2020-04-02 16:56:24 +0100 |
commit | 33ed221e2e8e3a77b5f543061e0cce07b259fc64 (patch) | |
tree | 8467f2e4ce019bfa2837ae1030c321509414780c /tests/profiling/gatordmock/GatordMockMain.cpp | |
parent | 0fe279bbf22fd2116b283b9df61076d526f115e4 (diff) | |
download | armnn-33ed221e2e8e3a77b5f543061e0cce07b259fc64.tar.gz |
IVGCVSW-4455 Add an Activate and Deactivate control packet to the protocol
* Add Activate/Deactivate command handlers
* Add IReportStructure, INotifyBackends single function interfaces
* Add overrided mechanism to report structure in Runtime.cpp
* Add overrided mechanism to notify backends in ProfilingService.cpp
* Add optional IReportStructure argument to ProfilingService constructor
for use in ActivateTimelineReportingCommandHandler
* Refactoring and tidying up indentation
* Removal of unused code in ProfilingUtils.cpp and ProfilingService.cpp
* Added GatordMock end to end test
* Fixed an issue with SendCounterPacket sending duplicate packets
* Fixed an issue with DirectoryCaptureCommandHandler handling of Optional
Signed-off-by: Keith Davis <keith.davis@arm.com>
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I5ef1b74171459bfc649861dedf99921d22c9e63f
Diffstat (limited to 'tests/profiling/gatordmock/GatordMockMain.cpp')
-rw-r--r-- | tests/profiling/gatordmock/GatordMockMain.cpp | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/tests/profiling/gatordmock/GatordMockMain.cpp b/tests/profiling/gatordmock/GatordMockMain.cpp index e19461f6cb..029c58f5e8 100644 --- a/tests/profiling/gatordmock/GatordMockMain.cpp +++ b/tests/profiling/gatordmock/GatordMockMain.cpp @@ -3,16 +3,10 @@ // SPDX-License-Identifier: MIT // -#include "PacketVersionResolver.hpp" #include "CommandFileParser.hpp" #include "CommandLineProcessor.hpp" -#include "DirectoryCaptureCommandHandler.hpp" #include "GatordMockService.hpp" -#include "PeriodicCounterCaptureCommandHandler.hpp" -#include "PeriodicCounterSelectionResponseHandler.hpp" #include <TimelineDecoder.hpp> -#include <TimelineDirectoryCaptureCommandHandler.hpp> -#include <TimelineCaptureCommandHandler.hpp> #include <iostream> #include <string> @@ -32,38 +26,7 @@ void exit_capture(int signum) bool CreateMockService(armnnUtils::Sockets::Socket clientConnection, std::string commandFile, bool isEchoEnabled) { - profiling::PacketVersionResolver packetVersionResolver; - // Create the Command Handler Registry - profiling::CommandHandlerRegistry registry; - - timelinedecoder::TimelineDecoder timelineDecoder; - timelineDecoder.SetDefaultCallbacks(); - - // This functor will receive back the selection response packet. - PeriodicCounterSelectionResponseHandler periodicCounterSelectionResponseHandler( - 0, 4, packetVersionResolver.ResolvePacketVersion(0, 4).GetEncodedValue()); - // This functor will receive the counter data. - PeriodicCounterCaptureCommandHandler counterCaptureCommandHandler( - 3, 0, packetVersionResolver.ResolvePacketVersion(3, 0).GetEncodedValue()); - - profiling::DirectoryCaptureCommandHandler directoryCaptureCommandHandler( - 0, 2, packetVersionResolver.ResolvePacketVersion(0, 2).GetEncodedValue(), false); - - timelinedecoder::TimelineCaptureCommandHandler timelineCaptureCommandHandler( - 1, 1, packetVersionResolver.ResolvePacketVersion(1, 1).GetEncodedValue(), timelineDecoder); - - timelinedecoder::TimelineDirectoryCaptureCommandHandler timelineDirectoryCaptureCommandHandler( - 1, 0, packetVersionResolver.ResolvePacketVersion(1, 0).GetEncodedValue(), - timelineCaptureCommandHandler, false); - - // Register different derived functors - registry.RegisterFunctor(&periodicCounterSelectionResponseHandler); - registry.RegisterFunctor(&counterCaptureCommandHandler); - registry.RegisterFunctor(&directoryCaptureCommandHandler); - registry.RegisterFunctor(&timelineDirectoryCaptureCommandHandler); - registry.RegisterFunctor(&timelineCaptureCommandHandler); - - GatordMockService mockService(clientConnection, registry, isEchoEnabled); + GatordMockService mockService(clientConnection, isEchoEnabled); // Send receive the strweam metadata and send connection ack. if (!mockService.WaitForStreamMetaData()) @@ -82,11 +45,6 @@ bool CreateMockService(armnnUtils::Sockets::Socket clientConnection, std::string // Once we've finished processing the file wait for the receiving thread to close. mockService.WaitForReceivingThread(); - if(isEchoEnabled) - { - timelineDecoder.print(); - } - return EXIT_SUCCESS; } |