From 538fc1fab14dd7ee6b65aa7481fc4c12da2cdcfb Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 13 Apr 2022 18:50:12 +0000 Subject: [PATCH] Reland "libprocessgroup: return false on failure" This reverts commit c109b13b5a72f9dd357864f7fe5748c81b4f2310. Reason for revert: uploading with a CL fixing the broken test Change-Id: I97a0a49ded8bc17c2d70c82f8e48fce09e49b2bd --- libprocessgroup/task_profiles.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp index 27060aed5..e1c593407 100644 --- a/libprocessgroup/task_profiles.cpp +++ b/libprocessgroup/task_profiles.cpp @@ -806,6 +806,7 @@ const IProfileAttribute* TaskProfiles::GetAttribute(const std::string& name) con bool TaskProfiles::SetProcessProfiles(uid_t uid, pid_t pid, const std::vector& profiles, bool use_fd_cache) { + bool success = true; for (const auto& name : profiles) { TaskProfile* profile = GetProfile(name); if (profile != nullptr) { @@ -814,16 +815,19 @@ bool TaskProfiles::SetProcessProfiles(uid_t uid, pid_t pid, } if (!profile->ExecuteForProcess(uid, pid)) { PLOG(WARNING) << "Failed to apply " << name << " process profile"; + success = false; } } else { - PLOG(WARNING) << "Failed to find " << name << "process profile"; + PLOG(WARNING) << "Failed to find " << name << " process profile"; + success = false; } } - return true; + return success; } bool TaskProfiles::SetTaskProfiles(int tid, const std::vector& profiles, bool use_fd_cache) { + bool success = true; for (const auto& name : profiles) { TaskProfile* profile = GetProfile(name); if (profile != nullptr) { @@ -832,10 +836,12 @@ bool TaskProfiles::SetTaskProfiles(int tid, const std::vector& prof } if (!profile->ExecuteForTask(tid)) { PLOG(WARNING) << "Failed to apply " << name << " task profile"; + success = false; } } else { - PLOG(WARNING) << "Failed to find " << name << "task profile"; + PLOG(WARNING) << "Failed to find " << name << " task profile"; + success = false; } } - return true; + return success; }