Reland: Do not kill recently killed ARC processes again

chrome/browser/memory/tab_manager_delegate_chromeos.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/memory/tab_manager_delegate_chromeos.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
-#include <string>
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/memory_pressure_monitor_chromeos.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/process_handle.h"  // kNullProcessHandle.
@@ skipping 22 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/zygote_host_linux.h"
 #include "ui/aura/window.h"
 #include "ui/wm/public/activation_client.h"
 
 using base::ProcessHandle;
 using base::TimeDelta;
+using base::TimeTicks;
 using content::BrowserThread;
 
 namespace memory {
 namespace {
 
 const char kExoShellSurfaceWindowName[] = "ExoShellSurface";
 const char kArcProcessNamePrefix[] = "org.chromium.arc.";
 
 // When switching to a new tab the tab's renderer's OOM score needs to be
 // updated to reflect its front-most status and protect it from discard.
@@ skipping 483 matching lines @@
     }
     candidates.emplace_back(&app);
   }
 
   // Sort candidates according to priority.
   std::sort(candidates.begin(), candidates.end());
 
   return candidates;
 }
 
+bool TabManagerDelegate::IsRecentlyKilledArcProcess(
+    const std::string& process_name,
+    const TimeTicks& now) {
+  const auto it = recently_killed_arc_processes_.find(process_name);
+  if (it == recently_killed_arc_processes_.end())
+    return false;
+  return (now - it->second) <= GetArcRespawnKillDelay();
+}
+
 bool TabManagerDelegate::KillArcProcess(const int nspid) {
   auto* arc_service_manager = arc::ArcServiceManager::Get();
   if (!arc_service_manager)
     return false;
 
   auto* arc_process_instance = ARC_GET_INSTANCE_FOR_METHOD(
       arc_service_manager->arc_bridge_service()->process(), KillProcess);
   if (!arc_process_instance)
     return false;
 
@@ skipping 17 matching lines @@
     const TabStatsList& tab_list,
     const std::vector<arc::ArcProcess>& arc_processes) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   VLOG(2) << "LowMemoryKillImpl";
 
   const std::vector<TabManagerDelegate::Candidate> candidates =
       GetSortedCandidates(tab_list, arc_processes);
 
   int target_memory_to_free_kb = mem_stat_->TargetMemoryToFreeKB();
   bool killed_candidate = false;
+  const TimeTicks now = TimeTicks::Now();
 
   // Kill processes until the estimated amount of freed memory is sufficient to
   // bring the system memory back to a normal level.
   // The list is sorted by descending importance, so we go through the list
   // backwards.
   for (auto it = candidates.rbegin(); it != candidates.rend(); ++it) {
     VLOG(3) << "Target memory to free: " << target_memory_to_free_kb << " KB";
     // Never kill selected tab or Android foreground app, regardless whether
     // they're in the active window. Since the user experience would be bad.
     ProcessType process_type = it->process_type();
     if (process_type == ProcessType::VISIBLE_APP ||
         process_type == ProcessType::FOCUSED_APP ||
         process_type == ProcessType::FOCUSED_TAB) {
       VLOG(2) << "Skipped killing " << *it;
       continue;
     }
     if (it->app()) {
+      if (IsRecentlyKilledArcProcess(it->app()->process_name(), now)) {
+        MEMORY_LOG(ERROR) << "Avoided killing " << *it << " too often";
+        continue;
+      }
       int estimated_memory_freed_kb =
           mem_stat_->EstimatedMemoryFreedKB(it->app()->pid());
       if (KillArcProcess(it->app()->nspid())) {
+        recently_killed_arc_processes_[it->app()->process_name()] = now;
         target_memory_to_free_kb -= estimated_memory_freed_kb;
         MemoryKillsMonitor::LogLowMemoryKill("APP", estimated_memory_freed_kb);
         MEMORY_LOG(ERROR) << "Killed " << *it << ", estimated "
                           << estimated_memory_freed_kb << " KB freed";
         killed_candidate = true;
       }
     } else {
       int64_t tab_id = it->tab()->tab_contents_id;
       // The estimation is problematic since multiple tabs may share the same
       // process, while the calculation counts memory used by the whole process.
@@ skipping 113 matching lines @@
     }
     priority += priority_increment;
   }
 
   if (oom_scores_to_change.size())
     GetDebugDaemonClient()->SetOomScoreAdj(
         oom_scores_to_change, base::Bind(&OnSetOomScoreAdj));
 }
 
 }  // namespace memory