Skip to content
This repository has been archived by the owner on Feb 13, 2024. It is now read-only.

Rebase with googlesource android-7.1.2_r39 #2

Open
wants to merge 51 commits into
base: anbox/master
Choose a base branch
from

Conversation

Road-Drum
Copy link

No description provided.

Nicolas Geoffray and others added 30 commits July 28, 2016 04:26
am: 0a210d9

Change-Id: I21bb2189eb9220bab756a58408fc7099ff710996
am: 6b9c54c

Change-Id: I789734e0aaa3d217b4221cab79e5a268c9c21675
am: 99c959f

Change-Id: I8302de355f210b78573d2a4b14a7bc1c53c2af7f
am: f242f66

Change-Id: I8043e4a91d7aebe9a7c9fbd90cb0382eb8fa6789
…r1-dev

am: 546ca1b

Change-Id: I9a6e6f16636c369eb03e407a47e083183c465732
am: 5464c73

Change-Id: Id83316ec538a13bd70e77b669c60ba37ee76d4ea
…1-dev

am: b6f58cb

Change-Id: I69786ff4810ccf8b625832382d9f752b5811ba99
am: 95ca9d2

Change-Id: Ia5b2477311036d4d55fb84f4895ba6167fea3d13
am: 1488ff8

Change-Id: I904562490ccc66831a4513864719019bd4b761ad
am: 19d9b1e

Change-Id: Iad472ba0d242bfad43211692d1c28b4f43f00600
am: 4739338

Change-Id: Id9ef46ef85495132dd9b9d3e8471fe94cd06d75c
…nyc-mr1-dev

am: 7ae0862

Change-Id: I8cb8282d61aea83ec09bbcd68e9bdb329a02db51
am: 1386f86

Change-Id: Ic196684640f2bad1b24837bdefd902305b4eb785
am: adc538a

Change-Id: I5dc4f5291800c124beed080e46bfee437b40669b
am: 23da026

Change-Id: Icc27f56679886cddbacdd2fcb198bdeeafdd1904
am: db16f2a

Change-Id: Ifa6f51e997bc1283cc892d3b00ed8c8b2f187307
am: 250a966

Change-Id: I220924343cbf4a510473fba8d896b438307dc567
am: 91373ca

Change-Id: I3d75cc076f4d7eb9db65ed686a8e27f6e93afa76
am: 0e4a2f0

Change-Id: I0f0ab67798266911cd8209dfdd9cde0cf371c815
am: c90450a

Change-Id: Iacd940d12b4d9a54cd2f7ac21063f6178cf35031
am: b47a1cc

Change-Id: I0f94ef0789b8a15525e38765e45c4a3383af643e
am: 949ce9c

Change-Id: Ic5fc1c6cd47d3620676a5fb4357f09f4727087b9
am: 894f3fd

Change-Id: Iadd8832ab37487dd838c164c066637972c549c17
am: 25adcfb

Change-Id: Iea181f7ef946b7a063d3424845774517011fc706
am: 41be588

Change-Id: I427a63c24354ca8f6f8df788881730b95128e16b
am: 4e9c4e7

Change-Id: Iba240ee3bbb768f258ab7bc3aa22325fd4d7992a
am: d3997bd

Change-Id: I19963f3dca87677b02e52dcc403c6c66b33f352c
am: 280f32b

Change-Id: I6dedb3915fd67c08e45218892a7c909d397d9733
am: ae44441

Change-Id: I44f82f443b449733dadbc1e262aac83a782c76a5
am: 15b7c90

Change-Id: I9a5f61d7d6952f88ea457e15365e19cc13071844
agampe and others added 20 commits October 5, 2016 02:31
am: 47d522b

Change-Id: I0b82fa7b714688b9971eae9c7711821a2c0b32b2
am: 645e477

Change-Id: I071d7c8a53641981673387295c51757e5e18e635
Sort the reference table summary dump by highest count, prioritizing
repeated types and instances. This will help with triaging leaks.

