diff options
| author | Andriy Kozoriz <AKozoriz@luxoft.com> | 2016-02-09 16:40:10 +0200 |
|---|---|---|
| committer | Kozoriz <kozorizandriy@gmail.com> | 2016-02-17 10:15:39 +0200 |
| commit | 62020ab881c9e12bb1bedc13d55d72912266d6a1 (patch) | |
| tree | 98626d225c89ae989bf8441ed87c6df8ba0a5637 /src/components/transport_manager/include | |
| parent | 4129bd5de70492eb3f368706674d4443eb356a32 (diff) | |
| download | sdl_core-62020ab881c9e12bb1bedc13d55d72912266d6a1.tar.gz | |
INtegration of new Timer to TransportManager
Changed using oif TimerThread to Timer
Updated usage methods of Timer.
Related to : APPLINK-10003
Diffstat (limited to 'src/components/transport_manager/include')
| -rw-r--r-- | src/components/transport_manager/include/transport_manager/transport_manager_impl.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h index c0cca9f40a..8ec2cd8fe2 100644 --- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h +++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h @@ -40,7 +40,8 @@ #include <utility> #include <algorithm> -#include "utils/timer_thread.h" +#include "utils/timer.h" +#include "utils/timer_task_impl.h" #include "utils/rwlock.h" #include "transport_manager/transport_manager.h" @@ -59,6 +60,7 @@ typedef threads::MessageLoopThread<std::queue<protocol_handler::RawMessagePtr> > RawMessageLoopThread; typedef threads::MessageLoopThread<std::queue<TransportAdapterEvent> > TransportAdapterEventLoopThread; +typedef utils::SharedPtr<timer::Timer> TimerSPtr; /** * @brief Implementation of transport manager.s @@ -80,10 +82,8 @@ class TransportManagerImpl : public TransportManager, struct ConnectionInternal: public Connection { TransportManagerImpl* transport_manager; TransportAdapter* transport_adapter; - typedef timer::TimerThread<ConnectionInternal> TimerInternal; - typedef utils::SharedPtr<TimerInternal> TimerInternalSharedPointer; - TimerInternalSharedPointer timer; - bool shutDown; + TimerSPtr timer; + bool shutdown; DeviceHandle device_handle_; int messages_count; @@ -92,6 +92,7 @@ class TransportManagerImpl : public TransportManager, const ConnectionUID& id, const DeviceUID& dev_id, const ApplicationHandle& app_id, const DeviceHandle& device_handle); + void DisconnectFailedRoutine(); }; public: |