Modify activation method

Change-Id: I55897427b3ecc56de36c461cbcc2f6801def5b9f
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/src/launchpad-process-pool/loader_context.cc b/src/launchpad-process-pool/loader_context.cc
index a1b1cfcddd0e7fb24acd26ae0a090b843ba20b25..53e8ab1b878c5361b8bf0fc1cb93784b35417dc0 100644 (file)
--- a/src/launchpad-process-pool/loader_context.cc
+++ b/src/launchpad-process-pool/loader_context.cc
@@ -495,6 +495,11 @@ void LoaderContext::Deactivate() {
   Dispose();
 }
 
+bool LoaderContext::CanBeDetected(LoaderMethod method) const {
+  return (static_cast<int>(loader_info_->GetDetectionMethod()) &
+      static_cast<int>(method));
+}
+
 bool LoaderContext::CanActivate(LoaderMethod method) const {
   return (static_cast<int>(loader_info_->GetActivationMethod()) &
       static_cast<int>(method));

diff --git a/src/launchpad-process-pool/loader_context.hh b/src/launchpad-process-pool/loader_context.hh
index 4561198d63238b5219950759104a79da7d02e2fe..15ad2b87533c9541f006e4a4ffe2e82ff648a4aa 100644 (file)
--- a/src/launchpad-process-pool/loader_context.hh
+++ b/src/launchpad-process-pool/loader_context.hh
@@ -102,6 +102,7 @@ class LoaderContext : public std::enable_shared_from_this<LoaderContext>,
   void UpdatePssMemory();
   uint64_t GetPssMemory() const;
   unsigned int GetScore() const;
+  bool CanBeDetected(LoaderMethod method) const;
   bool CanActivate(LoaderMethod method) const;
   void UpdateState(LoaderMethod method, bool force);
   bool IsLaunchable();

diff --git a/src/launchpad-process-pool/loader_manager.cc b/src/launchpad-process-pool/loader_manager.cc
index 7df3837f77f4867c92e122645d97c5d57970d454..8e4fc3e8a0dbb67bed916bffb9917084be407222 100644 (file)
--- a/src/launchpad-process-pool/loader_manager.cc
+++ b/src/launchpad-process-pool/loader_manager.cc
@@ -128,7 +128,7 @@ void LoaderManager::ActivateLoaderContexts(LoaderMethod method) {
     if (context->GetPid() > 0)
       continue;
 
-    if (!context->IsTouched() || context->CanActivate(method)) {
+    if (!context->IsTouched() || context->CanBeDetected(method)) {
       context->UnsetTimer();
       context->SetLoaderMethod(method);
       sequencer_->Add(context);