OSDN Git Service
Andreas Gampe [Wed, 3 Jun 2015 23:38:09 +0000 (23:38 +0000)]
am
ea9ded0f: am
455f320d: Merge "ART: Refactor Thread::Init"
* commit '
ea9ded0f7052ca226ee01d71ad9458acebf9f13a':
ART: Refactor Thread::Init
Andreas Gampe [Wed, 3 Jun 2015 23:23:59 +0000 (23:23 +0000)]
am
455f320d: Merge "ART: Refactor Thread::Init"
* commit '
455f320d7238e1902b36553cddf4412ae7ee2e31':
ART: Refactor Thread::Init
Andreas Gampe [Wed, 3 Jun 2015 23:11:48 +0000 (23:11 +0000)]
Merge "ART: Refactor Thread::Init"
Andreas Gampe [Tue, 2 Jun 2015 05:29:51 +0000 (22:29 -0700)]
ART: Refactor Thread::Init
This refactor allows the parent thread to allocate the JNIEnvExt
for the child (with a fallback in place in Init). This allows to
throw an OOME in CreateNativeThread instead of aborting in the
child.
Bug:
21291279
(cherry picked from commit
520abbd0edcf333f07164539620ce65258c72383)
Change-Id: Iccc1a5c202999f5bfacec706d9833e53135ba2fa
Mathieu Chartier [Wed, 3 Jun 2015 23:04:18 +0000 (23:04 +0000)]
am
8f23620d: Add a way to determine if a large object is a zygote object
* commit '
8f23620d45399286564986d2541cda761b3fe0ac':
Add a way to determine if a large object is a zygote object
Mathieu Chartier [Wed, 3 Jun 2015 20:32:15 +0000 (13:32 -0700)]
Add a way to determine if a large object is a zygote object
Also fix a slight memory leak in LargeObjectMapSpace.
Bug:
20674158
Change-Id: I2416df484e5b84a8c5cc0b5664c8cb102dc235f6
Andreas Gampe [Wed, 3 Jun 2015 20:46:38 +0000 (20:46 +0000)]
am
99b4dcd1: Merge "ART: Refactor Thread::Init" into mnc-dev
* commit '
99b4dcd19af9343bde1f6fbdb24bb010a70144c9':
ART: Refactor Thread::Init
Andreas Gampe [Wed, 3 Jun 2015 20:27:44 +0000 (20:27 +0000)]
Merge "ART: Refactor Thread::Init" into mnc-dev
Andreas Gampe [Wed, 3 Jun 2015 20:16:07 +0000 (20:16 +0000)]
am
9938b671: am
2519fc40: Merge "ART: Prune FindArrayClass cache in image writer"
* commit '
9938b671caec0ffc89d3cbb675fc15535fe5247d':
ART: Prune FindArrayClass cache in image writer
Andreas Gampe [Wed, 3 Jun 2015 20:02:53 +0000 (20:02 +0000)]
am
2519fc40: Merge "ART: Prune FindArrayClass cache in image writer"
* commit '
2519fc40d4ae89322d28d1ff610fe81bb90fb564':
ART: Prune FindArrayClass cache in image writer
Andreas Gampe [Tue, 2 Jun 2015 05:29:51 +0000 (22:29 -0700)]
ART: Refactor Thread::Init
This refactor allows the parent thread to allocate the JNIEnvExt
for the child (with a fallback in place in Init). This allows to
throw an OOME in CreateNativeThread instead of aborting in the
child.
Bug:
21291279
Change-Id: Iccc1a5c202999f5bfacec706d9833e53135ba2fa
Andreas Gampe [Wed, 3 Jun 2015 19:54:30 +0000 (19:54 +0000)]
Merge "ART: Prune FindArrayClass cache in image writer"
Kenny Root [Wed, 3 Jun 2015 19:38:19 +0000 (19:38 +0000)]
am
bfb43dce: am
1710bf30: Merge "Tidy up spelling"
* commit '
bfb43dceb72d471ac00981cb7e1f84014453adce':
Tidy up spelling
Kenny Root [Wed, 3 Jun 2015 19:22:37 +0000 (19:22 +0000)]
am
1710bf30: Merge "Tidy up spelling"
* commit '
1710bf308c1465d2130547c0aa9066d28d57648b':
Tidy up spelling
Kenny Root [Wed, 3 Jun 2015 19:15:05 +0000 (19:15 +0000)]
Merge "Tidy up spelling"
Mathieu Chartier [Wed, 3 Jun 2015 19:14:51 +0000 (19:14 +0000)]
am
aa3a6732: am
ffbf83b6: Merge "Emit instance fields for java.lang.Object in hprof"
* commit '
aa3a6732119d4002f728d5b50eefebe97d169ccc':
Emit instance fields for java.lang.Object in hprof
Mathieu Chartier [Wed, 3 Jun 2015 18:49:46 +0000 (18:49 +0000)]
am
9cfde7b2: Merge "Emit instance fields for java.lang.Object in hprof" into mnc-dev
* commit '
9cfde7b21eeb18040f3264f3b5f66baa34b0c568':
Emit instance fields for java.lang.Object in hprof
Andreas Gampe [Wed, 3 Jun 2015 18:46:04 +0000 (18:46 +0000)]
am
44905ce1: ART: Prune FindArrayClass cache in image writer
* commit '
44905ce1c97613a5cb44046049843fe1029a64cf':
ART: Prune FindArrayClass cache in image writer
Mathieu Chartier [Wed, 3 Jun 2015 18:36:42 +0000 (18:36 +0000)]
am
ffbf83b6: Merge "Emit instance fields for java.lang.Object in hprof"
* commit '
ffbf83b6e9ff4e3dd12a99cb607d4d3a6630d7bc':
Emit instance fields for java.lang.Object in hprof
Roland Levillain [Wed, 3 Jun 2015 18:36:29 +0000 (18:36 +0000)]
am
7dcda07d: am
0c46694c: Merge "Fix typos in test/133-static-invoke-super/src/Main.java."
* commit '
7dcda07de1112b35770a99456e2db8069abedbf7':
Fix typos in test/133-static-invoke-super/src/Main.java.
Roland Levillain [Wed, 3 Jun 2015 18:36:19 +0000 (18:36 +0000)]
am
f8a0d112: am
4dd16230: Merge "Improve the performance of long-to-double conversions on ARM."
* commit '
f8a0d11287a9f2bfaea0741e86d51c90c3a321bd':
Improve the performance of long-to-double conversions on ARM.
Mathieu Chartier [Wed, 3 Jun 2015 18:28:23 +0000 (18:28 +0000)]
Merge "Emit instance fields for java.lang.Object in hprof"
Mathieu Chartier [Wed, 3 Jun 2015 17:51:13 +0000 (10:51 -0700)]
Emit instance fields for java.lang.Object in hprof
Previously we omitted these fields.
(cherry picked from commit
0adc90eb0592e220f787f87dbef3a9b5c1db2080)
Bug:
20726205
Change-Id: I81c55919a4bd015bc0a4e7259a41a05dab534e11
Mathieu Chartier [Wed, 3 Jun 2015 18:08:22 +0000 (18:08 +0000)]
Merge "Emit instance fields for java.lang.Object in hprof" into mnc-dev
Andreas Gampe [Wed, 3 Jun 2015 04:01:45 +0000 (21:01 -0700)]
ART: Prune FindArrayClass cache in image writer
The ClassLinker cache speeds up FindArrayClass requests, but all
entries are roots. It is possible that an entry is a non-image
class when creating the boot image, artificially keeping the
class around.
Bug:
21596650
(cherry picked from commit
44905ce1c97613a5cb44046049843fe1029a64cf)
Change-Id: Ief9b439945d0e293a3cb5dcddfeb189b5e174f06
Mathieu Chartier [Wed, 3 Jun 2015 17:51:13 +0000 (10:51 -0700)]
Emit instance fields for java.lang.Object in hprof
Previously we omitted these fields.
Bug:
20726205
Change-Id: I81c55919a4bd015bc0a4e7259a41a05dab534e11
Neil Fuller [Wed, 3 Jun 2015 17:43:20 +0000 (17:43 +0000)]
am
d996115b: am
91b01c56: Merge "Revert "Modification to the way boot classpath resources are loaded""
* commit '
d996115b9b832adc8a64d53f301e3ba64bf31c4b':
Revert "Modification to the way boot classpath resources are loaded"
Brian Carlstrom [Wed, 3 Jun 2015 17:43:01 +0000 (17:43 +0000)]
am
ae5ef023: am
c836bc80: Merge "Fix "run-test --jvm 067-preemptive-unpark""
* commit '
ae5ef023eab11000eb6a90b570d0e5e07ae6d048':
Fix "run-test --jvm 067-preemptive-unpark"
Neil Fuller [Wed, 3 Jun 2015 17:42:57 +0000 (17:42 +0000)]
am
1429643f: am
97313955: Merge "Modification to the way boot classpath resources are loaded"
* commit '
1429643f009108a16b91b313927d8aa08d17e9e7':
Modification to the way boot classpath resources are loaded
Roland Levillain [Wed, 3 Jun 2015 17:31:37 +0000 (17:31 +0000)]
am
0c46694c: Merge "Fix typos in test/133-static-invoke-super/src/Main.java."
* commit '
0c46694c182655150d1f8faf7992e844c07710f2':
Fix typos in test/133-static-invoke-super/src/Main.java.
Roland Levillain [Wed, 3 Jun 2015 17:18:43 +0000 (17:18 +0000)]
Merge "Fix typos in test/133-static-invoke-super/src/Main.java."
Andreas Gampe [Wed, 3 Jun 2015 04:01:45 +0000 (21:01 -0700)]
ART: Prune FindArrayClass cache in image writer
The ClassLinker cache speeds up FindArrayClass requests, but all
entries are roots. It is possible that an entry is a non-image
class when creating the boot image, artificially keeping the
class around.
Bug:
21596650
Change-Id: Ief9b439945d0e293a3cb5dcddfeb189b5e174f06
Roland Levillain [Wed, 3 Jun 2015 16:46:35 +0000 (16:46 +0000)]
am
4dd16230: Merge "Improve the performance of long-to-double conversions on ARM."
* commit '
4dd16230149ed8352b0650805298b3515a0c3313':
Improve the performance of long-to-double conversions on ARM.
Roland Levillain [Fri, 24 Apr 2015 18:25:17 +0000 (19:25 +0100)]
Fix typos in test/133-static-invoke-super/src/Main.java.
Change-Id: If8dc4380beae881e869165da2326706001668c1a
Roland Levillain [Wed, 3 Jun 2015 16:34:23 +0000 (16:34 +0000)]
Merge "Improve the performance of long-to-double conversions on ARM."
Neil Fuller [Wed, 3 Jun 2015 15:56:45 +0000 (15:56 +0000)]
am
91b01c56: Merge "Revert "Modification to the way boot classpath resources are loaded""
* commit '
91b01c56ddd3f7eb4c0c28138e2a1a8d5ab969a8':
Revert "Modification to the way boot classpath resources are loaded"
Neil Fuller [Wed, 3 Jun 2015 15:47:15 +0000 (15:47 +0000)]
Merge "Revert "Modification to the way boot classpath resources are loaded""
Neil Fuller [Wed, 3 Jun 2015 15:46:29 +0000 (15:46 +0000)]
Revert "Modification to the way boot classpath resources are loaded"
This reverts commit
0e08b767f1bd0b892e3ac5724d517caae70f5c04.
Change-Id: Ie3d3caec98f5a65759bb6d44c1f8c76dc6aa2afa
Brian Carlstrom [Wed, 3 Jun 2015 15:29:34 +0000 (15:29 +0000)]
am
c836bc80: Merge "Fix "run-test --jvm 067-preemptive-unpark""
* commit '
c836bc80d10bad016422b4824c471d3513850666':
Fix "run-test --jvm 067-preemptive-unpark"
Brian Carlstrom [Wed, 3 Jun 2015 15:21:21 +0000 (15:21 +0000)]
Merge "Fix "run-test --jvm 067-preemptive-unpark""
Neil Fuller [Wed, 3 Jun 2015 15:12:39 +0000 (15:12 +0000)]
am
97313955: Merge "Modification to the way boot classpath resources are loaded"
* commit '
973139558988ab2e89819b9ed9fc4af048be8ce4':
Modification to the way boot classpath resources are loaded
Neil Fuller [Wed, 3 Jun 2015 14:59:58 +0000 (14:59 +0000)]
Merge "Modification to the way boot classpath resources are loaded"
Nicolas Geoffray [Wed, 3 Jun 2015 11:42:43 +0000 (11:42 +0000)]
am
c7f0bc7e: am
6a0d5e7f: Merge "Allow void to get in ARM64ReturnLocation."
* commit '
c7f0bc7e225f89616596b2b56d8c4b3b8d72a224':
Allow void to get in ARM64ReturnLocation.
Nicolas Geoffray [Wed, 3 Jun 2015 11:42:42 +0000 (11:42 +0000)]
am
839c3583: am
faa89755: Merge "Fix compilation errors with gcc."
* commit '
839c35830be023d1593145a2f184821f6268720f':
Fix compilation errors with gcc.
Roland Levillain [Tue, 14 Apr 2015 14:57:52 +0000 (15:57 +0100)]
Improve the performance of long-to-double conversions on ARM.
Use a VMLA instruction instead of VADD & VMUL instructions
in long-to-double conversions on ARM. This change reduces
code size and improves execution times (but does not alter
precision). It trades one temporary FPU register for two
temporary core registers.
Change-Id: I1dc35bef6c12be8f305e5b46da98c2421686b60d
Nicolas Geoffray [Wed, 3 Jun 2015 11:30:39 +0000 (11:30 +0000)]
am
6a0d5e7f: Merge "Allow void to get in ARM64ReturnLocation."
* commit '
6a0d5e7fe6dc0c9d3dd941ab991203f2d5d1c354':
Allow void to get in ARM64ReturnLocation.
Nicolas Geoffray [Wed, 3 Jun 2015 11:30:38 +0000 (11:30 +0000)]
am
faa89755: Merge "Fix compilation errors with gcc."
* commit '
faa897554ef46e4ad8bc251ed939bb41b876c91a':
Fix compilation errors with gcc.
Nicolas Geoffray [Wed, 3 Jun 2015 11:25:20 +0000 (11:25 +0000)]
Merge "Allow void to get in ARM64ReturnLocation."
Nicolas Geoffray [Wed, 3 Jun 2015 11:23:32 +0000 (12:23 +0100)]
Allow void to get in ARM64ReturnLocation.
It can now be called with it.
Change-Id: Idd10dbf5c9cb5f418504cb4c9252930e6eb4942d
Nicolas Geoffray [Wed, 3 Jun 2015 11:19:38 +0000 (11:19 +0000)]
am
eb74c6c9: am
e499f8a7: Merge "Fix lint error."
* commit '
eb74c6c993b61f73c6421301cb19b4a36902940f':
Fix lint error.
Roland Levillain [Wed, 3 Jun 2015 11:19:36 +0000 (11:19 +0000)]
am
04190792: am
7922d0f2: Merge "Show stack maps and Dex register maps in oatdump\'s assembly code."
* commit '
04190792f79f15b35e04c0dd9f704da14ee2b94e':
Show stack maps and Dex register maps in oatdump's assembly code.
Nicolas Geoffray [Wed, 3 Jun 2015 11:19:35 +0000 (11:19 +0000)]
am
f6504eae: am
99c2abcb: Merge "Factorize code for common LocationSummary of HInvoke."
* commit '
f6504eaed42a103f0d78c8fad2531c66f439b249':
Factorize code for common LocationSummary of HInvoke.
Nicolas Geoffray [Wed, 3 Jun 2015 11:19:05 +0000 (11:19 +0000)]
Merge "Fix compilation errors with gcc."
Nicolas Geoffray [Wed, 3 Jun 2015 11:12:19 +0000 (12:12 +0100)]
Fix compilation errors with gcc.
Change-Id: If88d4f639658db2d6d71f5abcad563211138fc4a
Nicolas Geoffray [Wed, 3 Jun 2015 11:07:11 +0000 (11:07 +0000)]
am
e499f8a7: Merge "Fix lint error."
* commit '
e499f8a75c6c9632f5b1f1921e9471d52348e2f4':
Fix lint error.
Roland Levillain [Wed, 3 Jun 2015 11:07:10 +0000 (11:07 +0000)]
am
7922d0f2: Merge "Show stack maps and Dex register maps in oatdump\'s assembly code."
* commit '
7922d0f2ef6a9fa7adc3b9417246aabea2474732':
Show stack maps and Dex register maps in oatdump's assembly code.
Nicolas Geoffray [Wed, 3 Jun 2015 11:07:08 +0000 (11:07 +0000)]
am
99c2abcb: Merge "Factorize code for common LocationSummary of HInvoke."
* commit '
99c2abcb085d254b17a870442ca188fa09ab58de':
Factorize code for common LocationSummary of HInvoke.
Nicolas Geoffray [Wed, 3 Jun 2015 11:03:21 +0000 (11:03 +0000)]
Merge "Fix lint error."
Nicolas Geoffray [Wed, 3 Jun 2015 11:02:38 +0000 (12:02 +0100)]
Fix lint error.
Change-Id: Ie485d52dc8c6670ab717f14081200572dab0357f
Roland Levillain [Wed, 3 Jun 2015 11:00:37 +0000 (11:00 +0000)]
Merge "Show stack maps and Dex register maps in oatdump's assembly code."
Nicolas Geoffray [Wed, 3 Jun 2015 10:56:35 +0000 (10:56 +0000)]
Merge "Factorize code for common LocationSummary of HInvoke."
Roland Levillain [Wed, 3 Jun 2015 10:50:32 +0000 (10:50 +0000)]
am
b2871087: am
2d48b494: Merge "Fix linter-related error."
* commit '
b2871087ab5f729de78dbce8cbb5d4ebfeb7195c':
Fix linter-related error.
Roland Levillain [Wed, 3 Jun 2015 10:37:42 +0000 (10:37 +0000)]
am
2d48b494: Merge "Fix linter-related error."
* commit '
2d48b49436c12b649efebe8d40b625777d98a9de':
Fix linter-related error.
Roland Levillain [Wed, 3 Jun 2015 10:30:22 +0000 (10:30 +0000)]
Merge "Fix linter-related error."
Roland Levillain [Wed, 3 Jun 2015 10:26:05 +0000 (11:26 +0100)]
Fix linter-related error.
Change-Id: Ie8fb07a46ea6231c2585155249ebb6e2654f7a52
Nicolas Geoffray [Wed, 3 Jun 2015 10:23:52 +0000 (11:23 +0100)]
Factorize code for common LocationSummary of HInvoke.
This is one step forward, we could factorize more, but
I wanted to get this out of the way first.
Change-Id: I6ae411a737eebaecb64974f47af507ce0cfbae85
Roland Levillain [Wed, 3 Jun 2015 10:08:39 +0000 (10:08 +0000)]
am
8c59f2d1: am
49e3b625: Merge "Delegate long-to-float type conversions to the runtime on ARM."
* commit '
8c59f2d142a81cf1329ace581cbc576abc9ec4f8':
Delegate long-to-float type conversions to the runtime on ARM.
Roland Levillain [Wed, 3 Jun 2015 09:56:59 +0000 (09:56 +0000)]
am
49e3b625: Merge "Delegate long-to-float type conversions to the runtime on ARM."
* commit '
49e3b6257c1c1a139df75f5f8e80e86f1c473409':
Delegate long-to-float type conversions to the runtime on ARM.
Roland Levillain [Wed, 3 Jun 2015 09:45:57 +0000 (09:45 +0000)]
Merge "Delegate long-to-float type conversions to the runtime on ARM."
Brian Carlstrom [Wed, 3 Jun 2015 04:53:14 +0000 (21:53 -0700)]
Fix "run-test --jvm 067-preemptive-unpark"
Change-Id: I3afd86510091354d79fbb008e9670940d71a0721
Mathieu Chartier [Wed, 3 Jun 2015 02:22:27 +0000 (02:22 +0000)]
am
b1170ba5: Merge "Add a way to SuspendAll for a long duration" into mnc-dev
* commit '
b1170ba5de3bf56021f33133bed537894e8fa8b9':
Add a way to SuspendAll for a long duration
Mathieu Chartier [Wed, 3 Jun 2015 02:22:26 +0000 (02:22 +0000)]
Mathieu Chartier [Wed, 3 Jun 2015 01:11:05 +0000 (01:11 +0000)]
am
9819c59d: am
1aebdae1: Merge "Add a way to SuspendAll for a long duration"
* commit '
9819c59dccb9648f24ed30467477dd7e613a1945':
Add a way to SuspendAll for a long duration
Mathieu Chartier [Wed, 3 Jun 2015 00:59:38 +0000 (00:59 +0000)]
am
1aebdae1: Merge "Add a way to SuspendAll for a long duration"
* commit '
1aebdae18678403bdac078cbbe1f7dd4243c44f3':
Add a way to SuspendAll for a long duration
Mathieu Chartier [Wed, 3 Jun 2015 00:52:26 +0000 (00:52 +0000)]
Merge "Add a way to SuspendAll for a long duration"
Mathieu Chartier [Tue, 2 Jun 2015 18:42:18 +0000 (11:42 -0700)]
Add a way to SuspendAll for a long duration
Hprof uses this mode to not cause thread suspend timeouts if GC tries
while the hprof dump is running.
(cherry picked from commit
77be6635f9b07a8a794924c5fb9b071949776a6d)
Bug:
21063989
Change-Id: Ic6304620afd1489719a7e0e4299f829c90fe27cc
Mathieu Chartier [Wed, 3 Jun 2015 00:41:08 +0000 (00:41 +0000)]
Mathieu Chartier [Wed, 3 Jun 2015 00:28:49 +0000 (00:28 +0000)]
am
35d62ce1: Merge "Fix tracing"
* commit '
35d62ce1801aad45233ae72c1bd665f8709e4a6d':
Fix tracing
Mathieu Chartier [Wed, 3 Jun 2015 00:18:36 +0000 (00:18 +0000)]
Merge "Fix tracing"
Mathieu Chartier [Tue, 2 Jun 2015 23:38:29 +0000 (16:38 -0700)]
Fix tracing
Move back to 32 bit method IDs, add a bijective map for method IDs.
Also some cleanup.
(cherry picked from commit
d40bcc4fab1589e3aac0f4b59217c6ab4e72102a)
Bug:
19264997
Change-Id: Icdd36591df53ff975d30b9000cfe67d3ae8c51d5
Mathieu Chartier [Wed, 3 Jun 2015 00:16:33 +0000 (00:16 +0000)]
Merge "Add a way to SuspendAll for a long duration" into mnc-dev
Mathieu Chartier [Tue, 2 Jun 2015 23:38:29 +0000 (16:38 -0700)]
Fix tracing
Move back to 32 bit method IDs, add a bijective map for method IDs.
Also some cleanup.
Bug:
19264997
Change-Id: Icdd36591df53ff975d30b9000cfe67d3ae8c51d5
Mathieu Chartier [Tue, 2 Jun 2015 21:58:11 +0000 (21:58 +0000)]
am
37f7cbd9: (-s ours) am
4757a333: Merge "Add more info for attempting to delete non-JNI local reference"
* commit '
37f7cbd99d074f49d5ce9d1ac7da14a96f50e277':
Add more info for attempting to delete non-JNI local reference
Mathieu Chartier [Tue, 2 Jun 2015 21:42:58 +0000 (21:42 +0000)]
am
4757a333: Merge "Add more info for attempting to delete non-JNI local reference"
* commit '
4757a3335c8e0b12060fe619ee7b8fda08ec580d':
Add more info for attempting to delete non-JNI local reference
Mathieu Chartier [Tue, 2 Jun 2015 21:36:04 +0000 (21:36 +0000)]
am
ff6d8cff: Add more info for attempting to delete non-JNI local reference
* commit '
ff6d8cffb7c14eee56df16d1422b1fcc180decde':
Add more info for attempting to delete non-JNI local reference
Mathieu Chartier [Tue, 2 Jun 2015 21:32:22 +0000 (21:32 +0000)]
Merge "Add more info for attempting to delete non-JNI local reference"
Mathieu Chartier [Tue, 2 Jun 2015 20:40:12 +0000 (13:40 -0700)]
Add more info for attempting to delete non-JNI local reference
Now we print the stack trace of the method which tried to remove the
non-JNI local reference.
Added test, example output:
Attempt to remove non-JNI local reference, dumping thread
"main" prio=5 tid=1 Runnable
| group="main" sCount=0 dsCount=0 obj=0x12c2b400 self=0xf878af28
| sysTid=32662 nice=0 cgrp=default sched=0/0 handle=0xf73df700
| state=R schedstat=(
154297228 636505 121 ) utm=5 stm=10 core=11 HZ=100
| stack=0xff6f2000-0xff6f4000 stackSize=7MB
| held mutexes= "mutator lock"(shared held)
native: #00 pc
00455a7f /out/host/linux-x86/lib/libartd.so (art::DumpNativeStack(std::__1::basic_ostream<char, std::__1::char_traits<char> >&, int, char const*, art::ArtMethod*, void*)+191)
native: #01 pc
00425d79 /out/host/linux-x86/lib/libartd.so (art::Thread::DumpStack(std::__1::basic_ostream<char, std::__1::char_traits<char> >&) const+473)
native: #02 pc
0028c555 /out/host/linux-x86/lib/libartd.so (art::IndirectReferenceTable::Remove(unsigned int, void*)+421)
native: #03 pc
003319c8 /out/host/linux-x86/lib/libartd.so (art::JNI::DeleteLocalRef(_JNIEnv*, _jobject*)+56)
native: #04 pc
0012db14 /out/host/linux-x86/lib/libartd.so (art::CheckJNI::DeleteRef(char const*, _JNIEnv*, _jobject*, art::IndirectRefKind)+292)
native: #05 pc
00122176 /out/host/linux-x86/lib/libartd.so (art::CheckJNI::DeleteLocalRef(_JNIEnv*, _jobject*)+54)
native: #06 pc
00005724 /out/host/linux-x86/lib/libarttest.so (Java_Main_removeLocalObject+36)
native: #07 pc
00004d6e /tmp/test-32506/dalvik-cache/x86/tmp@mathieuc@test-32506@004-JniTest.jar@classes.dex (void Main.removeLocalObject(java.lang.Object)+130)
at Main.removeLocalObject(Native method)
at Main.testRemoveLocalObject(Main.java:118)
at Main.main(Main.java:37)
(cherry picked from commit
ff6d8cffb7c14eee56df16d1422b1fcc180decde)
Bug:
20683465
Change-Id: I56b99c77ae7020cabf1aaeb1d5317b1d5ba940e5
Mathieu Chartier [Tue, 2 Jun 2015 20:40:12 +0000 (13:40 -0700)]
Add more info for attempting to delete non-JNI local reference
Now we print the stack trace of the method which tried to remove the
non-JNI local reference.
Added test, example output:
Attempt to remove non-JNI local reference, dumping thread
"main" prio=5 tid=1 Runnable
| group="main" sCount=0 dsCount=0 obj=0x12c2b400 self=0xf878af28
| sysTid=32662 nice=0 cgrp=default sched=0/0 handle=0xf73df700
| state=R schedstat=(
154297228 636505 121 ) utm=5 stm=10 core=11 HZ=100
| stack=0xff6f2000-0xff6f4000 stackSize=7MB
| held mutexes= "mutator lock"(shared held)
native: #00 pc
00455a7f /out/host/linux-x86/lib/libartd.so (art::DumpNativeStack(std::__1::basic_ostream<char, std::__1::char_traits<char> >&, int, char const*, art::ArtMethod*, void*)+191)
native: #01 pc
00425d79 /out/host/linux-x86/lib/libartd.so (art::Thread::DumpStack(std::__1::basic_ostream<char, std::__1::char_traits<char> >&) const+473)
native: #02 pc
0028c555 /out/host/linux-x86/lib/libartd.so (art::IndirectReferenceTable::Remove(unsigned int, void*)+421)
native: #03 pc
003319c8 /out/host/linux-x86/lib/libartd.so (art::JNI::DeleteLocalRef(_JNIEnv*, _jobject*)+56)
native: #04 pc
0012db14 /out/host/linux-x86/lib/libartd.so (art::CheckJNI::DeleteRef(char const*, _JNIEnv*, _jobject*, art::IndirectRefKind)+292)
native: #05 pc
00122176 /out/host/linux-x86/lib/libartd.so (art::CheckJNI::DeleteLocalRef(_JNIEnv*, _jobject*)+54)
native: #06 pc
00005724 /out/host/linux-x86/lib/libarttest.so (Java_Main_removeLocalObject+36)
native: #07 pc
00004d6e /tmp/test-32506/dalvik-cache/x86/tmp@mathieuc@test-32506@004-JniTest.jar@classes.dex (void Main.removeLocalObject(java.lang.Object)+130)
at Main.removeLocalObject(Native method)
at Main.testRemoveLocalObject(Main.java:118)
at Main.main(Main.java:37)
Bug:
20683465
Change-Id: I56b99c77ae7020cabf1aaeb1d5317b1d5ba940e5
Hiroshi Yamauchi [Tue, 2 Jun 2015 20:46:21 +0000 (20:46 +0000)]
am
df17a700: am
ac3a02b0: Merge "Add heap poisoning support to the entrypoints."
* commit '
df17a70083b4763e2bee6c388eb3ffec06f03fa8':
Add heap poisoning support to the entrypoints.
Mingyao Yang [Tue, 2 Jun 2015 20:46:19 +0000 (20:46 +0000)]
am
a8fd11d7: am
ce9f4398: Merge "CanThrow() for HArraySet may return true."
* commit '
a8fd11d703adc586b467c9017815f1910b583559':
CanThrow() for HArraySet may return true.
Hiroshi Yamauchi [Tue, 2 Jun 2015 20:38:44 +0000 (20:38 +0000)]
am
ac3a02b0: Merge "Add heap poisoning support to the entrypoints."
* commit '
ac3a02b0f1ed10ed236c87c71f50261c8d522f74':
Add heap poisoning support to the entrypoints.
Hiroshi Yamauchi [Tue, 2 Jun 2015 20:27:33 +0000 (20:27 +0000)]
Merge "Add heap poisoning support to the entrypoints."
Mingyao Yang [Tue, 2 Jun 2015 19:53:10 +0000 (19:53 +0000)]
am
ce9f4398: Merge "CanThrow() for HArraySet may return true."
* commit '
ce9f4398b8ffab0250b38eae864ba927794fa946':
CanThrow() for HArraySet may return true.
Mingyao Yang [Tue, 2 Jun 2015 19:32:52 +0000 (19:32 +0000)]
Merge "CanThrow() for HArraySet may return true."
Hiroshi Yamauchi [Fri, 29 May 2015 22:04:41 +0000 (15:04 -0700)]
Add heap poisoning support to the entrypoints.
In preparation for full compiler/managed-code support.
Enable stub_test with heap poisoning.
Bug:
12687968
Change-Id: I79fc54ce6386c0a1eb9621759bb4cc23bc393a75
Mathieu Chartier [Tue, 2 Jun 2015 18:42:18 +0000 (11:42 -0700)]
Add a way to SuspendAll for a long duration
Hprof uses this mode to not cause thread suspend timeouts if GC tries
while the hprof dump is running.
Bug:
21063989
Change-Id: Ic6304620afd1489719a7e0e4299f829c90fe27cc
Mathieu Chartier [Tue, 2 Jun 2015 18:06:06 +0000 (18:06 +0000)]
am
2791d5e6: Add clear cache for JIT
* commit '
2791d5e66f6c802147e2f9275b94b5ca995c396f':
Add clear cache for JIT
Kenny Root [Tue, 2 Jun 2015 18:01:10 +0000 (11:01 -0700)]
Tidy up spelling
Change-Id: I65fba9d8310ff3759322cec3345235e6472f4cfb
Mathieu Chartier [Tue, 2 Jun 2015 17:50:19 +0000 (17:50 +0000)]
am
202ffb0e: am
61d89485: Merge "Update IMT for stale miranda methods"
* commit '
202ffb0e163068d5b056f02d3d321f586dc6493f':
Update IMT for stale miranda methods
Mathieu Chartier [Tue, 2 Jun 2015 17:49:11 +0000 (17:49 +0000)]
am
519fd543: Update IMT for stale miranda methods
* commit '
519fd543625da68ef93f0cd5539c949e5e74e04e':
Update IMT for stale miranda methods