From c39b0cd11e66794391a58d7cf2875026d9889626 Mon Sep 17 00:00:00 2001 From: pix106 Date: Fri, 25 Mar 2022 07:46:34 +0100 Subject: [PATCH] Revert "sdm660-common: Copy Modified libprocessgroup configs to vendor" This reverts commit cf5fe98a5398841b7af7d475931e6ce4baba6e53. --- configs/cgroups.json | 55 --- configs/task_profiles.json | 696 ------------------------------------- sdm660.mk | 8 +- 3 files changed, 4 insertions(+), 755 deletions(-) delete mode 100644 configs/cgroups.json delete mode 100644 configs/task_profiles.json diff --git a/configs/cgroups.json b/configs/cgroups.json deleted file mode 100644 index cfec36a6..00000000 --- a/configs/cgroups.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "Cgroups": [ - { - "Controller": "blkio", - "Path": "/dev/blkio", - "Mode": "0755", - "UID": "system", - "GID": "system" - }, - { - "Controller": "cpu", - "Path": "/dev/cpuctl", - "Mode": "0755", - "UID": "system", - "GID": "system" - }, - { - "Controller": "cpuset", - "Path": "/dev/cpuset", - "Mode": "0755", - "UID": "system", - "GID": "system" - }, - { - "Controller": "memory", - "Path": "/dev/memcg", - "Mode": "0700", - "UID": "root", - "GID": "system", - "Optional": true - }, - { - "Controller": "schedtune", - "Path": "/dev/stune", - "Mode": "0755", - "UID": "system", - "GID": "system" - } - ], - "Cgroups2": { - "Path": "/sys/fs/cgroup", - "Mode": "0755", - "UID": "system", - "GID": "system", - "Controllers": [ - { - "Controller": "freezer", - "Path": ".", - "Mode": "0755", - "UID": "system", - "GID": "system" - } - ] - } -} diff --git a/configs/task_profiles.json b/configs/task_profiles.json deleted file mode 100644 index 1ef4067f..00000000 --- a/configs/task_profiles.json +++ /dev/null @@ -1,696 +0,0 @@ -{ - "Attributes": [ - { - "Name": "LowCapacityCPUs", - "Controller": "cpuset", - "File": "background/cpus" - }, - { - "Name": "HighCapacityCPUs", - "Controller": "cpuset", - "File": "foreground/cpus" - }, - { - "Name": "MaxCapacityCPUs", - "Controller": "cpuset", - "File": "top-app/cpus" - }, - { - "Name": "AudioAppCapacityCPUs", - "Controller": "cpuset", - "File": "audio-app/cpus" - }, - - { - "Name": "MemLimit", - "Controller": "memory", - "File": "memory.limit_in_bytes" - }, - { - "Name": "MemSoftLimit", - "Controller": "memory", - "File": "memory.soft_limit_in_bytes" - }, - { - "Name": "MemSwappiness", - "Controller": "memory", - "File": "memory.swappiness" - }, - { - "Name": "STuneBoost", - "Controller": "schedtune", - "File": "schedtune.boost" - }, - { - "Name": "STunePreferIdle", - "Controller": "schedtune", - "File": "schedtune.prefer_idle" - }, - { - "Name": "UClampMin", - "Controller": "cpu", - "File": "cpu.uclamp.min" - }, - { - "Name": "UClampMax", - "Controller": "cpu", - "File": "cpu.uclamp.max" - }, - { - "Name": "UClampLatencySensitive", - "Controller": "cpu", - "File": "cpu.uclamp.latency_sensitive" - }, - { - "Name": "FreezerState", - "Controller": "freezer", - "File": "cgroup.freeze" - } - ], - - "Profiles": [ - { - "Name": "HighEnergySaving", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "schedtune", - "Path": "background" - } - } - ] - }, - { - "Name": "Frozen", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "FreezerState", - "Value": "1" - } - } - ] - }, - { - "Name": "Unfrozen", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "FreezerState", - "Value": "0" - } - } - ] - }, - { - "Name": "NormalPerformance", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpu", - "Path": "system" - } - } - ] - }, - { - "Name": "ServicePerformance", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpu", - "Path": "system-background" - } - } - ] - }, - { - "Name": "HighPerformance", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "schedtune", - "Path": "foreground" - } - } - ] - }, - { - "Name": "MaxPerformance", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "schedtune", - "Path": "top-app" - } - } - ] - }, - { - "Name": "RealtimePerformance", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "schedtune", - "Path": "rt" - } - } - ] - }, - { - "Name": "CameraServicePerformance", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "schedtune", - "Path": "camera-daemon" - } - } - ] - }, - { - "Name": "AudioAppPerformance", - "Actions" : [ - { - "Name" : "JoinCgroup", - "Params" : - { - "Controller": "schedtune", - "Path": "audio-app" - } - } - ] - }, - - { - "Name": "CpuPolicySpread", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "STunePreferIdle", - "Value": "1" - } - } - ] - }, - { - "Name": "CpuPolicyPack", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "STunePreferIdle", - "Value": "0" - } - } - ] - }, - - { - "Name": "VrKernelCapacity", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "" - } - } - ] - }, - { - "Name": "VrServiceCapacityLow", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "system/background" - } - } - ] - }, - { - "Name": "VrServiceCapacityNormal", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "system" - } - } - ] - }, - { - "Name": "VrServiceCapacityHigh", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "system/performance" - } - } - ] - }, - { - "Name": "VrProcessCapacityLow", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "application/background" - } - } - ] - }, - { - "Name": "VrProcessCapacityNormal", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "application" - } - } - ] - }, - { - "Name": "VrProcessCapacityHigh", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "application/performance" - } - } - ] - }, - - { - "Name": "ProcessCapacityLow", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "background" - } - } - ] - }, - { - "Name": "ProcessCapacityNormal", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "" - } - } - ] - }, - { - "Name": "ProcessCapacityHigh", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "foreground" - } - } - ] - }, - { - "Name": "ProcessCapacityMax", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "top-app" - } - } - ] - }, - - { - "Name": "ServiceCapacityLow", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "system-background" - } - } - ] - }, - { - "Name": "ServiceCapacityRestricted", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "restricted" - } - } - ] - }, - - { - "Name": "CameraServiceCapacity", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "camera-daemon" - } - } - ] - }, - { - "Name": "AudioAppCapacity", - "Actions" : [ - { - "Name" : "JoinCgroup", - "Params" : - { - "Controller": "cpuset", - "Path": "audio-app" - } - } - ] - }, - - { - "Name": "BlkIOForeground", - "Actions" : [ - { - "Name" : "JoinCgroup", - "Params" : - { - "Controller": "blkio", - "Path": "" - } - } - ] - }, - { - "Name": "BlkIOBackground", - "Actions" : [ - { - "Name" : "JoinCgroup", - "Params" : - { - "Controller": "blkio", - "Path": "bg" - } - } - ] - }, - - { - "Name": "LowIoPriority", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "blkio", - "Path": "background" - } - } - ] - }, - { - "Name": "NormalIoPriority", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "blkio", - "Path": "" - } - } - ] - }, - { - "Name": "HighIoPriority", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "blkio", - "Path": "" - } - } - ] - }, - { - "Name": "MaxIoPriority", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "blkio", - "Path": "" - } - } - ] - }, - - { - "Name": "TimerSlackHigh", - "Actions": [ - { - "Name": "SetTimerSlack", - "Params": - { - "Slack": "40000000" - } - } - ] - }, - { - "Name": "TimerSlackNormal", - "Actions": [ - { - "Name": "SetTimerSlack", - "Params": - { - "Slack": "50000" - } - } - ] - }, - - { - "Name": "SFMainPolicy", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "system-background" - } - } - ] - }, - { - "Name": "SFRenderEnginePolicy", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "system-background" - } - } - ] - }, - - { - "Name": "PerfBoost", - "Actions": [ - { - "Name": "SetClamps", - "Params": - { - "Boost": "50%", - "Clamp": "0" - } - } - ] - }, - { - "Name": "PerfClamp", - "Actions": [ - { - "Name": "SetClamps", - "Params": - { - "Boost": "0", - "Clamp": "30%" - } - } - ] - }, - - { - "Name": "LowMemoryUsage", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "MemSoftLimit", - "Value": "16MB" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "MemSwappiness", - "Value": "150" - - } - } - ] - }, - { - "Name": "HighMemoryUsage", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "MemSoftLimit", - "Value": "512MB" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "MemSwappiness", - "Value": "100" - } - } - ] - }, - { - "Name": "SystemMemoryProcess", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "memory", - "Path": "system" - } - } - ] - }, - ], - - "AggregateProfiles": [ - { - "Name": "SCHED_SP_DEFAULT", - "Profiles": [ "TimerSlackNormal" ] - }, - { - "Name": "SCHED_SP_BACKGROUND", - "Profiles": [ "HighEnergySaving", "LowIoPriority", "TimerSlackHigh" ] - }, - { - "Name": "SCHED_SP_FOREGROUND", - "Profiles": [ "HighPerformance", "HighIoPriority", "TimerSlackNormal" ] - }, - { - "Name": "SCHED_SP_TOP_APP", - "Profiles": [ "MaxPerformance", "MaxIoPriority", "TimerSlackNormal" ] - }, - { - "Name": "SCHED_SP_SYSTEM", - "Profiles": [ "ServicePerformance", "LowIoPriority", "TimerSlackNormal" ] - }, - { - "Name": "SCHED_SP_RT_APP", - "Profiles": [ "RealtimePerformance", "MaxIoPriority", "TimerSlackNormal" ] - }, - { - "Name": "CPUSET_SP_DEFAULT", - "Profiles": [ "TimerSlackNormal" ] - }, - { - "Name": "CPUSET_SP_BACKGROUND", - "Profiles": [ "HighEnergySaving", "ProcessCapacityLow", "LowIoPriority", "TimerSlackHigh" ] - }, - { - "Name": "CPUSET_SP_FOREGROUND", - "Profiles": [ "HighPerformance", "ProcessCapacityHigh", "HighIoPriority", "TimerSlackNormal" ] - }, - { - "Name": "CPUSET_SP_TOP_APP", - "Profiles": [ "MaxPerformance", "ProcessCapacityMax", "MaxIoPriority", "TimerSlackNormal" ] - }, - { - "Name": "CPUSET_SP_SYSTEM", - "Profiles": [ "ServiceCapacityLow", "TimerSlackNormal" ] - }, - { - "Name": "CPUSET_SP_RESTRICTED", - "Profiles": [ "ServiceCapacityRestricted", "TimerSlackNormal" ] - } - ] -} diff --git a/sdm660.mk b/sdm660.mk index 944abab8..02f8a51e 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -150,10 +150,10 @@ PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.6 \ vendor.qti.hardware.camera.device@1.0 -# Cgroup and task_profiles -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json \ - $(COMMON_PATH)/configs/cgroups.json:$(TARGET_COPY_OUT_VENDOR)/etc/cgroups.json +# Codec2 modules +PRODUCT_PACKAGES += \ + com.android.media.swcodec \ + libsfplugin_ccodec # Component overrides PRODUCT_COPY_FILES += \