OSDN Git Service
Andreas Gampe [Sat, 6 Jun 2015 03:59:39 +0000 (03:59 +0000)]
am
c1d8da19: Merge "ART: Add SetSpecialSignalHandlerFn to version-script.txt"
* commit '
c1d8da19488f78f06c9c7b09cfcce9523d755d51':
ART: Add SetSpecialSignalHandlerFn to version-script.txt
Andreas Gampe [Sat, 6 Jun 2015 03:52:31 +0000 (03:52 +0000)]
Merge "ART: Add SetSpecialSignalHandlerFn to version-script.txt"
Andreas Gampe [Sat, 6 Jun 2015 03:45:31 +0000 (20:45 -0700)]
ART: Add SetSpecialSignalHandlerFn to version-script.txt
Expose the new function from the sigchainlib implementation.
Bug:
20217701
Change-Id: I7d21025595775e057ea703236ca88ceb07173136
Mathieu Chartier [Fri, 5 Jun 2015 23:52:48 +0000 (23:52 +0000)]
am
6d359184: Merge "Use runFinalizationWithTimeout for native allocations"
* commit '
6d3591845235b9effd2e7b0238443b94ecabf967':
Use runFinalizationWithTimeout for native allocations
Mathieu Chartier [Fri, 5 Jun 2015 23:44:27 +0000 (23:44 +0000)]
Merge "Use runFinalizationWithTimeout for native allocations"
Mathieu Chartier [Fri, 5 Jun 2015 20:21:05 +0000 (13:21 -0700)]
Use runFinalizationWithTimeout for native allocations
Prevents deadlocks by not waiting longer than 250ms for finalizers
to complete.
(cherry picked from commit
3b532d744034b43ed329a3198f15846d80fec3f0)
Bug:
21544853
Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
Mathieu Chartier [Thu, 4 Jun 2015 23:28:56 +0000 (23:28 +0000)]
am
38b66b6f: Merge "Add atrace calls to runtime start and heap create"
* commit '
38b66b6fed1adcc1da4b931a32f78c5290a97c1e':
Add atrace calls to runtime start and heap create
Mathieu Chartier [Thu, 4 Jun 2015 23:19:26 +0000 (23:19 +0000)]
Merge "Add atrace calls to runtime start and heap create"
Richard Uhler [Tue, 7 Apr 2015 17:56:50 +0000 (10:56 -0700)]
Add atrace calls to runtime start and heap create
(cherry picked from commit
7fabaa6ba1927d21a317c03499b705cbde4f6a47)
Bug:
20727525
Change-Id: I91a74b793fb9eda8ed580244a6a5fd313ef2eb27
Hiroshi Yamauchi [Thu, 4 Jun 2015 22:50:01 +0000 (22:50 +0000)]
am
da2fd5aa: Merge "If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS."
* commit '
da2fd5aa2cbdab371f9a1c29ff4e4dfd09305fdc':
If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.
Hiroshi Yamauchi [Thu, 4 Jun 2015 22:38:10 +0000 (22:38 +0000)]
Merge "If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS."
Mathieu Chartier [Thu, 4 Jun 2015 22:32:39 +0000 (22:32 +0000)]
am
8c46e0d5: Merge "Add optimization for LOW_4G allocator"
* commit '
8c46e0d57e52d78196f981d41b9d0434abd6d592':
Add optimization for LOW_4G allocator
Mathieu Chartier [Thu, 4 Jun 2015 22:21:35 +0000 (22:21 +0000)]
Merge "Add optimization for LOW_4G allocator"
Mathieu Chartier [Thu, 4 Jun 2015 20:42:14 +0000 (13:42 -0700)]
Add optimization for LOW_4G allocator
The optimization uses the maps_ field to skip over regions which we
know wont be large enough for the request.
Reduces time to create heap from 500-700ms to 100ms on N9.
(cherry picked from commit
1c8bef4a71612f10b89b102434f70de5a127cc74)
Bug:
20727525
Change-Id: I4fa92d58c2e135ba31a03ababff46669089bb542
Roland Levillain [Thu, 4 Jun 2015 16:50:27 +0000 (17:50 +0100)]
If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.
This change ensures assembly files honoring heap poisoning
(notably used by stub_test) are compiled with
-DART_HEAP_POISONING=1 when this feature is turned on.
Bug:
21621105
Change-Id: I13fe456cd2733a09bdfd3a9808cfd70513b14698
Nicolas Geoffray [Thu, 4 Jun 2015 17:21:41 +0000 (17:21 +0000)]
am
6a1c92f1: Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
* commit '
6a1c92f1e4a455d802ab0d0ac47504cdd7c12f0f':
Revert "Use HCurrentMethod in HInvokeStaticOrDirect."
Nicolas Geoffray [Thu, 4 Jun 2015 17:21:39 +0000 (17:21 +0000)]
am
8a9fba91: Merge "Do a type check for knowing if we can inline."
* commit '
8a9fba9154310ddc8024150ca8cd5a7c4b76b71b':
Do a type check for knowing if we can inline.
Nicolas Geoffray [Thu, 4 Jun 2015 17:17:45 +0000 (17:17 +0000)]
Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
Nicolas Geoffray [Thu, 4 Jun 2015 17:17:32 +0000 (17:17 +0000)]
Revert "Use HCurrentMethod in HInvokeStaticOrDirect."
Fails on baseline/x86.
This reverts commit
38207af82afb6f99c687f64b15601ed20d82220a.
Change-Id: Ib71018367eb7c6046965494a7e996c22af3de403
Nicolas Geoffray [Thu, 4 Jun 2015 17:12:17 +0000 (17:12 +0000)]
Merge "Do a type check for knowing if we can inline."
Brian Carlstrom [Thu, 4 Jun 2015 17:04:24 +0000 (17:04 +0000)]
am
fd0fb02c: Merge "Fix JNI GetSuperClasss"
* commit '
fd0fb02c728689ca32a12476c707b96f6ca3e1fe':
Fix JNI GetSuperClasss
Nicolas Geoffray [Thu, 4 Jun 2015 17:02:34 +0000 (18:02 +0100)]
Do a type check for knowing if we can inline.
Otherwise, we might successfully inline:
((String)nonStringObject).charAt()
Because the lookup of the method is based on the index of charAt,
and not its name.
Change-Id: I72ce802fd50cfb71343197f0a32bb1ef56549097
Brian Carlstrom [Thu, 4 Jun 2015 16:54:46 +0000 (16:54 +0000)]
Merge "Fix JNI GetSuperClasss"
David Brazdil [Thu, 4 Jun 2015 16:39:32 +0000 (16:39 +0000)]
am
962863b6: Merge "Cache stack map encoding"
* commit '
962863b6481163eb00e7621ec6f854cb0b6f67bc':
Cache stack map encoding
David Brazdil [Thu, 4 Jun 2015 16:26:10 +0000 (16:26 +0000)]
Merge "Cache stack map encoding"
David Brazdil [Fri, 29 May 2015 15:29:43 +0000 (16:29 +0100)]
Cache stack map encoding
Operations on CodeInfo and StackMap objects repeatedly read encoding
information from the MemoryRegion. Since these are 3-bit-loads of
values that never change, caching them can measurably reduce compile
times.
According to benchmarks, this patch saves 1-3% on armv7, 2-4% on x86,
and 0-1% on x64.
Change-Id: I46b197513601325d8bab562cc80100c00ec28a3b
Brian Carlstrom [Fri, 22 May 2015 20:43:00 +0000 (13:43 -0700)]
Fix JNI GetSuperClasss
Change-Id: I005e9f84220dabfcea7cbc7b7b0ad422dd435a40
Nicolas Geoffray [Thu, 4 Jun 2015 15:56:34 +0000 (15:56 +0000)]
am
c47908e8: Merge "Support for inlining virtual and interface calls."
* commit '
c47908e8c32fd58bc4dc75998a80f706954db1dc':
Support for inlining virtual and interface calls.
Nicolas Geoffray [Thu, 4 Jun 2015 15:56:33 +0000 (15:56 +0000)]
am
4c1ac208: Merge "Use HCurrentMethod in HInvokeStaticOrDirect."
* commit '
4c1ac208673c677951502552cadc38ae64fe1580':
Use HCurrentMethod in HInvokeStaticOrDirect.
Nicolas Geoffray [Thu, 4 Jun 2015 15:50:31 +0000 (15:50 +0000)]
Merge "Support for inlining virtual and interface calls."
Nicolas Geoffray [Thu, 4 Jun 2015 15:49:21 +0000 (15:49 +0000)]
Merge "Use HCurrentMethod in HInvokeStaticOrDirect."
Neil Fuller [Thu, 4 Jun 2015 15:44:53 +0000 (15:44 +0000)]
am
73235820: Merge "Revert "Revert "Modification to the way boot classpath resources are loaded"""
* commit '
732358201f5c319efe9119c2f61116ec85ad4187':
Revert "Revert "Modification to the way boot classpath resources are loaded""
Neil Fuller [Thu, 4 Jun 2015 15:38:05 +0000 (15:38 +0000)]
Merge "Revert "Revert "Modification to the way boot classpath resources are loaded"""
Nicolas Geoffray [Wed, 3 Jun 2015 14:04:32 +0000 (15:04 +0100)]
Support for inlining virtual and interface calls.
Also had to change the pass order to get reference type propagation
before the inliner.
Change-Id: I4bf3bbb2d17c7d9cab632cfdd96adad8368bdfea
Nicolas Geoffray [Mon, 1 Jun 2015 14:46:22 +0000 (15:46 +0100)]
Use HCurrentMethod in HInvokeStaticOrDirect.
Change-Id: I0d15244b6b44c8b10079398c55da5071a3e3af66
Calin Juravle [Thu, 4 Jun 2015 13:14:50 +0000 (13:14 +0000)]
am
6d8bd45e: Merge "Add $ tag to make sure a method has not been inlined."
* commit '
6d8bd45e585d549bda42da22ee96e7149cfd720d':
Add $noinline$ tag to make sure a method has not been inlined.
Calin Juravle [Thu, 4 Jun 2015 13:01:51 +0000 (13:01 +0000)]
Merge "Add $noinline$ tag to make sure a method has not been inlined."
Neil Fuller [Thu, 4 Jun 2015 12:24:08 +0000 (12:24 +0000)]
Revert "Revert "Modification to the way boot classpath resources are loaded""
This reverts commit
1e27c5bd372fbe55c46127c8f233a13d9994334c.
Change-Id: I8f45a890ae1d3c0b0497e4fea4fb5a4c7a07b59f
Guillaume "Vermeille" Sanchez [Wed, 3 Jun 2015 14:32:41 +0000 (15:32 +0100)]
Add $noinline$ tag to make sure a method has not been inlined.
Change-Id: Ic166cf43be566a0fa44c3c9e1939f647806fc500
Mathieu Chartier [Thu, 4 Jun 2015 01:46:51 +0000 (01:46 +0000)]
am
2029c632: Merge "Fix valgrind large_object_space_test"
* commit '
2029c6320a3ff996095b294534ba7236bc97c45f':
Fix valgrind large_object_space_test
Mathieu Chartier [Thu, 4 Jun 2015 01:35:44 +0000 (01:35 +0000)]
Merge "Fix valgrind large_object_space_test"
Mathieu Chartier [Thu, 4 Jun 2015 00:32:42 +0000 (17:32 -0700)]
Fix valgrind large_object_space_test
Also some cleanup.
(cherry picked from commit
c991403cd8b869e4a38c11c6a58223b82b89a1b2)
Change-Id: I9c1a8093e6356f1b52e332009429b77fa5c1d448
Mathieu Chartier [Wed, 3 Jun 2015 23:24:01 +0000 (23:24 +0000)]
am
dc4a4e0f: Merge "Add a way to determine if a large object is a zygote object"
* commit '
dc4a4e0fa3af68d493fd49e7887cdcb748d64b6d':
Add a way to determine if a large object is a zygote object
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
Mathieu Chartier [Wed, 3 Jun 2015 23:12:44 +0000 (23:12 +0000)]
Merge "Add a way to determine if a large object is a zygote object"
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 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
(cherry picked from commit
8f23620d45399286564986d2541cda761b3fe0ac)
Change-Id: I2416df484e5b84a8c5cc0b5664c8cb102dc235f6
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 [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: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 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
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
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
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."
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"
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: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: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 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 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: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 [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: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
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."