OSDN Git Service
Aart Bik [Tue, 8 Mar 2016 04:18:59 +0000 (04:18 +0000)]
Merge "Unsafe: Recognize intrinsics for 1.8 java.util.concurrent With unit test." am:
0310fb0279
am:
2fadae77e0
* commit '
2fadae77e0293bcee73b2b8f5d92f9db19d3d9b3':
Unsafe: Recognize intrinsics for 1.8 java.util.concurrent With unit test.
Mathieu Chartier [Tue, 8 Mar 2016 04:18:45 +0000 (04:18 +0000)]
Merge "Add systrace logging to ScopedCodeCacheWrite" am:
9dd26b2e68
am:
dcb5aca20f
* commit '
dcb5aca20fb670e9981af92c05060e8dcd80b364':
Add systrace logging to ScopedCodeCacheWrite
Igor Murashkin [Tue, 8 Mar 2016 04:18:25 +0000 (04:18 +0000)]
Merge "runtime: Add CAS and fences to sun.misc.Unsafe" am:
83537c6e2f
am:
984ae7a1d8
* commit '
984ae7a1d8a60542d310af557a06ca65f186d023':
runtime: Add CAS and fences to sun.misc.Unsafe
Hiroshi Yamauchi [Tue, 8 Mar 2016 04:17:55 +0000 (04:17 +0000)]
Merge changes I70f61fe3,I00376b02 am:
f81f596c58
am:
4f0f72a4c2
* commit '
4f0f72a4c21af76daa8e086e73e8f542c271ffbe':
Revert "ProfilingInfo roots should be visited by the declaring class."
Revert "Query declaring class before querying IsNative."
Mathieu Chartier [Tue, 8 Mar 2016 04:17:40 +0000 (04:17 +0000)]
Merge "Increase kDumpWaitTimeout 10x for target builds" am:
35e0cbce51
am:
bde4b53454
* commit '
bde4b5345452ce473597df3a98b8f6ae10945f34':
Increase kDumpWaitTimeout 10x for target builds
Mathieu Chartier [Tue, 8 Mar 2016 04:17:24 +0000 (04:17 +0000)]
Merge "Don\'t use ScopedObjectAccess in Heap::DumpSpaces" am:
e88430786e
am:
3cc0f1d8e9
* commit '
3cc0f1d8e9689bada41ffb0412502b4286aeec99':
Don't use ScopedObjectAccess in Heap::DumpSpaces
Mathieu Chartier [Tue, 8 Mar 2016 02:15:49 +0000 (02:15 +0000)]
Fix lock order violation
am:
064e9d401c
* commit '
064e9d401c49d3789b5deeeb6b423a4f551e4206':
Fix lock order violation
Mathieu Chartier [Tue, 8 Mar 2016 01:41:39 +0000 (17:41 -0800)]
Fix lock order violation
Release class linker lock before acquiring heap bitmap lock.
Bug:
27493510
Change-Id: I7809e0f591513b85d295d43e639152ce92984f9c
Mathieu Chartier [Tue, 8 Mar 2016 01:15:50 +0000 (01:15 +0000)]
Add verification for image ArtMethod declaring classes
am:
03c1dd9858
* commit '
03c1dd9858962071bf3f0c988abc39e0e6ed7a1e':
Add verification for image ArtMethod declaring classes
Mathieu Chartier [Tue, 8 Mar 2016 00:13:54 +0000 (16:13 -0800)]
Add verification for image ArtMethod declaring classes
Try and see if any ArtMethods in the image have declaring classes
that are not marked in the heap live bitmap. Trying to mark these
would cause a SIGSEGV since the bitmap is read only.
TODO: Disable for performance.
Bug:
27493510
Change-Id: I231b07b84d98dcd7ee1557c18956c86264058ee1
Aart Bik [Tue, 8 Mar 2016 00:05:02 +0000 (00:05 +0000)]
Merge "Unsafe: Recognize intrinsics for 1.8 java.util.concurrent With unit test."
am:
0310fb0279
* commit '
0310fb0279d283439633b7c32801f2bb9443dbe1':
Unsafe: Recognize intrinsics for 1.8 java.util.concurrent With unit test.
Aart Bik [Mon, 7 Mar 2016 23:51:12 +0000 (23:51 +0000)]
Merge "Unsafe: Recognize intrinsics for 1.8 java.util.concurrent With unit test."
Mathieu Chartier [Mon, 7 Mar 2016 22:47:21 +0000 (22:47 +0000)]
Merge "Add systrace logging to ScopedCodeCacheWrite"
am:
9dd26b2e68
* commit '
9dd26b2e68ce2b153fc7c5c6b0ad6458a60ea6f5':
Add systrace logging to ScopedCodeCacheWrite
Igor Murashkin [Mon, 7 Mar 2016 22:45:32 +0000 (22:45 +0000)]
Merge "runtime: Add CAS and fences to sun.misc.Unsafe"
am:
83537c6e2f
* commit '
83537c6e2fe6518e0581a8466ef41e90ea7b5516':
runtime: Add CAS and fences to sun.misc.Unsafe
Mathieu Chartier [Mon, 7 Mar 2016 22:45:04 +0000 (22:45 +0000)]
Merge "Add systrace logging to ScopedCodeCacheWrite"
Mathieu Chartier [Mon, 7 Mar 2016 21:48:08 +0000 (13:48 -0800)]
Add systrace logging to ScopedCodeCacheWrite
Shows if we are taking a long time to mprotect.
Bug:
27502458
(cherry picked from commit
462cd2cfa8c5fbb6548419eb8f27b448a12aca11)
Change-Id: Ic0f24641f5856b13f3b949dcd53dc01ec952d171
Igor Murashkin [Mon, 7 Mar 2016 22:37:43 +0000 (22:37 +0000)]
Merge "runtime: Add CAS and fences to sun.misc.Unsafe"
Hiroshi Yamauchi [Mon, 7 Mar 2016 22:29:42 +0000 (22:29 +0000)]
Merge changes I70f61fe3,I00376b02
am:
f81f596c58
* commit '
f81f596c586dd0de32d336468e22e6fef8257f9b':
Revert "ProfilingInfo roots should be visited by the declaring class."
Revert "Query declaring class before querying IsNative."
Mathieu Chartier [Mon, 7 Mar 2016 22:28:07 +0000 (22:28 +0000)]
Add systrace logging to ScopedCodeCacheWrite
am:
462cd2cfa8
* commit '
462cd2cfa8c5fbb6548419eb8f27b448a12aca11':
Add systrace logging to ScopedCodeCacheWrite
Aart Bik [Fri, 4 Mar 2016 20:08:31 +0000 (12:08 -0800)]
Unsafe: Recognize intrinsics for 1.8 java.util.concurrent
With unit test.
Rationale:
Recognizing the 1.8 methods as intrinsics is the first step
towards providing efficient implementation on all architectures.
Where not implemented (everywhere for now), the methods fall back
to the JNI native or reference implementation.
NOTE: needs iam's CL first!
bug=
26264765
Change-Id: Ife65e81689821a16cbcdd2bb2d35641c6de6aeb6
Hiroshi Yamauchi [Mon, 7 Mar 2016 22:25:09 +0000 (22:25 +0000)]
Merge changes I70f61fe3,I00376b02
* changes:
Revert "ProfilingInfo roots should be visited by the declaring class."
Revert "Query declaring class before querying IsNative."
Mathieu Chartier [Mon, 7 Mar 2016 21:48:08 +0000 (13:48 -0800)]
Add systrace logging to ScopedCodeCacheWrite
Shows if we are taking a long time to mprotect.
Bug:
27502458
Change-Id: Ib83aed3d15b252baaf8f0cffab6bf58d69471d64
Hiroshi Yamauchi [Mon, 7 Mar 2016 21:56:33 +0000 (13:56 -0800)]
Revert "ProfilingInfo roots should be visited by the declaring class."
This reverts commit
9a3be989d0aee1a6998e33813c7f70906d27f89a.
Superceded by CL 206308.
Bug:
27435111
Hiroshi Yamauchi [Mon, 7 Mar 2016 21:55:31 +0000 (13:55 -0800)]
Revert "Query declaring class before querying IsNative."
This reverts commit
26329cd578efe9cd7e60c46fef1bfb549062a283.
Superceded by CL 206308.
Bug:
27435111
Mathieu Chartier [Mon, 7 Mar 2016 21:33:50 +0000 (21:33 +0000)]
Merge "Increase kDumpWaitTimeout 10x for target builds" into nyc-dev
am:
4eddb40ff0
* commit '
4eddb40ff05b94e5d788b7c5956472be8a22f9ea':
Increase kDumpWaitTimeout 10x for target builds
Mathieu Chartier [Mon, 7 Mar 2016 21:33:24 +0000 (21:33 +0000)]
Don\'t use ScopedObjectAccess in Heap::DumpSpaces
am:
03d21bc5be
* commit '
03d21bc5bed887243ff6ce3531179185ffd3532c':
Don't use ScopedObjectAccess in Heap::DumpSpaces
Mathieu Chartier [Mon, 7 Mar 2016 21:32:36 +0000 (21:32 +0000)]
Merge "Increase kDumpWaitTimeout 10x for target builds"
am:
35e0cbce51
* commit '
35e0cbce516db91aaa77bfc39f797d9848a091c0':
Increase kDumpWaitTimeout 10x for target builds
Mathieu Chartier [Mon, 7 Mar 2016 21:32:26 +0000 (21:32 +0000)]
Merge "Don\'t use ScopedObjectAccess in Heap::DumpSpaces"
am:
e88430786e
* commit '
e88430786ebad58be2eda97905849c1b8ffd8ed4':
Don't use ScopedObjectAccess in Heap::DumpSpaces
Mathieu Chartier [Mon, 7 Mar 2016 21:29:32 +0000 (21:29 +0000)]
Merge "Increase kDumpWaitTimeout 10x for target builds"
Mathieu Chartier [Mon, 7 Mar 2016 21:29:15 +0000 (21:29 +0000)]
Merge "Don't use ScopedObjectAccess in Heap::DumpSpaces"
Mathieu Chartier [Mon, 7 Mar 2016 21:22:25 +0000 (21:22 +0000)]
Merge "Increase kDumpWaitTimeout 10x for target builds" into nyc-dev
Mathieu Chartier [Mon, 7 Mar 2016 19:59:01 +0000 (11:59 -0800)]
Increase kDumpWaitTimeout 10x for target builds
New timeout is 100s, the old one was occasionally hit by overloaded
device. This caused a confusing crash in the barrier destructor
since not all the threads had went through the barrier yet.
Bug:
27334917
(cherry picked from commit
74bdab0b14c592053ff71654ab51a0f116114a42)
Change-Id: I24cf6eb6858ad93a47446aa6bbc18942a71b191e
Mathieu Chartier [Mon, 7 Mar 2016 18:25:04 +0000 (10:25 -0800)]
Don't use ScopedObjectAccess in Heap::DumpSpaces
ScopedObjectAccess does not work well if the mutator lock is
excusively held while in a suspend thread state. This caused
deadlocks and DCHECK failures.
Bug:
27493316
(cherry picked from commit
03d21bc5bed887243ff6ce3531179185ffd3532c)
Change-Id: I5d67f74fc7082761e45dc1d7778b0ea7fceaaf8f
Mathieu Chartier [Mon, 7 Mar 2016 19:59:01 +0000 (11:59 -0800)]
Increase kDumpWaitTimeout 10x for target builds
New timeout is 100s, the old one was occasionally hit by overloaded
device. This caused a confusing crash in the barrier destructor
since not all the threads had went through the barrier yet.
Bug:
27334917
Change-Id: I5bcdaa39cfc104f3555f62b6117b417c8bf36e7a
Igor Murashkin [Fri, 19 Feb 2016 22:56:43 +0000 (14:56 -0800)]
runtime: Add CAS and fences to sun.misc.Unsafe
Bug:
26264765
Change-Id: I68b482e5f9a0a26419af5e58a8d67c8c8a8e01a9
Mathieu Chartier [Mon, 7 Mar 2016 18:25:04 +0000 (10:25 -0800)]
Don't use ScopedObjectAccess in Heap::DumpSpaces
ScopedObjectAccess does not work well if the mutator lock is
excusively held while in a suspend thread state. This caused
deadlocks and DCHECK failures.
Bug:
27493316
Change-Id: I75ab223b2d15ab4e53753f1046c580228fc1866e
Vladimir Marko [Mon, 7 Mar 2016 18:40:45 +0000 (18:40 +0000)]
Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()." am:
810ef37680
am:
39c5d595cd
* commit '
39c5d595cd50441e666e5ab0a4af86bdcb46c616':
ART: Fix RegTypeCache::FromUnresolvedMerge().
Vladimir Marko [Mon, 7 Mar 2016 18:38:59 +0000 (18:38 +0000)]
Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()."
am:
810ef37680
* commit '
810ef3768021b5fc7b47e663e037e49c46f8c916':
ART: Fix RegTypeCache::FromUnresolvedMerge().
Vladimir Marko [Mon, 7 Mar 2016 17:50:17 +0000 (17:50 +0000)]
Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()."
Roland Levillain [Mon, 7 Mar 2016 16:57:09 +0000 (16:57 +0000)]
Merge "Typo in comment in MIPS32 mterp." am:
03e31fc04a
am:
a6bacf2aaa
* commit '
a6bacf2aaa89800009de1e6be87aaaeb8660c595':
Typo in comment in MIPS32 mterp.
Alexey Frunze [Mon, 7 Mar 2016 16:56:51 +0000 (16:56 +0000)]
Merge "ART: Enable JitProfiling for MIPS64 Mterp" am:
6589d4523d
am:
0a0884a915
* commit '
0a0884a91559709c6b9edc4443b022cd19d991a0':
ART: Enable JitProfiling for MIPS64 Mterp
Nicolas Geoffray [Mon, 7 Mar 2016 16:56:31 +0000 (16:56 +0000)]
Merge "Add some debugging for zygote crash." am:
93e83d34fd
am:
1d6adcdc08
* commit '
1d6adcdc08aae157b36dfda8163e96055a00ba36':
Add some debugging for zygote crash.
Nicolas Geoffray [Mon, 7 Mar 2016 16:56:05 +0000 (16:56 +0000)]
Merge "Workaround for broken \'ps\' command on M." am:
b5d31327b2
am:
c7576ae0cb
* commit '
c7576ae0cb2ad044ebf911ad09188fd690785c93':
Workaround for broken 'ps' command on M.
Sebastien Hertz [Mon, 7 Mar 2016 16:55:56 +0000 (16:55 +0000)]
Merge "Support multidex run-test with Jack" am:
5521889254
am:
6b2239aca2
* commit '
6b2239aca2e57e1de6a9c9ca0a97925dcc336935':
Support multidex run-test with Jack
Jean-Philippe Halimi [Mon, 7 Mar 2016 16:55:43 +0000 (16:55 +0000)]
Merge "Remove useless map in SwapAllocator" am:
8a8c84114b
am:
9c3fb79b5a
* commit '
9c3fb79b5ac82d5d3d58ba77c410c4868739cfb6':
Remove useless map in SwapAllocator
Nicolas Geoffray [Mon, 7 Mar 2016 16:55:12 +0000 (16:55 +0000)]
Merge "Add some debugging for zygote crash." into nyc-dev
am:
0738bffaf6
* commit '
0738bffaf6983f998733e3211072b3ba792fd42b':
Add some debugging for zygote crash.
Roland Levillain [Mon, 7 Mar 2016 16:54:56 +0000 (16:54 +0000)]
Merge "Typo in comment in MIPS32 mterp."
am:
03e31fc04a
* commit '
03e31fc04a5cf642963ec16311f62071c7d99f21':
Typo in comment in MIPS32 mterp.
Alexey Frunze [Mon, 7 Mar 2016 16:54:38 +0000 (16:54 +0000)]
Merge "ART: Enable JitProfiling for MIPS64 Mterp"
am:
6589d4523d
* commit '
6589d4523d7a6f408eec36b02bac04437bf56f39':
ART: Enable JitProfiling for MIPS64 Mterp
Nicolas Geoffray [Mon, 7 Mar 2016 16:54:28 +0000 (16:54 +0000)]
Merge "Add some debugging for zygote crash."
am:
93e83d34fd
* commit '
93e83d34fd5dad284d561c4180c366b325980f57':
Add some debugging for zygote crash.
Nicolas Geoffray [Mon, 7 Mar 2016 16:54:17 +0000 (16:54 +0000)]
Merge "Workaround for broken \'ps\' command on M."
am:
b5d31327b2
* commit '
b5d31327b2fa96918a255f78a930f64759fa3130':
Workaround for broken 'ps' command on M.
Sebastien Hertz [Mon, 7 Mar 2016 16:54:06 +0000 (16:54 +0000)]
Merge "Support multidex run-test with Jack"
am:
5521889254
* commit '
5521889254742401128d3eaa5057d2127a1debe7':
Support multidex run-test with Jack
Jean-Philippe Halimi [Mon, 7 Mar 2016 16:53:52 +0000 (16:53 +0000)]
Merge "Remove useless map in SwapAllocator"
am:
8a8c84114b
* commit '
8a8c84114b16b8971bc2d3c5c7e0e31470d1a68b':
Remove useless map in SwapAllocator
Roland Levillain [Mon, 7 Mar 2016 16:50:27 +0000 (16:50 +0000)]
Merge "Typo in comment in MIPS32 mterp."
Bill Buzbee [Mon, 7 Mar 2016 15:59:30 +0000 (15:59 +0000)]
Merge "ART: Enable JitProfiling for MIPS64 Mterp"
Nicolas Geoffray [Mon, 7 Mar 2016 15:54:45 +0000 (15:54 +0000)]
Merge "Add some debugging for zygote crash." into nyc-dev
Nicolas Geoffray [Mon, 7 Mar 2016 15:44:08 +0000 (15:44 +0000)]
Add some debugging for zygote crash.
bug:
27340451
(cherry picked from commit
de166544d6539942d3507ce47910f601c97b7532)
Change-Id: Ie4400064d81e260b41bd1408a9ed54be8ca0479e
Nicolas Geoffray [Mon, 7 Mar 2016 15:52:48 +0000 (15:52 +0000)]
Merge "Add some debugging for zygote crash."
Nicolas Geoffray [Mon, 7 Mar 2016 15:44:08 +0000 (15:44 +0000)]
Add some debugging for zygote crash.
bug:
27340451
Change-Id: I212567b18959ab4dc7f1dbde2e6d4ff60fe7bed2
Nicolas Geoffray [Mon, 7 Mar 2016 14:09:04 +0000 (14:09 +0000)]
Merge "Workaround for broken 'ps' command on M."
Sebastien Hertz [Mon, 7 Mar 2016 13:57:09 +0000 (13:57 +0000)]
Merge "Support multidex run-test with Jack"
Nicolas Geoffray [Mon, 7 Mar 2016 13:33:37 +0000 (13:33 +0000)]
Workaround for broken 'ps' command on M.
Change-Id: Ifabc6bb2b0e3780306e8a3ad45531c50c7627ed1
Vladimir Marko [Mon, 7 Mar 2016 12:32:05 +0000 (12:32 +0000)]
ART: Fix RegTypeCache::FromUnresolvedMerge().
Do not assume that the BitVector memory is zero-initialized.
Also fix reg_type_test memory leaks reported by valgrind by
constructing ArenaStack and ScopedArenaAllocator in each
individual test.
Bug:
27500678
Change-Id: Ic6b2b6ebeab2c5c6e993a0232c5d4a0159aabea3
Vladimir Marko [Mon, 7 Mar 2016 11:32:53 +0000 (11:32 +0000)]
Merge "Remove useless map in SwapAllocator"
Sebastien Hertz [Thu, 3 Mar 2016 17:08:17 +0000 (18:08 +0100)]
Support multidex run-test with Jack
Updates default-build script to compile multidex run-tests with
Jack. Such test needs a 'multidex.jpp' file specifying how to
partition classes in the output dex files (mainly how to stick some
classes in the classes.dex file and others in a classes2.dex file).
Bug:
19467889
Change-Id: I2500967ba951218c5b03166b3586a576d6dc8749
Chris Larsen [Sat, 5 Mar 2016 03:26:49 +0000 (03:26 +0000)]
Merge "MIPS64: Implement isInfinite intrinsics." am:
e61f01bdc5
am:
8e0f4b3657
* commit '
8e0f4b3657552a15c8208c52f7021bb91ce2d3b1':
MIPS64: Implement isInfinite intrinsics.
Chris Larsen [Sat, 5 Mar 2016 03:24:49 +0000 (03:24 +0000)]
Merge "MIPS64: Implement isInfinite intrinsics."
am:
e61f01bdc5
* commit '
e61f01bdc5a25cf37d0e43689dd4ed43932556dc':
MIPS64: Implement isInfinite intrinsics.
Andreas Gampe [Sat, 5 Mar 2016 03:19:46 +0000 (03:19 +0000)]
Merge "MIPS64: Implement isInfinite intrinsics."
Chris Larsen [Tue, 16 Feb 2016 20:35:04 +0000 (12:35 -0800)]
MIPS64: Implement isInfinite intrinsics.
- boolean java.lang.Float.isInfinite(float)
- boolean java.lang.Double.isInfinite(double)
Change-Id: I8e94a9cc462e6b1cf99bb14b17c1ff009c9c29a4
Mathieu Chartier [Sat, 5 Mar 2016 02:49:18 +0000 (02:49 +0000)]
Merge "Add more systracing everywhere" am:
dc97e3c4b4
am:
0a3a067d3a
* commit '
0a3a067d3a7ed0e395b5479a1c7288f43ec44bae':
Add more systracing everywhere
Mathieu Chartier [Sat, 5 Mar 2016 02:47:17 +0000 (02:47 +0000)]
Merge "Add more systracing everywhere"
am:
dc97e3c4b4
* commit '
dc97e3c4b4524467908b4d71e10084a5077586ee':
Add more systracing everywhere
Mathieu Chartier [Sat, 5 Mar 2016 02:43:06 +0000 (02:43 +0000)]
Merge "Add more systracing everywhere"
Mathieu Chartier [Fri, 4 Mar 2016 22:58:03 +0000 (14:58 -0800)]
Add more systracing everywhere
Added to:
JIT
DexFile functions
Oat file manager
Added helper ScopedTrace to prevent errors and reduce excess code.
Bug:
27502458
(cherry picked from commit
dabdc0fe183d4684f3cf4d70cb09d318cff81b42)
Change-Id: Ifaeff8913d79eefc797380987d13cc00456266f8
Mathieu Chartier [Sat, 5 Mar 2016 02:36:57 +0000 (02:36 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject" into nyc-dev
am:
67480f2864
* commit '
67480f2864510ba92f282c69604e4b1759baf6b4':
Use MarkIfNotInToSpace for SemiSpace::MarkObject
Mathieu Chartier [Sat, 5 Mar 2016 02:33:27 +0000 (02:33 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject" into nyc-dev
Mathieu Chartier [Sat, 5 Mar 2016 02:18:17 +0000 (02:18 +0000)]
Merge "Remove no thread suspension assert in AddImageSpace" am:
c71dc3852e
am:
82bdbde3d1
* commit '
82bdbde3d1bbf3b59fd028a10ea86aa15de6c9c4':
Remove no thread suspension assert in AddImageSpace
Mathieu Chartier [Sat, 5 Mar 2016 02:16:00 +0000 (02:16 +0000)]
Merge "Remove no thread suspension assert in AddImageSpace"
am:
c71dc3852e
* commit '
c71dc3852edfa8e0cd2083d12845ff8607e189ff':
Remove no thread suspension assert in AddImageSpace
Mathieu Chartier [Sat, 5 Mar 2016 02:13:59 +0000 (02:13 +0000)]
Merge "Add more systracing everywhere" into nyc-dev
am:
c5b94f821a -s ours
* commit '
c5b94f821a64bb285618e3dc92b43e7b552d55f6':
Add more systracing everywhere
Mathieu Chartier [Sat, 5 Mar 2016 02:12:37 +0000 (02:12 +0000)]
Merge "Remove no thread suspension assert in AddImageSpace"
Mathieu Chartier [Sat, 5 Mar 2016 00:39:33 +0000 (16:39 -0800)]
Remove no thread suspension assert in AddImageSpace
Heap::VisitObjects may cause thread suspension for the CC case.
Change-Id: Ibd495690b87dc8731919e1b1164be834c9da02b2
Mathieu Chartier [Sat, 5 Mar 2016 02:06:07 +0000 (02:06 +0000)]
Merge "Add more systracing everywhere" into nyc-dev
Mathieu Chartier [Sat, 5 Mar 2016 01:07:12 +0000 (01:07 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject" am:
cad8657a6c
am:
5ba93bd945
* commit '
5ba93bd94581c8af554735f7f5b28410db8a2837':
Use MarkIfNotInToSpace for SemiSpace::MarkObject
Mathieu Chartier [Sat, 5 Mar 2016 01:05:13 +0000 (01:05 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject"
am:
cad8657a6c
* commit '
cad8657a6c30ec615df5bf8a59a4222f4849d0a2':
Use MarkIfNotInToSpace for SemiSpace::MarkObject
Mathieu Chartier [Fri, 4 Mar 2016 18:30:39 +0000 (10:30 -0800)]
Use MarkIfNotInToSpace for SemiSpace::MarkObject
SemiSpace::MarkObject is called from ModUnionScanImageRootVisitor
which. These roots may be visited multiple times by the GC. One
example is the allocation stack traces and a class visiting the same
ArtMethod twice.
Bug:
27435111
(cherry picked from commit
9a9aee662ebde18bed2a8e263c921df4f529b27b)
Change-Id: I2387a6efaed79d37f2ee47725637af29e78e3548
Mathieu Chartier [Sat, 5 Mar 2016 01:01:35 +0000 (01:01 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject"
Mathieu Chartier [Fri, 4 Mar 2016 18:30:39 +0000 (10:30 -0800)]
Use MarkIfNotInToSpace for SemiSpace::MarkObject
SemiSpace::MarkObject is called from ModUnionScanImageRootVisitor
which. These roots may be visited multiple times by the GC. One
example is the allocation stack traces and a class visiting the same
ArtMethod twice.
Bug:
27435111
Change-Id: I721b8bcf7fe43f4c351d902c2f3422d3bb585295
Mathieu Chartier [Sat, 5 Mar 2016 00:17:47 +0000 (00:17 +0000)]
Fix potential linear alloc memory leak
am:
f28a99a90b
* commit '
f28a99a90b68e45f39191258832e7a526c4742ba':
Fix potential linear alloc memory leak
Mathieu Chartier [Wed, 2 Mar 2016 18:30:23 +0000 (10:30 -0800)]
Fix potential linear alloc memory leak
Previously, if we created a linear alloc for a class loader but
never created the class table, the linear alloc would never get
freed since it would have no corresponding ClassLoaderData.
Fixes valgrind-test-art-host-gtest-oat_test
Bug:
27384882
Bug:
22858531
(cherry picked from commit
5b83050affa6a3b1d3863c0b903f9d48fe4aefb2)
Change-Id: I71b650eac4e33212a7f03c43141db99e635a19ad
Mathieu Chartier [Fri, 4 Mar 2016 22:58:03 +0000 (14:58 -0800)]
Add more systracing everywhere
Added to:
JIT
DexFile functions
Oat file manager
Added helper ScopedTrace to prevent errors and reduce excess code.
Bug:
27502458
Change-Id: Ifaeff8913d79eefc797380987d13cc00456266f8
Mathieu Chartier [Fri, 4 Mar 2016 21:58:30 +0000 (21:58 +0000)]
Only visit app image classes in class loader
am:
88027bd681
* commit '
88027bd6810b9a5b785dba5396eec5301e4540b2':
Only visit app image classes in class loader
Mathieu Chartier [Fri, 4 Mar 2016 21:40:10 +0000 (21:40 +0000)]
Merge "Only visit app image classes in class loader" am:
42e84e007e
am:
4923de4099
* commit '
4923de4099eb8c790166f60b8b59b196c73cb730':
Only visit app image classes in class loader
Mathieu Chartier [Fri, 4 Mar 2016 21:38:16 +0000 (21:38 +0000)]
Merge "Only visit app image classes in class loader"
am:
42e84e007e
* commit '
42e84e007ea69eefd871646a863cdae796ae3428':
Only visit app image classes in class loader
Mathieu Chartier [Thu, 3 Mar 2016 00:08:31 +0000 (16:08 -0800)]
Only visit app image classes in class loader
Only update dex cache arrays of added classes since the declaring
class is in image DCHECK fails for other classes in the class loader.
Also some cleanup to prevent app images leaving invalid state if
they get rejected.
Bug:
22858531
Bug:
27431418
(cherry picked from commit
6973100705716bffce3768a8a0908d7ca1d02ec1)
Change-Id: Ib05364c44f2b943e3341ef2b1dd43337833de143
Mathieu Chartier [Fri, 4 Mar 2016 21:32:10 +0000 (21:32 +0000)]
Merge "Only visit app image classes in class loader"
Mathieu Chartier [Thu, 3 Mar 2016 00:08:31 +0000 (16:08 -0800)]
Only visit app image classes in class loader
Only update dex cache arrays of added classes since the declaring
class is in image DCHECK fails for other classes in the class loader.
Also some cleanup to prevent app images leaving invalid state if
they get rejected.
Bug:
22858531
Bug:
27431418
Change-Id: Ib2a5692a1ad78b014a1bfc6b27fb1c12bc8565e6
Andreas Gampe [Fri, 4 Mar 2016 17:28:26 +0000 (17:28 +0000)]
Merge "ART: Fix UTF test and monitor pool old chunks" am:
3040f4ae0b
am:
4d088c5c85
* commit '
4d088c5c85ff908b2dcaba75067d0d3dc2e89465':
ART: Fix UTF test and monitor pool old chunks
Andreas Gampe [Fri, 4 Mar 2016 17:26:26 +0000 (17:26 +0000)]
Merge "ART: Fix UTF test and monitor pool old chunks"
am:
3040f4ae0b
* commit '
3040f4ae0bf9d8ebe0e7e43f4843929f7a4da4d9':
ART: Fix UTF test and monitor pool old chunks
Andreas Gampe [Fri, 4 Mar 2016 17:23:44 +0000 (17:23 +0000)]
Merge "ART: Fix UTF test and monitor pool old chunks"
David Srbecky [Fri, 4 Mar 2016 17:20:10 +0000 (17:20 +0000)]
Merge "Cache DexRegisterMaps when writing native debug info." am:
1c6f902c28
am:
8bd2af6f1f
* commit '
8bd2af6f1fadf7f116926ac0859d94e7b1233d0e':
Cache DexRegisterMaps when writing native debug info.
David Srbecky [Fri, 4 Mar 2016 17:18:10 +0000 (17:18 +0000)]
Merge "Cache DexRegisterMaps when writing native debug info."
am:
1c6f902c28
* commit '
1c6f902c28f7090cbc88be79119e2151edfea883':
Cache DexRegisterMaps when writing native debug info.
David Srbecky [Fri, 4 Mar 2016 17:13:51 +0000 (17:13 +0000)]
Merge "Cache DexRegisterMaps when writing native debug info."