Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4048a56 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libprocessgroup: Improve error messages" am: 29752d27 am: 0ad558c5 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2252953



Change-Id: I1bd72c66e508e3c95a27ee3641bfae31fdf8a887
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d94f5690 0ad558c5

libprocessgroup/task_profiles.cpp

+5 −5
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ ProfileAction::CacheUseResult SetCgroupAction::UseCachedFd(ResourceCacheType cac 
    if (cache_type == ResourceCacheType::RCT_TASK &&

        fd_[cache_type] == FdCacheHelper::FDS_APP_DEPENDENT) {

        // application-dependent path can't be used with tid

        PLOG(ERROR) << "Application profile can't be applied to a thread";

        LOG(ERROR) << Name() << ": application profile can't be applied to a thread";

        return ProfileAction::FAIL;

    }
@@ -304,7 +304,7 @@ bool SetCgroupAction::ExecuteForProcess(uid_t uid, pid_t pid) const { 
    std::string procs_path = controller()->GetProcsFilePath(path_, uid, pid);

    unique_fd tmp_fd(TEMP_FAILURE_RETRY(open(procs_path.c_str(), O_WRONLY | O_CLOEXEC)));

    if (tmp_fd < 0) {

        PLOG(WARNING) << "Failed to open " << procs_path;

        PLOG(WARNING) << Name() << "::" << __func__ << ": failed to open " << procs_path;

        return false;

    }

    if (!AddTidToCgroup(pid, tmp_fd, controller()->name())) {
@@ -325,7 +325,7 @@ bool SetCgroupAction::ExecuteForTask(int tid) const { 
    std::string tasks_path = controller()->GetTasksFilePath(path_);

    unique_fd tmp_fd(TEMP_FAILURE_RETRY(open(tasks_path.c_str(), O_WRONLY | O_CLOEXEC)));

    if (tmp_fd < 0) {

        PLOG(WARNING) << "Failed to open " << tasks_path;

        PLOG(WARNING) << Name() << "::" << __func__ << ": failed to open " << tasks_path;

        return false;

    }

    if (!AddTidToCgroup(tid, tmp_fd, controller()->name())) {
@@ -394,7 +394,7 @@ bool WriteFileAction::WriteValueToFile(const std::string& value_, ResourceCacheT 
    unique_fd tmp_fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_WRONLY | O_CLOEXEC)));



    if (tmp_fd < 0) {

        if (logfailures) PLOG(WARNING) << "Failed to open " << path;

        if (logfailures) PLOG(WARNING) << Name() << "::" << __func__ << ": failed to open " << path;

        return false;

    }
@@ -431,7 +431,7 @@ ProfileAction::CacheUseResult WriteFileAction::UseCachedFd(ResourceCacheType cac 
    if (cache_type == ResourceCacheType::RCT_TASK &&

        fd_[cache_type] == FdCacheHelper::FDS_APP_DEPENDENT) {

        // application-dependent path can't be used with tid

        PLOG(ERROR) << "Application profile can't be applied to a thread";

        LOG(ERROR) << Name() << ": application profile can't be applied to a thread";

        return ProfileAction::FAIL;

    }

    return ProfileAction::UNUSED;