From b10e08180dc1576fbe0f838a9f0277ab4b3f40f4 Mon Sep 17 00:00:00 2001
From: Keith Davis <keith.davis@arm.com>
Date: Thu, 17 Oct 2019 09:52:50 +0100
Subject: Fix for bug where ProfilingConnectionDumpToFactory is not used in
 profiling service

Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I962093766a79fefc8fb91b9bc3d5bd8f28c35114
---
 .../ProfilingConnectionDumpToFileDecorator.hpp     | 36 ++++++----------------
 1 file changed, 9 insertions(+), 27 deletions(-)

(limited to 'src/profiling/ProfilingConnectionDumpToFileDecorator.hpp')

diff --git a/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp b/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp
index cc79d954d9..450c38a243 100644
--- a/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp
+++ b/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp
@@ -6,7 +6,9 @@
 #pragma once
 
 #include "IProfilingConnection.hpp"
+#include "ProfilingUtils.hpp"
 
+#include <Runtime.hpp>
 #include <armnn/Optional.hpp>
 
 #include <fstream>
@@ -23,29 +25,10 @@ namespace profiling
 class ProfilingConnectionDumpToFileDecorator : public IProfilingConnection
 {
 public:
-    struct Settings
-    {
-        Settings(const std::string& incomingDumpFileName = "",
-                 const std::string& outgoingDumpFileName = "",
-                 bool ignoreFileErrors = true)
-            : m_IncomingDumpFileName(incomingDumpFileName)
-            , m_OutgoingDumpFileName(outgoingDumpFileName)
-            , m_DumpIncoming(!incomingDumpFileName.empty())
-            , m_DumpOutgoing(!outgoingDumpFileName.empty())
-            , m_IgnoreFileErrors(ignoreFileErrors)
-        {}
-
-        ~Settings() = default;
-
-        std::string m_IncomingDumpFileName;
-        std::string m_OutgoingDumpFileName;
-        bool        m_DumpIncoming;
-        bool        m_DumpOutgoing;
-        bool        m_IgnoreFileErrors;
-    };
 
     ProfilingConnectionDumpToFileDecorator(std::unique_ptr<IProfilingConnection> connection,
-                                           const Settings& settings);
+                                           const Runtime::CreationOptions::ExternalProfilingOptions& options,
+                                           bool ignoreFailures);
 
     ~ProfilingConnectionDumpToFileDecorator();
 
@@ -68,14 +51,13 @@ private:
 
     void Fail(const std::string& errorMessage);
 
-    std::unique_ptr<IProfilingConnection> m_Connection;
-    Settings                              m_Settings;
-    std::ofstream                         m_IncomingDumpFileStream;
-    std::ofstream                         m_OutgoingDumpFileStream;
+    std::unique_ptr<IProfilingConnection>              m_Connection;
+    Runtime::CreationOptions::ExternalProfilingOptions m_Options;
+    std::ofstream                                      m_IncomingDumpFileStream;
+    std::ofstream                                      m_OutgoingDumpFileStream;
+    bool                                               m_IgnoreFileErrors;
 };
 
-using ProfilingConnectionDumpToFileDecoratorSettings = ProfilingConnectionDumpToFileDecorator::Settings;
-
 } // namespace profiling
 
 } // namespace armnn
-- 
cgit v1.2.1