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

Commit 0d897a24 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5657398 from 702981f5 to qt-c2f2-release 

Change-Id: I3c664082fc77fd643c04db435790956c56994359
parents 7da90b42 702981f5

libprocessgroup/task_profiles.cpp

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ SetCgroupAction::SetCgroupAction(const CgroupController& c, const std::string& p 
}



void SetCgroupAction::EnableResourceCaching() {

    std::lock_guard<std::mutex> lock(fd_mutex_);

    if (fd_ != FDS_NOT_CACHED) {

        return;

    }
@@ -191,6 +192,7 @@ bool SetCgroupAction::AddTidToCgroup(int tid, int fd) { 
}



bool SetCgroupAction::ExecuteForProcess(uid_t uid, pid_t pid) const {

    std::lock_guard<std::mutex> lock(fd_mutex_);

    if (IsFdValid()) {

        // fd is cached, reuse it

        if (!AddTidToCgroup(pid, fd_)) {
@@ -221,6 +223,7 @@ bool SetCgroupAction::ExecuteForProcess(uid_t uid, pid_t pid) const { 
}



bool SetCgroupAction::ExecuteForTask(int tid) const {

    std::lock_guard<std::mutex> lock(fd_mutex_);

    if (IsFdValid()) {

        // fd is cached, reuse it

        if (!AddTidToCgroup(tid, fd_)) {

libprocessgroup/task_profiles.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <sys/cdefs.h>

#include <sys/types.h>

#include <map>

#include <mutex>

#include <string>

#include <vector>
@@ -127,6 +128,7 @@ class SetCgroupAction : public ProfileAction { 
    CgroupController controller_;

    std::string path_;

    android::base::unique_fd fd_;

    mutable std::mutex fd_mutex_;



    static bool IsAppDependentPath(const std::string& path);

    static bool AddTidToCgroup(int tid, int fd);

rootdir/etc/ld.config.txt

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ namespace.media.asan.permitted.paths = /apex/com.android.media/${LIB}/extractors 
namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += libcgrouprc.so

namespace.media.link.default.shared_libs += libmediametrics.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%