Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Limit heap growth on Android #20473

Merged
dnfield merged 12 commits into from
Nov 12, 2020
Merged

Limit heap growth on Android #20473

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cd9045e
Start
dnfield Aug 13, 2020
de357b2
bytes
dnfield Aug 13, 2020
834417b
..
dnfield Aug 13, 2020
1ed2d8d
merge
dnfield Sep 18, 2020
5bebd55
testss
dnfield Sep 18, 2020
eb485ef
Merge remote-tracking branch 'upstream/master' into android_mem_limit
dnfield Sep 18, 2020
0847dcd
shell args
dnfield Sep 18, 2020
f2a9f84
make it simpler
dnfield Sep 21, 2020
96ad46e
Merge remote-tracking branch 'upstream/master' into android_mem_limit
dnfield Sep 22, 2020
0a345dd
xster review
dnfield Sep 22, 2020
4612bac
merge
dnfield Nov 12, 2020
a118c90
Use totalMem and allow it to be overridden in manifest
dnfield Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
..
  • Loading branch information
@dnfield
dnfield committed Aug 13, 2020
commit 834417bfe2fc03284411cf549ad552a975e0c34b
2 changes: 1 addition & 1 deletion shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public static native void nativeInit(
@NonNull String appStoragePath,
@NonNull String engineCachesPath,
long initTimeMillis,
long oldGenHeapSizeBytes);
long oldGenHeapSizeMegaBytes);

/**
* Prefetch the default font manager provided by SkFontMgr::RefDefault() which is a process-wide
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public void ensureInitializationComplete(
}

ActivityManager activityManager = (ActivityManager)getSystemService(ACTIVITY_SERVICE);
long oldGenHeapSizeBytes = activityManager.getLargeMemoryClass() * 1000000;
long oldGenHeapSizeMegaBytes = activityManager.getLargeMemoryClass();

FlutterJNI.nativeInit(
applicationContext,
Expand All @@ -254,7 +254,7 @@ public void ensureInitializationComplete(
result.appStoragePath,
result.engineCachesPath,
initTimeMillis,
oldGenHeapSizeBytes);
oldGenHeapSizeMegaBytes);
Copy link
Member

@jason-simmons jason-simmons Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can oldGenHeapSizeMegaBytes be provided as a shell command line flag in shell/common/switches.h?

Copy link
Contributor Author

@dnfield dnfield Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could but then we lose some static type checking here. Is there some reason you have in mind to do it that way?

Copy link
Member

@jason-simmons jason-simmons Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be more consistent with how other engine settings are assigned and would avoid a proliferation of nativeInit arguments

Copy link
Contributor Author

@dnfield dnfield Sep 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


initialized = true;
} catch (Exception e) {
Expand Down