Code to kill child process

Author: HaseenaSainul

Launcher.cpp

@@ -59,9 +59,9 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
     ASSERT(_activity.IsValid() == true);
 
     _memory->Observe(0);
-    _observer.Unregister(&_notification);
 
     _activity->Shutdown();
+    _observer.Unregister(&_notification);
     _activity.Release();
 
     _memory->Release();
@@ -84,21 +84,47 @@ void Launcher::Update(const ProcessObserver::Info& info)
 
     // This can potentially be called on a socket thread, so the deactivation (wich in turn kills this object) must be done
     // on a seperate thread. Also make sure this call-stack can be unwound before we are totally destructed.
-    if ( (_activity->Pid() == info.Id()) && (info.Event() == ProcessObserver::Info::EVENT_EXIT) ) { 
-
-        _memory->Observe(0);
-        uint32_t result = _activity->ExitCode();
-
-        if (result != Core::ERROR_NONE) {
-            SYSLOG(Trace::Fatal, (_T("FORCED Shutdown: %s by error: %d."), _service->Callsign().c_str(), result));
-            PluginHost::WorkerPool::Instance().Submit(PluginHost::IShell::Job::Create(_service, PluginHost::IShell::DEACTIVATED, PluginHost::IShell::FAILURE));
-        }
-        else if (_activity->Continuous() == false) {
-            TRACE(Trace::Information, (_T("Launcher [%s] has run succesfully, deactivation requested."), _service->Callsign().c_str()));
-            PluginHost::WorkerPool::Instance().Submit(PluginHost::IShell::Job::Create(_service, PluginHost::IShell::DEACTIVATED, PluginHost::IShell::AUTOMATIC));
+    if (_activity->HasPid(info.Id()) == true) {
+
+        switch (info.Event()) {
+        case ProcessObserver::Info::EVENT_FORK:
+            TRACE(Trace::Information, (_T("FORK: parent tid=%d pid=%d -> child tid=%d pid=%d\n"), info.Id(), info.Group(), info.ChildId(), info.ChildGroup()));
+            if (_activity->ShutdownInProgress() == false) {
+                _activity->AddPid(info.ChildId());
+            } else {
+                _activity->Kill(info.ChildId());
+            }
+            break;
+        case ProcessObserver::Info::EVENT_EXEC:
+            TRACE(Trace::Information, (_T("EXEC: tid=%d pid=%d\n"), info.Id(), info.Group()));
+            break;
+        case ProcessObserver::Info::EVENT_EXIT:
+        {
+            if (_activity->Pid() == info.Id()) {
+                _memory->Observe(0);
+                uint32_t result = _activity->ExitCode();
+
+                if (result != Core::ERROR_NONE) {
+                    SYSLOG(Trace::Fatal, (_T("FORCED Shutdown: %s by error: %d."), _service->Callsign().c_str(), result));
+                    if (_activity->ShutdownInProgress() == false) {
+                        PluginHost::WorkerPool::Instance().Submit(PluginHost::IShell::Job::Create(_service, PluginHost::IShell::DEACTIVATED, PluginHost::IShell::FAILURE));
+                    }
+                }
+                else if (_activity->Continuous() == false) {
+                    TRACE(Trace::Information, (_T("Launcher [%s] has run succesfully, deactivation requested."), _service->Callsign().c_str()));
+                    PluginHost::WorkerPool::Instance().Submit(PluginHost::IShell::Job::Create(_service, PluginHost::IShell::DEACTIVATED, PluginHost::IShell::AUTOMATIC));
+                }
+                else {
+                    TRACE(Trace::Information, (_T("Launcher [%s] has run succesfully, scheduled for the next run."), _service->Callsign().c_str()));
+                }
+            } else {
+                _activity->RemovePid(info.Id());
+            }
+            break;
         }
-        else {
-            TRACE(Trace::Information, (_T("Launcher [%s] has run succesfully, scheduled for the next run."), _service->Callsign().c_str()));
+        default:
+            printf("unhandled proc event\n");
+            break;
         }
     }
 }
@@ -125,6 +151,7 @@ bool Launcher::ScheduleParameters(const Config& config, string& message, Core::T
         }
         else if ( (timeMode == ABSOLUTE_WITH_INTERVAL) && ((interval.IsValid() == false) || (interval.TimeInSeconds() == 0)) ) {
             message = _T("Requested mode is ABSOLUTE WITH INTERVAL but no interval (or 0 second interval) is given.");
+
         }
         else {
             // All signals green, we have valid input, calculate the ScheduleTime/Interval time

Launcher.h

@@ -3,6 +3,7 @@
 #include "Module.h"
 #include <interfaces/IMemory.h>
 #include <linux/cn_proc.h>
+#include <vector>
 
 namespace WPEFramework {
 namespace Plugin {
@@ -544,6 +545,8 @@ class Launcher : public PluginHost::IPlugin {
         Job(const Job&) = delete;
         Job& operator=(const Job&) = delete;
 
+        typedef std::vector<uint32_t> ProcessList;
+
     public:
         Job(Config* config, const Time& interval, Exchange::IMemory* memory)
             : _adminLock()
@@ -586,6 +589,41 @@ class Launcher : public PluginHost::IPlugin {
         uint32_t Pid() {
             return _pid;
         }
+        bool ShutdownInProgress() {
+            return _shutdownPhase;
+        }
+        void Kill(uint32_t pid) {
+           ::kill(pid, SIGKILL);
+        }
+        bool HasPid(uint32_t pid) {
+           _adminLock.Lock();
+           ProcessList::iterator position = std::find(_processList.begin(), _processList.end(), pid);
+           _adminLock.Unlock();
+           return (position != _processList.end());
+        }
+        void AddPid(uint32_t pid) {
+            _adminLock.Lock();
+            ASSERT(std::find(_processList.begin(), _processList.end(), pid) == _processList.end());
+            _processList.push_back(pid);
+            _adminLock.Unlock();
+        }
+        void RemovePid(uint32_t pid) {
+            _adminLock.Lock();
+            ProcessList::iterator position = std::find(_processList.begin(), _processList.end(), pid);
+            if (position != _processList.end()) {
+                _processList.erase(position);
+            }
+            _adminLock.Unlock();
+        }
+        void StopChilds() {
+            _adminLock.Lock();
+            ASSERT(!_processList.empty())
+            for (int i = 1; i < _processList.size(); i++) {
+                Kill(_processList[i];);
+            }
+            _processList.clear(); //Clear to ensure it is removed before doing the force shutdown
+            _adminLock.Unlock();
+        }
         void Schedule (const Core::Time& time) {
             if (time <= Core::Time::Now()) {
                 PluginHost::WorkerPool::Instance().Submit(Core::ProxyType<Core::IDispatch>(*this));
@@ -599,7 +637,7 @@ class Launcher : public PluginHost::IPlugin {
             _shutdownPhase = 1;
             _adminLock.Unlock();
 
-            PluginHost::WorkerPool::Instance().Revoke(Core::ProxyType<Core::IDispatch>(*this));
+            (PluginHost::WorkerPool::Instance().Revoke(Core::ProxyType<Core::IDispatch>(*this)));
 
             if (_process.IsActive() == true) {
 
@@ -608,9 +646,11 @@ class Launcher : public PluginHost::IPlugin {
 
                // Wait for a maximum configured wait time before we shoot the process!!
                if (_process.WaitProcessCompleted(_closeTime * 1000) != Core::ERROR_NONE) {
+                   TRACE_L1("Trying to force kill\n");
                    _process.Kill(true);
                    _process.WaitProcessCompleted(1000);
                }
+               StopChilds(); //Ensure all childs are exited before quiting
             }
         }
 
@@ -624,6 +664,7 @@ class Launcher : public PluginHost::IPlugin {
             if (_process.IsActive() == false) {
 
                 _process.Launch(_options, &_pid);
+                AddPid(_pid);
 
                 TRACE(Trace::Information, (_T("Launched command: %s [%d]."), _options.Command().c_str(), _pid));
                 ASSERT (_memory != nullptr);
@@ -651,6 +692,7 @@ class Launcher : public PluginHost::IPlugin {
         Time _interval;
         uint8_t _closeTime;
         uint8_t _shutdownPhase;
+        ProcessList _processList;
     };
 
 public: