Merge pull request #14 from WebPlatformForEmbedded/development/METROL-565

Moved job to thread pool

Author: pwielders

.gitignore

@@ -1,4 +1,5 @@
 CMakeCache.txt
+CMakeFiles
 Launcher.json
 Makefile
 cmake_install.cmake

Launcher.h

@@ -535,7 +535,7 @@ class Launcher : public PluginHost::IPlugin {
     };
 
 public:
-    class Job: public Core::IDispatch {
+    class Job {
     private:
         typedef std::vector<uint32_t> ProcessList;
 
@@ -554,6 +554,7 @@ class Launcher : public PluginHost::IPlugin {
             , _shutdownPhase(0)
             , _processListEmpty(1, 1)
             , _shutdownCompleted(false)
+            , _job(*this)
         {
             auto iter = config->Parameters.Elements();
 
@@ -572,8 +573,9 @@ class Launcher : public PluginHost::IPlugin {
             }
             _memory->AddRef();
         }
-        ~Job() override
+        ~Job()
         {
+            _job.Revoke();
             _memory->Release();
         }
 
@@ -629,18 +631,18 @@ class Launcher : public PluginHost::IPlugin {
         }
         void Schedule (const Core::Time& time) {
             if (time <= Core::Time::Now()) {
-                PluginHost::WorkerPool::Instance().Submit(Core::ProxyType<Core::IDispatch>(*this));
+                _job.Submit();
             }
             else {
-                PluginHost::WorkerPool::Instance().Schedule(time, Core::ProxyType<Core::IDispatch>(*this));
+                _job.Reschedule(time);
             }
         }
         void Shutdown () {
             _adminLock.Lock();
             _shutdownPhase = 1;
             _adminLock.Unlock();
 
-            PluginHost::WorkerPool::Instance().Revoke(Core::ProxyType<Core::IDispatch>(*this));
+            _job.Revoke();
             if (_process.IsActive() == true) {
 
                 // First try a gentle touch....
@@ -677,11 +679,15 @@ class Launcher : public PluginHost::IPlugin {
         }
 
     private:
-        string Identifier() const override {
+        string JobIdentifier() const
+        {
             return (_T("Launcher::Command(\"") + _options.Command() + _T("\")"));
         }
-        void Dispatch() override
+
+        friend Core::ThreadPool::JobType<Job&>;
+        void Dispatch()
         {
+            TRACE(Trace::Information, (_T("Launcher: job is dispatched")));
             // Let limit the jitter on the next run, if required..
             Core::Time nextRun (Core::Time::Now());
 
@@ -704,7 +710,7 @@ class Launcher : public PluginHost::IPlugin {
                 if (_shutdownPhase == 0) {
                     // Reschedule our next launch point...
                     nextRun.Add(_interval.TimeInSeconds() * Time::MilliSecondsPerSecond);
-                    PluginHost::WorkerPool::Instance().Schedule(nextRun, Core::ProxyType<Core::IDispatch>(*this));
+                    _job.Reschedule(nextRun);
                 }
                 _adminLock.Unlock();
             }
@@ -721,6 +727,8 @@ class Launcher : public PluginHost::IPlugin {
         ProcessList _processList;
         Core::Event _processListEmpty;
         Core::BinairySemaphore _shutdownCompleted;
+
+        Core::WorkerPool::JobType<Job&> _job;
     };
 
 public: