Memory Observer implementation corrected

Author: HaseenaSainul

Launcher.cpp

@@ -26,6 +26,7 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
     Config config;
 
     ASSERT(_service == nullptr);
+    ASSERT(_memory == nullptr);
 
     // Setup skip URL for right offset.
     _service = service;
@@ -47,7 +48,10 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
         }
     }
 
-    _activity = Core::ProxyType<Job>::Create(&config, interval);
+    _memory = Core::Service<MemoryObserverImpl>::Create<Exchange::IMemory>(0);
+    ASSERT(_memory != nullptr);
+
+    _activity = Core::ProxyType<Job>::Create(&config, interval, _memory);
     if (_activity.IsValid() == true) {
         if (_activity->IsOperational() == false) {
             // Well if we where able to parse the parameters (if needed) we are ready to start it..
@@ -77,28 +81,39 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
             else {
                 PluginHost::WorkerPool::Instance().Submit(_activity);
             }
+
         }
         else {
+            _activity.Release();
             message = _T("Could not parse the configuration for the job.");
         }
     }
     else {
         message = _T("Could not create the job.");
     }
 
+    if (_activity.IsValid() == false) {
+        if (_memory != nullptr) {
+            _memory->Release();
+            _memory = nullptr;
+        }
+    }
+
     return (message);
 }
 
 /* virtual */ void Launcher::Deinitialize(PluginHost::IShell* service)
 {
     ASSERT(_service == service);
+    ASSERT(_memory != nullptr);
 
     PluginHost::WorkerPool::Instance().Revoke(_activity);
 
     _observer.Unregister(&_notification);
 
-    if (_activity->Memory() != nullptr) {
-        _activity->Memory()->Release();
+    if (_memory != nullptr) {
+        _memory->Release();
+        _memory = nullptr;
     }
 
     if (_activity->Process().IsActive() == true) {
@@ -129,7 +144,8 @@ void Launcher::Update(const ProcessObserver::Info& info)
         ASSERT(_service != nullptr);
 
         if (info.Event() == ProcessObserver::Info::EVENT_EXIT) {
-        
+
+            _memory->Observe(0);
             if ((info.ExitCode() & 0xFFFF) == 0) {
                 // Only do this if we do not need a retrigger on an intervall.
                 if (_activity->IsOperational() == false) {

Launcher.h

@@ -535,19 +535,19 @@ class Launcher : public PluginHost::IPlugin {
     };
 
 public:
-    class Job: public Core::IDispatchType<void>, public Core::IUnknown {
+    class Job: public Core::IDispatchType<void> {
     private:
         Job() = delete;
         Job(const Job&) = delete;
         Job& operator=(const Job&) = delete;
 
     public:
-        Job(Config* config, const Time& interval)
+        Job(Config* config, const Time& interval, Exchange::IMemory* memory)
             : _hasRun(false)
             , _pid(0)
             , _options(config->Command.Value().c_str())
             , _process(false)
-            , _memory(nullptr)
+            , _memory(memory)
             , _interval(interval)
         {
             auto iter = config->Parameters.Elements();
@@ -580,9 +580,6 @@ class Launcher : public PluginHost::IPlugin {
         uint32_t Pid() {
             return _pid;
         }
-        Exchange::IMemory* Memory() {
-            return _memory;
-        }
         virtual void Dispatch() override
         {
             _hasRun = true;
@@ -591,9 +588,8 @@ class Launcher : public PluginHost::IPlugin {
 
                 _process.Launch(_options, &_pid);
                 if (_memory != nullptr) {
-                    _memory->Release();
+                    _memory->Observe(_pid);
                 }
-                _memory = Core::Service<MemoryObserverImpl>::Create<Exchange::IMemory>(_pid);
             }
 
             if (_interval.IsValid() == true) {
@@ -609,12 +605,6 @@ class Launcher : public PluginHost::IPlugin {
             }
         }
 
-    public:
-    BEGIN_INTERFACE_MAP(Job)
-        INTERFACE_AGGREGATE(Exchange::IMemory, _memory)
-    END_INTERFACE_MAP
-
-
     private:
         bool _hasRun;
         uint32_t _pid;
@@ -632,6 +622,7 @@ class Launcher : public PluginHost::IPlugin {
         : _service(nullptr)
         , _closeTime(0)
         , _notification(this)
+        , _memory(nullptr)
         , _activity()
     {
     }
@@ -645,6 +636,7 @@ class Launcher : public PluginHost::IPlugin {
 public:
     BEGIN_INTERFACE_MAP(Launcher)
         INTERFACE_ENTRY(PluginHost::IPlugin)
+        INTERFACE_AGGREGATE(Exchange::IMemory, _memory)
     END_INTERFACE_MAP
 
 public:
@@ -677,6 +669,7 @@ class Launcher : public PluginHost::IPlugin {
     PluginHost::IShell* _service;
     uint8_t _closeTime;
     Core::Sink<Notification> _notification;
+    Exchange::IMemory* _memory;
 
     static ProcessObserver _observer;
     Core::ProxyType<Job> _activity;