Merge "libprocessgroup: Change per-API level task profiles to override the diffs" am: 42fcd76e6c (f3ea3090) · Commits · e / os / android_system_core

libprocessgroup/profiles/cgroups_28.json

+1 −49

Original line number	Diff line number	Diff line
		{
		"Cgroups": [
		{
		"Controller": "blkio",
		"Path": "/dev/blkio",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "cpu",
		"Path": "/dev/cpuctl",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "cpuacct",
		"Path": "/acct",
		"Mode": "0555"
		},
		{
		"Controller": "cpuset",
		"Path": "/dev/cpuset",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "memory",
		"Path": "/dev/memcg",
		"Mode": "0700",
		"UID": "root",
		"GID": "system"
		},
		{
		"Controller": "schedtune",
		"Path": "/dev/stune",
		@@ -40,20 +7,5 @@
		"UID": "system",
		"GID": "system"
		}
		],
		"Cgroups2": {
		"Path": "/sys/fs/cgroup",
		"Mode": "0755",
		"UID": "system",
		"GID": "system",
		"Controllers": [
		{
		"Controller": "freezer",
		"Path": "freezer",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		}
		]
		}
		}

libprocessgroup/profiles/cgroups_29.json

+1 −49

Original line number	Diff line number	Diff line
		{
		"Cgroups": [
		{
		"Controller": "blkio",
		"Path": "/dev/blkio",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "cpu",
		"Path": "/dev/cpuctl",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "cpuacct",
		"Path": "/acct",
		"Mode": "0555"
		},
		{
		"Controller": "cpuset",
		"Path": "/dev/cpuset",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "memory",
		"Path": "/dev/memcg",
		"Mode": "0700",
		"UID": "root",
		"GID": "system"
		},
		{
		"Controller": "schedtune",
		"Path": "/dev/stune",
		@@ -40,20 +7,5 @@
		"UID": "system",
		"GID": "system"
		}
		],
		"Cgroups2": {
		"Path": "/sys/fs/cgroup",
		"Mode": "0755",
		"UID": "system",
		"GID": "system",
		"Controllers": [
		{
		"Controller": "freezer",
		"Path": "freezer",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		}
		]
		}
		}

libprocessgroup/profiles/cgroups_30.json

+1 −49

Original line number	Diff line number	Diff line
		{
		"Cgroups": [
		{
		"Controller": "blkio",
		"Path": "/dev/blkio",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "cpu",
		"Path": "/dev/cpuctl",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "cpuacct",
		"Path": "/acct",
		"Mode": "0555"
		},
		{
		"Controller": "cpuset",
		"Path": "/dev/cpuset",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "memory",
		"Path": "/dev/memcg",
		"Mode": "0700",
		"UID": "root",
		"GID": "system"
		},
		{
		"Controller": "schedtune",
		"Path": "/dev/stune",
		@@ -40,20 +7,5 @@
		"UID": "system",
		"GID": "system"
		}
		],
		"Cgroups2": {
		"Path": "/sys/fs/cgroup",
		"Mode": "0755",
		"UID": "system",
		"GID": "system",
		"Controllers": [
		{
		"Controller": "freezer",
		"Path": "freezer",
		"Mode": "0755",
		"UID": "system",
		"GID": "system"
		}
		]
		}
		}

libprocessgroup/profiles/task_profiles_28.json

+0 −492

Original line number	Diff line number	Diff line
		{
		"Attributes": [
		{
		"Name": "LowCapacityCPUs",
		"Controller": "cpuset",
		"File": "background/cpus"
		},
		{
		"Name": "HighCapacityCPUs",
		"Controller": "cpuset",
		"File": "foreground/cpus"
		},
		{
		"Name": "MaxCapacityCPUs",
		"Controller": "cpuset",
		"File": "top-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",
		@@ -39,21 +9,6 @@
		"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": "FreezerState",
		"Controller": "freezer",
		"File": "cgroup.freeze"
		}
		],

		@@ -71,32 +26,6 @@
		}
		]
		},
		{
		"Name": "Frozen",
		"Actions": [
		{
		"Name": "JoinCgroup",
		"Params":
		{
		"Controller": "freezer",
		"Path": ""
		}
		}
		]
		},
		{
		"Name": "Unfrozen",
		"Actions": [
		{
		"Name": "JoinCgroup",
		"Params":
		{
		"Controller": "freezer",
		"Path": "../"
		}
		}
		]
		},
		{
		"Name": "NormalPerformance",
		"Actions": [
		@@ -201,427 +130,6 @@
		}
		}
		]
		},

		{
		"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": "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": "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"
		}
		}
		]
		},
		{
		"Name": "FreezerDisabled",
		"Actions": [
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "FreezerState",
		"Value": "0"
		}
		}
		]
		},
		{
		"Name": "FreezerEnabled",
		"Actions": [
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "FreezerState",
		"Value": "1"
		}
		}
		]
		}
		],

		"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_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" ]
		}
		]
		}

libprocessgroup/profiles/task_profiles_29.json

+0 −492

Original line number	Diff line number	Diff line
		{
		"Attributes": [
		{
		"Name": "LowCapacityCPUs",
		"Controller": "cpuset",
		"File": "background/cpus"
		},
		{
		"Name": "HighCapacityCPUs",
		"Controller": "cpuset",
		"File": "foreground/cpus"
		},
		{
		"Name": "MaxCapacityCPUs",
		"Controller": "cpuset",
		"File": "top-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",
		@@ -39,21 +9,6 @@
		"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": "FreezerState",
		"Controller": "freezer",
		"File": "cgroup.freeze"
		}
		],

		@@ -71,32 +26,6 @@
		}
		]
		},
		{
		"Name": "Frozen",
		"Actions": [
		{
		"Name": "JoinCgroup",
		"Params":
		{
		"Controller": "freezer",
		"Path": ""
		}
		}
		]
		},
		{
		"Name": "Unfrozen",
		"Actions": [
		{
		"Name": "JoinCgroup",
		"Params":
		{
		"Controller": "freezer",
		"Path": "../"
		}
		}
		]
		},
		{
		"Name": "NormalPerformance",
		"Actions": [
		@@ -201,427 +130,6 @@
		}
		}
		]
		},

		{
		"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": "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": "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"
		}
		}
		]
		},
		{
		"Name": "FreezerDisabled",
		"Actions": [
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "FreezerState",
		"Value": "0"
		}
		}
		]
		},
		{
		"Name": "FreezerEnabled",
		"Actions": [
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "FreezerState",
		"Value": "1"
		}
		}
		]
		}
		],

		"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_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" ]
		}
		]
		}