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

Commit 7b1bb72f authored by Daeho Jeong's avatar Daeho Jeong Committed by Automerger Merge Worker
Browse files

Merge changes from topic "gc_sleep_time" am: 4ed32515 am: b3b35f37 am:... 

Merge changes from topic "gc_sleep_time" am: 4ed32515 am: b3b35f37 am: 9960d64a am: 76ce7d81

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133943



Change-Id: Id1af86fa36f27ba509f8fca877426322e35d0b22
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b55e304e 76ce7d81

services/core/java/com/android/server/StorageManagerService.java

+17 −9
Original line number Diff line number Diff line
@@ -360,6 +360,8 @@ class StorageManagerService extends IStorageManager.Stub 
    private static final float DEFAULT_LOW_BATTERY_LEVEL = 20F;

    // Decide whether charging is required to turn on the feature

    private static final boolean DEFAULT_CHARGING_REQUIRED = true;

    // Minimum GC interval sleep time in ms

    private static final int DEFAULT_MIN_GC_SLEEPTIME = 10000;



    private volatile int mLifetimePercentThreshold;

    private volatile int mMinSegmentsThreshold;
@@ -367,6 +369,7 @@ class StorageManagerService extends IStorageManager.Stub 
    private volatile float mSegmentReclaimWeight;

    private volatile float mLowBatteryLevel;

    private volatile boolean mChargingRequired;

    private volatile int mMinGCSleepTime;

    private volatile boolean mNeedGC;



    private volatile boolean mPassedLifetimeThresh;
@@ -2675,6 +2678,8 @@ class StorageManagerService extends IStorageManager.Stub 
                "low_battery_level", DEFAULT_LOW_BATTERY_LEVEL);

            mChargingRequired = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,

                "charging_required", DEFAULT_CHARGING_REQUIRED);

            mMinGCSleepTime = DeviceConfig.getInt(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,

                "min_gc_sleeptime", DEFAULT_MIN_GC_SLEEPTIME);



            // If we use the smart idle maintenance, we need to turn off GC in the traditional idle

            // maintenance to avoid the conflict
@@ -2792,13 +2797,6 @@ class StorageManagerService extends IStorageManager.Stub 
        enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS);



        try {

            // Block based checkpoint process runs fstrim. So, if checkpoint is in progress

            // (first boot after OTA), We skip the smart idle maintenance

            if (!needsCheckpoint() || !supportsBlockCheckpoint()) {

                if (!refreshLifetimeConstraint() || !checkChargeStatus()) {

                    return;

                }



            int latestWrite = mVold.getWriteAmount();

            if (latestWrite == -1) {

                Slog.w(TAG, "Failed to get storage write record");
@@ -2806,6 +2804,14 @@ class StorageManagerService extends IStorageManager.Stub 
            }



            updateStorageWriteRecords(latestWrite);



            // Block based checkpoint process runs fstrim. So, if checkpoint is in progress

            // (first boot after OTA), We skip the smart idle maintenance

            if (!needsCheckpoint() || !supportsBlockCheckpoint()) {

                if (!refreshLifetimeConstraint() || !checkChargeStatus()) {

                    return;

                }



                int avgWriteAmount = getAverageWriteAmount();



                Slog.i(TAG, "Set smart idle maintenance: " + "latest write amount: " +
@@ -2813,9 +2819,11 @@ class StorageManagerService extends IStorageManager.Stub 
                            ", min segment threshold: " + mMinSegmentsThreshold +

                            ", dirty reclaim rate: " + mDirtyReclaimRate +

                            ", segment reclaim weight: " + mSegmentReclaimWeight +

                            ", period: " + sSmartIdleMaintPeriod);

                            ", period(min): " + sSmartIdleMaintPeriod +

                            ", min gc sleep time(ms): " + mMinGCSleepTime);

                mVold.setGCUrgentPace(avgWriteAmount, mMinSegmentsThreshold, mDirtyReclaimRate,

                                      mSegmentReclaimWeight, sSmartIdleMaintPeriod);

                                      mSegmentReclaimWeight, sSmartIdleMaintPeriod,

                                      mMinGCSleepTime);

            } else {

                Slog.i(TAG, "Skipping smart idle maintenance - block based checkpoint in progress");

            }