tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vold: add gc period in setGCUrgentPace am: 7c788fc3e9 am: 81ba5bcf1c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2032446

Change-Id: I2ec34972e89ecf6872dece12b0ab05bc9a07511c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daeho Jeong 2022-03-25 23:10:11 +00:00 committed by Automerger Merge Worker
commit a644d5c642
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
IdleMaint.cpp
View file

@ -87,7 +87,7 @@ static const int GC_TIMEOUT_SEC = 420;
static const int DEVGC_TIMEOUT_SEC = 120; static const int DEVGC_TIMEOUT_SEC = 120;
static const int KBYTES_IN_SEGMENT = 2048; static const int KBYTES_IN_SEGMENT = 2048;
static const int MIN_GC_URGENT_SLEEP_TIME = 500; static const int MIN_GC_URGENT_SLEEP_TIME = 500;
static const int ONE_HOUR_IN_MS = 3600000; static const int ONE_MINUTE_IN_MS = 60000;
static const int GC_NORMAL_MODE = 0; static const int GC_NORMAL_MODE = 0;
static const int GC_URGENT_MID_MODE = 3; static const int GC_URGENT_MID_MODE = 3;
@ -531,7 +531,7 @@ int32_t GetStorageLifeTime() {
} }
void SetGCUrgentPace(int32_t neededSegments, int32_t minSegmentThreshold, float dirtyReclaimRate, void SetGCUrgentPace(int32_t neededSegments, int32_t minSegmentThreshold, float dirtyReclaimRate,
float reclaimWeight) { float reclaimWeight, int32_t gcPeriod) {
std::list<std::string> paths; std::list<std::string> paths;
bool needGC = true; bool needGC = true;
@ -586,7 +586,7 @@ void SetGCUrgentPace(int32_t neededSegments, int32_t minSegmentThreshold, float
if (neededSegments == 0) { if (neededSegments == 0) {
sleepTime = MIN_GC_URGENT_SLEEP_TIME; sleepTime = MIN_GC_URGENT_SLEEP_TIME;
} else { } else {
sleepTime = ONE_HOUR_IN_MS / neededSegments; sleepTime = gcPeriod * ONE_MINUTE_IN_MS / neededSegments;
if (sleepTime < MIN_GC_URGENT_SLEEP_TIME) { if (sleepTime < MIN_GC_URGENT_SLEEP_TIME) {
sleepTime = MIN_GC_URGENT_SLEEP_TIME; sleepTime = MIN_GC_URGENT_SLEEP_TIME;
} }

2
IdleMaint.h
View file

@ -27,7 +27,7 @@ int RunIdleMaint(bool needGC, const android::sp<android::os::IVoldTaskListener>&
int AbortIdleMaint(const android::sp<android::os::IVoldTaskListener>& listener); int AbortIdleMaint(const android::sp<android::os::IVoldTaskListener>& listener);
int32_t GetStorageLifeTime(); int32_t GetStorageLifeTime();
void SetGCUrgentPace(int32_t neededSegments, int32_t minSegmentThreshold, float dirtyReclaimRate, void SetGCUrgentPace(int32_t neededSegments, int32_t minSegmentThreshold, float dirtyReclaimRate,
float reclaimWeight); float reclaimWeight, int32_t gcPeriod);
void RefreshLatestWrite(); void RefreshLatestWrite();
int32_t GetWriteAmount(); int32_t GetWriteAmount();

5
VoldNativeService.cpp
View file

@ -494,11 +494,12 @@ binder::Status VoldNativeService::getStorageLifeTime(int32_t* _aidl_return) {
binder::Status VoldNativeService::setGCUrgentPace(int32_t neededSegments, binder::Status VoldNativeService::setGCUrgentPace(int32_t neededSegments,
int32_t minSegmentThreshold, int32_t minSegmentThreshold,
float dirtyReclaimRate, float reclaimWeight) { float dirtyReclaimRate, float reclaimWeight,
int32_t gcPeriod) {
ENFORCE_SYSTEM_OR_ROOT; ENFORCE_SYSTEM_OR_ROOT;
ACQUIRE_LOCK; ACQUIRE_LOCK;
SetGCUrgentPace(neededSegments, minSegmentThreshold, dirtyReclaimRate, reclaimWeight); SetGCUrgentPace(neededSegments, minSegmentThreshold, dirtyReclaimRate, reclaimWeight, gcPeriod);
return Ok(); return Ok();
} }

2
VoldNativeService.h
View file

@ -90,7 +90,7 @@ class VoldNativeService : public BinderService<VoldNativeService>, public os::Bn
binder::Status abortIdleMaint(const android::sp<android::os::IVoldTaskListener>& listener); binder::Status abortIdleMaint(const android::sp<android::os::IVoldTaskListener>& listener);
binder::Status getStorageLifeTime(int32_t* _aidl_return); binder::Status getStorageLifeTime(int32_t* _aidl_return);
binder::Status setGCUrgentPace(int32_t neededSegments, int32_t minSegmentThreshold, binder::Status setGCUrgentPace(int32_t neededSegments, int32_t minSegmentThreshold,
float dirtyReclaimRate, float reclaimWeight); float dirtyReclaimRate, float reclaimWeight, int32_t gcPeriod);
binder::Status refreshLatestWrite(); binder::Status refreshLatestWrite();
binder::Status getWriteAmount(int32_t* _aidl_return); binder::Status getWriteAmount(int32_t* _aidl_return);

3
binder/android/os/IVold.aidl
View file

@ -68,7 +68,8 @@ interface IVold {
void abortIdleMaint(IVoldTaskListener listener); void abortIdleMaint(IVoldTaskListener listener);
int getStorageLifeTime(); int getStorageLifeTime();
void setGCUrgentPace(int neededSegments, int minSegmentThreshold, void setGCUrgentPace(int neededSegments, int minSegmentThreshold,
float dirtyReclaimRate, float reclaimWeight); float dirtyReclaimRate, float reclaimWeight,
int gcPeriod);
void refreshLatestWrite(); void refreshLatestWrite();
int getWriteAmount(); int getWriteAmount();