Add a test.

(cherry picked from commit 6e970e7fa88efd5ee38b0d6f9010a3985c62778f)

Bug: 32857749
Test: m test-art-host-gtest-reference_table_test
Merged-In: Id9c7a118c36c06c7510b13c2a51e63f08a27c564
Change-Id: I7e61881b5badf9ac2b6b72333f31437ab498caee
The debugger thread may trigger events (like CLASS PREPARE after the
initalization of a class while processing a command).

This CL removes the incorrect CHECK that makes the runtime abort in
this case. However, we do check that only the debugger thread can
report an event while it is already processing a command.

Bug: 33032664
Test: art/tools/run-jdwp-tests.sh '--mode=host' '--variant=X64'

(cherry picked from commit af8bcf83535cd7bf5651ada2fb08a0ba9c5191d6)

Change-Id: Id2e4362393203935e820586560800b300c6dd3a3
The previous pruning relied on the classes being pruned from the
profile, and then using the profile to prune classes. If there was
no profile, the uses library classes were incorrectly left unpruned.

Leaving these classes unpruned caused aborts during compilation.

Cherry picked from https://android-review.googlesource.com/#/c/312750/

Bug: 30688277
Bug: 31427727

Test: adb shell dex2oat --runtime-arg -classpath --runtime-arg /system/framework/com.google.android.maps.jar --dex-file=/data/app/comb.BBClient-1/base.apk --dex-location=/data/app/comb.BBClient-1/base.apk --oat-file=/data/app/comb.BBClient-1/oat/arm/base.odex  --app-image-file=/data/app/comb.BBClient-1/oat/arm/base.art --image-format=lz4 --compiler-filter=speed

Change-Id: I261b8894847b5b0a4f7330f49666e823a1b38bb0
am: 8394cee

Change-Id: I20a21470cee6c52c50b5ed04ec13c3e17528770a
The previous pruning relied on the classes being pruned from the
profile, and then using the profile to prune classes. If there was
no profile, the uses library classes were incorrectly left unpruned.

Leaving these classes unpruned caused aborts during compilation.

Bug: 30688277

Test: adb shell dex2oat --runtime-arg -classpath --runtime-arg /system/framework/com.google.android.maps.jar --dex-file=/data/app/comb.BBClient-1/base.apk --dex-location=/data/app/comb.BBClient-1/base.apk --oat-file=/data/app/comb.BBClient-1/oat/arm/base.odex  --app-image-file=/data/app/comb.BBClient-1/oat/arm/base.art --image-format=lz4 --compiler-filter=speed

(cherry picked from commit c27bc405312845bda4e25cd24e93211dfc7d7308)

Change-Id: I261b8894847b5b0a4f7330f49666e823a1b38bb0
This fix may be causing other crashes e.g. b/33718412.

Bug: 33718412
Bug: 30688277
Bug: 31427727

This reverts commit 8394cee.

Change-Id: Ie19ece9d8ae1afef8b578482fae1cdbd35ff930d
am: fc9bec2

Change-Id: I7037166ff62642a6c75438d59182ba8ccaf111a6
…T MERGE""

No evidence that the fix was causing crashes.

Bug: 33718412
Bug: 30688277
Bug: 31427727

This reverts commit fc9bec2.

Test: test-art-host

Change-Id: Ib05e9a3ac6079ac246cb2ff00ea133aeddf5cbf3
StickyMarkSweep clear the mark stack,
Because all reachable objects must be referenced by a root or a dirty card.
But, there are some marking hole for class object.

If some object is marked and the object and it's class object is not dirty,
Then class object cannot be marking by card table.

In previous OS including mashmellow,
Class table was maintaned by class linker
and all class object was marked with kVisitRootFlagAllRoots flag.

In N OS,
Class object is not marked with kVisitRootFlagAllRoots.
So, I added new flag to mark class object and using it StickyMarkSweep.

