Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add property to skip idle state for zram writeback"

Browse Source
This commit is contained in:
Treehugger Robot
2019-12-07 00:12:04 +00:00
committed by Gerrit Code Review
parent 9fd7c05eb9 23d6f0aba6
commit a594a9e68c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/ZramWriteback.java
View File

@@ -60,6 +60,7 @@ public final class ZramWriteback extends JobService {
private static final String MARK_IDLE_DELAY_PROP = "ro.zram.mark_idle_delay_mins"; private static final String MARK_IDLE_DELAY_PROP = "ro.zram.mark_idle_delay_mins";
private static final String FIRST_WB_DELAY_PROP = "ro.zram.first_wb_delay_mins"; private static final String FIRST_WB_DELAY_PROP = "ro.zram.first_wb_delay_mins";
private static final String PERIODIC_WB_DELAY_PROP = "ro.zram.periodic_wb_delay_hours"; private static final String PERIODIC_WB_DELAY_PROP = "ro.zram.periodic_wb_delay_hours";
private static final String FORCE_WRITEBACK_PROP = "zram.force_writeback";
private void markPagesAsIdle() { private void markPagesAsIdle() {
String idlePath = String.format(IDLE_SYS, sZramDeviceId); String idlePath = String.format(IDLE_SYS, sZramDeviceId);
@@ -122,11 +123,12 @@ public final class ZramWriteback extends JobService {
private static void schedNextWriteback(Context context) { private static void schedNextWriteback(Context context) {
int nextWbDelay = SystemProperties.getInt(PERIODIC_WB_DELAY_PROP, 24); int nextWbDelay = SystemProperties.getInt(PERIODIC_WB_DELAY_PROP, 24);
boolean forceWb = SystemProperties.getBoolean(FORCE_WRITEBACK_PROP, false);
JobScheduler js = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); JobScheduler js = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
js.schedule(new JobInfo.Builder(WRITEBACK_IDLE_JOB_ID, sZramWriteback) js.schedule(new JobInfo.Builder(WRITEBACK_IDLE_JOB_ID, sZramWriteback)
.setMinimumLatency(TimeUnit.HOURS.toMillis(nextWbDelay)) .setMinimumLatency(TimeUnit.HOURS.toMillis(nextWbDelay))
.setRequiresDeviceIdle(true) .setRequiresDeviceIdle(!forceWb)
.build()); .build());
} }
@@ -167,6 +169,7 @@ public final class ZramWriteback extends JobService {
public static void scheduleZramWriteback(Context context) { public static void scheduleZramWriteback(Context context) {
int markIdleDelay = SystemProperties.getInt(MARK_IDLE_DELAY_PROP, 20); int markIdleDelay = SystemProperties.getInt(MARK_IDLE_DELAY_PROP, 20);
int firstWbDelay = SystemProperties.getInt(FIRST_WB_DELAY_PROP, 180); int firstWbDelay = SystemProperties.getInt(FIRST_WB_DELAY_PROP, 180);
boolean forceWb = SystemProperties.getBoolean(FORCE_WRITEBACK_PROP, false);
JobScheduler js = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); JobScheduler js = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
@@ -182,7 +185,7 @@ public final class ZramWriteback extends JobService {
// by ro.zram.periodic_wb_delay_hours. // by ro.zram.periodic_wb_delay_hours.
js.schedule(new JobInfo.Builder(WRITEBACK_IDLE_JOB_ID, sZramWriteback) js.schedule(new JobInfo.Builder(WRITEBACK_IDLE_JOB_ID, sZramWriteback)
.setMinimumLatency(TimeUnit.MINUTES.toMillis(firstWbDelay)) .setMinimumLatency(TimeUnit.MINUTES.toMillis(firstWbDelay))
.setRequiresDeviceIdle(true) .setRequiresDeviceIdle(!forceWb)
.build()); .build());
} }
} }