Added regression test in 141-class-unload.

Test: test-art-host
Merged-In: I57599e6db53b260f4c5ef466b63962141b8da5c3

(cherry picked from commit a2d1b28599e38ee0180f0f7130a879eac5be9dec)

Bug: 33924225

Change-Id: I57599e6db53b260f4c5ef466b63962141b8da5c3
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
Doing a suspend check after moving the result into the shadow frame
result_register_ is not safe since result_register_ is not a GC
root. The suspend check is unnecessary since the opcodes that branch
to MterpReturn already do a suspend check.

This could maybe explain one crash for CC that was seen after calling
a getter that had no compiled code.

The extra suspend check appears to only be present on arm64 amd mips64.

Test: test-art-target ART_TEST_INTERPRETER=true, N5X booting

(cherry picked from commit aceff18580b94a586a469110565f2ba166f3635a)

Bug: 33211261
Change-Id: I70b8863f40a25a26f278ac8ef0d57e083b663e0f
When generating JIT code, perform cache maintenance operations before
removing page write permissions. Errata on some cores require data
flush operations to be followed by data invalidate operations
requiring write permission.

Test: ART_TEST_JIT=true test-art-target on an arm64 device.
bug: 27265969

(cherry picked from commit b18a669259aa6ba08d9ca01b5b32c1aa0417138b)

Change-Id: I53080c664f9e7cfebe25f87cf6a45cd6eb33b281
Compiler threads (AOT or JIT) should not call into Java as they have no
peers (which may lead to crashes, e.g. b/33067273)

(cherry picked from commit ccd56958eb46fbb00c1eb45c7a7b23d5bbfd7698)

Bug: 32602185
Bug: 33067273

Test: m test-art-host-run-test; m test-art-host-gtest
Change-Id: I97dda7a5444643db3c5d5318339a65a602f709e8
Add a mode where worker threads in a thread pool will get a Java
peer. Add a test.

(cherry picked from commit b15de0c0580633701c19c32bb60bcd64f30da867)

Bug: 29547798
Bug: 31684920
Test: m test-art-host-gtest-thread_pool_test
Change-Id: I3654cc2be1294a79881b6ac9f84445a1e7f24b70
This reverts commit 9dfb707ba2f8c2ff67d42c26e3214f5d7142b6d3.

Accept a live Java thread for the JIT, and adjust the tests
accordingly.

(cherry picked from commit 4471e4f7c5874bdaf93762b6047d4a4bebc465df)

Bug: 31684920
Test: m ART_TEST_JIT=true ART_TEST_INTERPRETER=true test-art-host
Change-Id: I92cbae1eaae05711b9069335cf1a5f7eb58b9fd8
Use 644 permissions by default so that only the owner has write-rights.

Bug: 130821293
Test: host run-test & gtest
Merged-In: Ic4dae399a5bfe862aff3d8614c45b38044d805db
Merged-In: I09eab9749d1ce5872ecaf7d5a80fc45c9c708853
Change-Id: I09eab9749d1ce5872ecaf7d5a80fc45c9c708853
(cherry picked from commit e69642936ef28e09970e8a3abb36f31e3d7d17bf)
Modify the code that ensures we can install a stack guard page into
the main thread.

A recent kernel change means that our previous approach of using a
free pointer does not work. It is important to actually extend the
stack properly. For portability, use a function with a large stack
frame (suggested by and adapted from hboehm).

Bug: 62952017
Test: m
Test: m test-art-host
Test: Device boots (x86_64 emulator)
Test: Device boots (bullhead)
Change-Id: Ic2a0c3d6d05a1ea9f655329d147b46949e1b9db3
@Road-Drum
Copy link
Author

Apologies for not checking correctly, this pull request is still untested as I am still rebasing other forked anbox sources. Maybe stale would be wise until I've tested the image

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants