OSDN Git Service
Elliott Hughes [Tue, 3 Jul 2012 16:28:55 +0000 (09:28 -0700)]
am
f31a6f7b: am
7798a614: Merge "Fix a possible off-by-one in the verifier."
* commit '
f31a6f7b1648c079e45a519ed3dd84f7c1b5f768':
Fix a possible off-by-one in the verifier.
Elliott Hughes [Tue, 3 Jul 2012 16:25:29 +0000 (09:25 -0700)]
am
7798a614: Merge "Fix a possible off-by-one in the verifier."
* commit '
7798a614753251adf7a77835792d78db2e93f5ff':
Fix a possible off-by-one in the verifier.
Elliott Hughes [Mon, 2 Jul 2012 05:11:48 +0000 (22:11 -0700)]
Merge "Fix a possible off-by-one in the verifier."
Elliott Hughes [Fri, 29 Jun 2012 23:45:06 +0000 (16:45 -0700)]
Fix a possible off-by-one in the verifier.
Bug: http://code.google.com/p/android/issues/detail?id=10863
Change-Id: I604f9a5ea08b6a6934b3ba522e1fda0bb738f81c
Elliott Hughes [Thu, 21 Jun 2012 23:47:21 +0000 (16:47 -0700)]
am
8ca227ef: resolved conflicts for merge of
7c03fb79 to jb-dev-plus-aosp
* commit '
8ca227ef75cdb1511ea3b11679526a6de5a99974':
Extend forkAndSpecialize to take additional inputs and to set the SELinux security context.
Elliott Hughes [Thu, 21 Jun 2012 21:15:11 +0000 (14:15 -0700)]
resolved conflicts for merge of
7c03fb79 to jb-dev-plus-aosp
Change-Id: Icedbe5a6d7cbcedde53e05249f7e90a390f2f0ea
Kenny Root [Thu, 21 Jun 2012 18:05:52 +0000 (11:05 -0700)]
Merge "Extend forkAndSpecialize to take additional inputs and to set the SELinux security context."
Jean-Baptiste Queru [Wed, 20 Jun 2012 20:46:47 +0000 (13:46 -0700)]
am
de574936: am
44292346: Merge "Switched code to blx <reg>"
* commit '
de574936841bbfa9ad82b5876e214bc918ee777c':
Switched code to blx <reg>
Jean-Baptiste Queru [Wed, 20 Jun 2012 20:43:24 +0000 (13:43 -0700)]
am
44292346: Merge "Switched code to blx <reg>"
* commit '
44292346f4935cd078ca7b931042809af80f9d95':
Switched code to blx <reg>
Jean-Baptiste Queru [Wed, 20 Jun 2012 16:41:12 +0000 (09:41 -0700)]
Merge "Switched code to blx <reg>"
David Butcher [Wed, 20 Jun 2012 13:31:33 +0000 (14:31 +0100)]
Switched code to blx <reg>
ldr ip,<addr> blx ip is preferred over mov lr,pc ldr pc,<addr> from armv5te,
and will typically perform better on later ARM processors.
Change-Id: I8f2e5e794c644faafd767037ad56579f2934de47
Elliott Hughes [Tue, 12 Jun 2012 00:45:49 +0000 (17:45 -0700)]
am
f2a33d44: am
effc95cb: Merge "Make dex merging stateless."
* commit '
f2a33d444213c328642daae78742e9e978c94c28':
Make dex merging stateless.
Elliott Hughes [Tue, 12 Jun 2012 00:45:48 +0000 (17:45 -0700)]
am
5164762f: am
a9ac3a9d: Merge "Support debug info in dexmerge."
* commit '
5164762f98362866f50cda3c7f2b72b519be9c91':
Support debug info in dexmerge.
Elliott Hughes [Tue, 12 Jun 2012 00:43:14 +0000 (17:43 -0700)]
am
effc95cb: Merge "Make dex merging stateless."
* commit '
effc95cb732d8d5453930e647240a1665b6dc71a':
Make dex merging stateless.
Elliott Hughes [Tue, 12 Jun 2012 00:43:13 +0000 (17:43 -0700)]
am
a9ac3a9d: Merge "Support debug info in dexmerge."
* commit '
a9ac3a9d1f8de71bcdc39d1f4827c04a952a0c29':
Support debug info in dexmerge.
Elliott Hughes [Mon, 11 Jun 2012 23:41:26 +0000 (16:41 -0700)]
Merge "Make dex merging stateless."
Xavier Ducrohet [Mon, 11 Jun 2012 22:17:31 +0000 (15:17 -0700)]
Make dex merging stateless.
This is required to run dx in Eclipse which doesn't unload the dx
library after each run.
(cherry-pick of
7aa5ce7e990dc3766eba97cd0932b62e4de21503.)
Change-Id: I7a69a3015d448ddd5558c307cd01346156cbc739
Elliott Hughes [Mon, 11 Jun 2012 23:30:30 +0000 (16:30 -0700)]
Merge "Support debug info in dexmerge."
Elliott Hughes [Thu, 7 Jun 2012 23:47:38 +0000 (16:47 -0700)]
Support debug info in dexmerge.
Bug:
4090053
(cherry-pick of
bc23c4f3ebaefebb3f1be7732767631f91e165ea.)
Change-Id: I1108933fc03330ff91be3a2edef8b4966977dcd7
Signed-off-by: Jesse Wilson <jesse@swank.ca>
Xavier Ducrohet [Mon, 11 Jun 2012 22:17:31 +0000 (15:17 -0700)]
Make dex merging stateless.
This is required to run dx in Eclipse which doesn't unload the dx
library after each run.
Change-Id: I84df49d424ea465f70613eb602d1a4890804296a
Elliott Hughes [Mon, 11 Jun 2012 18:26:58 +0000 (11:26 -0700)]
am
c3cd2420: am
bf11122d: Merge "Revert " Trim after explicit gc.""
* commit '
c3cd242005fb31035265d0bbd5681518eea656b4':
Revert " Trim after explicit gc."
Elliott Hughes [Mon, 11 Jun 2012 18:22:17 +0000 (11:22 -0700)]
am
bf11122d: Merge "Revert " Trim after explicit gc.""
* commit '
bf11122d175d1315783b313897ee8ecae63f0278':
Revert " Trim after explicit gc."
Elliott Hughes [Mon, 11 Jun 2012 16:03:36 +0000 (09:03 -0700)]
Merge "Revert " Trim after explicit gc.""
Elliott Hughes [Mon, 11 Jun 2012 15:41:06 +0000 (08:41 -0700)]
Revert " Trim after explicit gc."
This reverts commit
ea4c6e57a48e08eacbf08520c64133175e7d5da0
Elliott Hughes [Thu, 7 Jun 2012 23:47:38 +0000 (16:47 -0700)]
Support debug info in dexmerge.
Bug:
4090053
Change-Id: Ided1979b306539bfe3576ef17b72689fc9705abb
Signed-off-by: Jesse Wilson <jesse@swank.ca>
The Android Open Source Project [Thu, 7 Jun 2012 14:52:09 +0000 (07:52 -0700)]
The Android Open Source Project [Thu, 7 Jun 2012 14:48:51 +0000 (07:48 -0700)]
Reconcile with jb-release
Change-Id: I3e7e63e5d19d73ece11951f9cc3f85589c72adbe
Elliott Hughes [Tue, 5 Jun 2012 22:18:06 +0000 (15:18 -0700)]
am
7d740cf6: am
53bc3719: Merge "Fixing a crash when doing lock profiling"
* commit '
7d740cf6430a86edca1fcf20fd974b53b00136f8':
Fixing a crash when doing lock profiling
Elliott Hughes [Tue, 5 Jun 2012 22:16:27 +0000 (15:16 -0700)]
am
53bc3719: Merge "Fixing a crash when doing lock profiling"
* commit '
53bc3719bab6f0a075dd3f968a6d9a630fb81476':
Fixing a crash when doing lock profiling
Elliott Hughes [Tue, 5 Jun 2012 21:33:14 +0000 (14:33 -0700)]
Merge "Fixing a crash when doing lock profiling"
Elliott Hughes [Tue, 5 Jun 2012 21:16:11 +0000 (14:16 -0700)]
am
2436ea18: am
90d3e3b3: Merge "Add test cases for concurrent gc and System.arraycopy"
* commit '
2436ea181dc24ec4d91a6052394d24bf60987f25':
Add test cases for concurrent gc and System.arraycopy
Elliott Hughes [Tue, 5 Jun 2012 21:13:59 +0000 (14:13 -0700)]
am
90d3e3b3: Merge "Add test cases for concurrent gc and System.arraycopy"
* commit '
90d3e3b3999aa22d0cecc4f064e5686c555ad700':
Add test cases for concurrent gc and System.arraycopy
Elliott Hughes [Tue, 5 Jun 2012 20:16:11 +0000 (13:16 -0700)]
Merge "Add test cases for concurrent gc and System.arraycopy"
Johannes Carlsson [Thu, 3 Feb 2011 14:12:46 +0000 (15:12 +0100)]
Add test cases for concurrent gc and System.arraycopy
When System.arraycopy runs at the same time as a concurrent gc
the phone will sometimes crash since System.arraycopy was implemented
using memmove and memcpy. In current implementation of mememove bytes
are copied one at a time. If for instance only 3 out of 4 bytes
to an object reference were copied when the thread switch to the
gc thread occurred and the gc was scanning the marked objects the
gc read an invalid address. The parameters to dvmWriteBarrierArray
in one case was also corrected (they are currently not used).
The fix itself for this crash is made elsewhere, this commit just
adds test cases to verify that this works.
Change-Id: I0a8cfd43561b3d5de4bba818993bcf8b40413045
Mattias Petersson [Tue, 5 Jun 2012 08:43:01 +0000 (10:43 +0200)]
Fixing a crash when doing lock profiling
This is a fix for a crash that can happen when logging Contention
events. This logging is performed when lock profiling is enabled.
This is by default enabled on userdebug builds. The crash happened
when a thread was being destroyed. When a thread is being
destroyed it is normal that the frame depth is zero, and thus the
current frame is null. logContentionEvent() requires that the
current frame is not null, or it will crash.
The fix is to check if the current frame is null.
Change-Id: I4c2b9ad94b663398645497fdffa1ec6f7ea86a51
The Android Automerger [Thu, 31 May 2012 14:00:08 +0000 (07:00 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Thu, 31 May 2012 01:10:59 +0000 (18:10 -0700)]
am
5e037ee6: am
89cf125c: Report GC pause times more accurately.
* commit '
5e037ee6df37069ba12c9a9eccbf01dd232b1d7d':
Report GC pause times more accurately.
Jeff Brown [Thu, 31 May 2012 01:07:55 +0000 (18:07 -0700)]
am
89cf125c: Report GC pause times more accurately.
* commit '
89cf125cd95a7df3a713cb3d3d39a033304e474c':
Report GC pause times more accurately.
Jeff Brown [Thu, 31 May 2012 00:09:27 +0000 (17:09 -0700)]
Report GC pause times more accurately.
Include the time that it actually took to pause or suspend
threads in the reported time.
Also report the amount of time that other threads spend blocked
waiting for a concurrent GC to complete.
Change-Id: I80af351c2dc3171fc7db48dbbb361f3d92bbca80
Elliott Hughes [Wed, 30 May 2012 21:21:17 +0000 (14:21 -0700)]
am
e99e79db: am
07901d5e: Merge "Running rebuild.sh found a few changes to be updated to vm/mterp/out/InterpAsm-mips.S and vm/mterp/out/InterpC-mips.cpp"
* commit '
e99e79dbab3ce3a3b18fd4422f1d69ef05ccde59':
Running rebuild.sh found a few changes to be updated to vm/mterp/out/InterpAsm-mips.S and vm/mterp/out/InterpC-mips.cpp
Elliott Hughes [Wed, 30 May 2012 21:18:12 +0000 (14:18 -0700)]
am
07901d5e: Merge "Running rebuild.sh found a few changes to be updated to vm/mterp/out/InterpAsm-mips.S and vm/mterp/out/InterpC-mips.cpp"
* commit '
07901d5e8d0be0130d92b626f0b92d177ba8f460':
Running rebuild.sh found a few changes to be updated to vm/mterp/out/InterpAsm-mips.S and vm/mterp/out/InterpC-mips.cpp
Elliott Hughes [Wed, 30 May 2012 21:08:08 +0000 (14:08 -0700)]
Merge "Running rebuild.sh found a few changes to be updated to vm/mterp/out/InterpAsm-mips.S and vm/mterp/out/InterpC-mips.cpp"
Raghu Gandham [Mon, 21 May 2012 19:31:11 +0000 (12:31 -0700)]
Running rebuild.sh found a few changes to be updated to
vm/mterp/out/InterpAsm-mips.S and
vm/mterp/out/InterpC-mips.cpp
The Android Open Source Project [Tue, 22 May 2012 21:21:14 +0000 (14:21 -0700)]
The Android Open Source Project [Tue, 22 May 2012 20:04:55 +0000 (13:04 -0700)]
Reconcile with jb-release
Change-Id: I9be82c25a57356698a04628abbbb0a18f95a9ca2
Brian Carlstrom [Mon, 21 May 2012 22:03:11 +0000 (15:03 -0700)]
Merge "Fix for bug
6448650 by changing to dvmCreateReflectObjForMethod"
The Android Automerger [Sun, 20 May 2012 14:39:37 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 19 May 2012 18:42:45 +0000 (11:42 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 19 May 2012 17:05:41 +0000 (10:05 -0700)]
merge in jb-release history after reset to jb-dev
Brian Carlstrom [Fri, 18 May 2012 00:17:09 +0000 (17:17 -0700)]
am
6fb6f30d: Update test 089 expectations
* commit '
6fb6f30d1d079724bc6107c4c68eabf2d8cadefb':
Update test 089 expectations
Mathieu Chartier [Thu, 17 May 2012 23:44:20 +0000 (16:44 -0700)]
Fix for bug
6448650 by changing to dvmCreateReflectObjForMethod
Bug:
6448650
Changing dvmCreateReflectMethodObject with dvmCreateReflectObjForMethod in createAnnotationMember fixes crash caused by accessing uninitialized gDvm.classJavaLangReflectMethod
Change-Id: I3ce9b112a4afab2f972b80cbdb80f1ab1fb9678c
Brian Carlstrom [Thu, 17 May 2012 23:14:09 +0000 (16:14 -0700)]
Update test 089 expectations
Change-Id: I9023d20d1bc68204f932449b5e90fcb455da7a0b
The Android Open Source Project [Wed, 16 May 2012 15:40:00 +0000 (08:40 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I805eea05d6c4840fe471dbfbfb5624a7fdc78235
The Android Automerger [Mon, 14 May 2012 13:59:59 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Sat, 12 May 2012 04:56:02 +0000 (21:56 -0700)]
am
3492e8ab: Merge " Trim after explicit gc."
* commit '
3492e8ab5939ebdbec642ad284bce015937e60d9':
Trim after explicit gc.
Elliott Hughes [Fri, 11 May 2012 22:29:32 +0000 (15:29 -0700)]
Merge " Trim after explicit gc."
SangWook Han [Fri, 11 May 2012 11:58:01 +0000 (20:58 +0900)]
Trim after explicit gc.
On Gingerbread, dvmHeapSourceTrim() is called 5 seconds
after every kind of GC. Current AOSP do trim only for
concurrent GC. That makes OOM killer too busy.
At least explicit GC need trim and in case of explicit
GC, there are no need to delay 5 seconds before trim.
Change-Id: I8fde8f773398bf20c674cfa6f686d7d745d56492
SangWook Han [Fri, 11 May 2012 22:18:21 +0000 (15:18 -0700)]
am
0cea134b: Fix: Issue 26627: Dalvik Heap Trim timer value after GC
* commit '
0cea134bef68f348225178dacf03716d4907bdbe':
Fix: Issue 26627: Dalvik Heap Trim timer value after GC
SangWook Han [Fri, 11 May 2012 11:45:33 +0000 (20:45 +0900)]
Fix: Issue 26627: Dalvik Heap Trim timer value after GC
dvmRelativeCondWait need millisecods not seconds.
With this fix, trim will begins 5 seconds after concurrent GC
Bug: http://code.google.com/p/android/issues/detail?id=26627
Bug:
6482868
Change-Id: I3802b48e345725fb78e4ef2c999dd243ef30a138
Elliott Hughes [Fri, 11 May 2012 21:14:07 +0000 (14:14 -0700)]
am
07cfd74d: Merge " Fix: Issue 26627: Dalvik Heap Trim timer value after GC"
* commit '
07cfd74d766d821196fa2451604af25cfa9767de':
Fix: Issue 26627: Dalvik Heap Trim timer value after GC
Elliott Hughes [Fri, 11 May 2012 18:56:15 +0000 (11:56 -0700)]
Merge " Fix: Issue 26627: Dalvik Heap Trim timer value after GC"
SangWook Han [Fri, 11 May 2012 11:45:33 +0000 (20:45 +0900)]
Fix: Issue 26627: Dalvik Heap Trim timer value after GC
dvmRelativeCondWait need millisecods not seconds.
With this fix, trim will begins 5 seconds after concurrent GC
Bug: http://code.google.com/p/android/issues/detail?id=26627
Change-Id: I3802b48e345725fb78e4ef2c999dd243ef30a138
Elliott Hughes [Thu, 10 May 2012 16:25:55 +0000 (09:25 -0700)]
am
259298d9: Make sure we have room for future Maps builds.
* commit '
259298d964e55be9f2afbd9e145311895ed920da':
Make sure we have room for future Maps builds.
The Android Automerger [Thu, 10 May 2012 14:00:15 +0000 (07:00 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Thu, 10 May 2012 00:45:01 +0000 (17:45 -0700)]
Make sure we have room for future Maps builds.
They're worried that the Honeycomb increase to 8MiB won't last them very long.
Bug:
6423582
Change-Id: I5f35add9f370548415c0a5e6aed42ec5bd943a03
The Android Automerger [Sun, 6 May 2012 21:21:23 +0000 (14:21 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Fri, 4 May 2012 23:59:59 +0000 (16:59 -0700)]
am
2b02fef4: Lose libnativehelper to its own project for the PDK.
* commit '
2b02fef409ebf91d3a9e6a624ab4f60ef540dbc9':
Lose libnativehelper to its own project for the PDK.
Elliott Hughes [Fri, 4 May 2012 04:50:07 +0000 (21:50 -0700)]
am
20aeca6e: Merge "Pad the 8 and 16 bit Jvalue members"
* commit '
20aeca6e2b18c07d3840f4b09f09186511148d8c':
Pad the 8 and 16 bit Jvalue members
Elliott Hughes [Fri, 4 May 2012 01:35:53 +0000 (18:35 -0700)]
resolved conflicts for merge of
93a44a28 to jb-dev-plus-aosp
Change-Id: I9c1f2e37602bea86e70333d2b274665e99fcbd92
Elliott Hughes [Fri, 4 May 2012 00:18:25 +0000 (17:18 -0700)]
Lose libnativehelper to its own project for the PDK.
Bug:
6369821
Change-Id: Iae06cf1570a14ddefad6b31eec904d9fa598d89f
Elliott Hughes [Thu, 3 May 2012 17:49:51 +0000 (10:49 -0700)]
Merge "Pad the 8 and 16 bit Jvalue members"
Chris Dearman [Tue, 31 Jan 2012 02:10:35 +0000 (18:10 -0800)]
Pad the 8 and 16 bit Jvalue members
This allows them to be consistently accessed as either 8-bit,
16-bit or 32-bit values in bigendian and little-endian mode.
Change-Id: I1be5519f3666a3553b404368075f5a7b5d9e6b32
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Elliott Hughes [Thu, 3 May 2012 16:42:38 +0000 (09:42 -0700)]
Merge "[MIPS] Dalvik fast interpreter support and JIT implementation"
Elliott Hughes [Thu, 3 May 2012 14:20:21 +0000 (07:20 -0700)]
am
e6bdc430: Merge "Fix a bug in dvmQuasiAtomicsShutdown."
* commit '
e6bdc430f38ef9c2e74ecdb0cee5aa04848e71fc':
Fix a bug in dvmQuasiAtomicsShutdown.
Elliott Hughes [Thu, 3 May 2012 06:21:27 +0000 (23:21 -0700)]
Merge "Fix a bug in dvmQuasiAtomicsShutdown."
Elliott Hughes [Thu, 3 May 2012 00:06:58 +0000 (17:06 -0700)]
am
a14639df: Merge "Support architectures that require correctly aligned doubles"
* commit '
a14639df65cc0aefafcddda5aae8b591204e45f9':
Support architectures that require correctly aligned doubles
Elliott Hughes [Wed, 2 May 2012 23:07:36 +0000 (16:07 -0700)]
Fix a bug in dvmQuasiAtomicsShutdown.
Spotted visually when merging to an internal branch.
Change-Id: Ic130608bfa46036cec0684cd50706178cfefd2a0
Elliott Hughes [Wed, 2 May 2012 22:08:08 +0000 (15:08 -0700)]
resolved conflicts for merge of
323d9152 to jb-dev-plus-aosp
Change-Id: Ie94542150dad725ca09ad2824cddd034cd6a149b
Raghu Gandham [Wed, 2 May 2012 21:27:16 +0000 (14:27 -0700)]
[MIPS] Dalvik fast interpreter support and JIT implementation
Change-Id: I9bb4f6875b7061d3ffaee73f204026cb8ba3ed39
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Douglas Leung <douglas@mips.com>
Signed-off-by: Don Padgett <don@mips.com>
Elliott Hughes [Wed, 2 May 2012 20:47:18 +0000 (13:47 -0700)]
Merge "Support architectures that require correctly aligned doubles"
Elliott Hughes [Wed, 2 May 2012 17:25:07 +0000 (10:25 -0700)]
Merge "Simplify the quasi-atomic stuff and add MIPS support."
Elliott Hughes [Wed, 2 May 2012 00:24:51 +0000 (17:24 -0700)]
Simplify the quasi-atomic stuff and add MIPS support.
Change-Id: Iac896c03ef707c998cc714628adea0255f21c035
Elliott Hughes [Tue, 1 May 2012 05:46:12 +0000 (22:46 -0700)]
resolved conflicts for merge of
5a1fcc8a to jb-dev-plus-aosp
Change-Id: I229e532e3c2892251244bde61290ff40e7b95b4e
Elliott Hughes [Tue, 1 May 2012 05:15:31 +0000 (22:15 -0700)]
resolved conflicts for merge of
4c5f9711 to jb-dev-plus-aosp
Change-Id: I4c724c3df990a5abf42cec748bbbba25ee5bc112
Elliott Hughes [Tue, 1 May 2012 04:04:50 +0000 (21:04 -0700)]
am
8b946491: Merge "Fixed bug in x86-atom fast interpreter. Adds guard for potential null pointer. Adds guard for potential null pointer when checking for debugger active on return from method."
* commit '
8b946491bd4d09229dc342c0be78ef36a56e7f78':
Fixed bug in x86-atom fast interpreter. Adds guard for potential null pointer. Adds guard for potential null pointer when checking for debugger active on return from method.
Elliott Hughes [Tue, 1 May 2012 01:43:30 +0000 (18:43 -0700)]
Merge changes I8669dfbc,I0ffb15b7,Ib2b8e87a,Ifc7de30e
* changes:
Use old frame for dvmReportPreNativeInvoke/dvmReportPostNativeInvoke
Restore fp after calling JNI method in allstubs interpreter
Fix the warning emitted by codesourcery compiler 4.5.2
Fix instruction logging messages
Elliott Hughes [Tue, 1 May 2012 01:42:05 +0000 (18:42 -0700)]
Merge "Fix the portable interpreter build"
Elliott Hughes [Tue, 1 May 2012 00:47:55 +0000 (17:47 -0700)]
Merge "Fixed bug in x86-atom fast interpreter. Adds guard for potential null pointer. Adds guard for potential null pointer when checking for debugger active on return from method."
The Android Automerger [Wed, 25 Apr 2012 14:47:10 +0000 (07:47 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Tue, 24 Apr 2012 21:31:33 +0000 (14:31 -0700)]
am
0cdf3934: am
d2a4bb85: Merge "Fix a leak in the JIT."
* commit '
0cdf3934d334805fd6f22040fa781a86515ad2bf':
Fix a leak in the JIT.
Elliott Hughes [Tue, 24 Apr 2012 21:25:11 +0000 (14:25 -0700)]
resolved conflicts for merge of
156f3159 to master
Change-Id: I2f954597257df43d3c6367bbab40f1fdad229502
Glenn Kasten [Sun, 22 Apr 2012 18:26:01 +0000 (11:26 -0700)]
apps forked from zygote run in default cgroup
zygote and it's children, including system_server and all app processes,
currently start in root cgroup. Most app threads eventually join either
bg_noninteractive or foreground cgroups, but we can't depend on that.
This change puts system_server and all app processes in the system
default cgroup aka foreground instead.
See also bug
6376294 which will provide a more general way of configuring cgroups.
Excerpt of ps -P -t before fix. Note that app u0_a7 has some threads in root cgroup:
USER PID PPID VSIZE RSS PCY WCHAN PC NAME
root 91 1 441308 35052
ffffffff 400d4bf8 S zygote
root 1838 91 441308 35052
c009c0c4 400d5bdc S ReferenceQueueD
root 1840 91 441308 35052
c009c0c4 400d5bdc S FinalizerDaemon
root 1842 91 441308 35052
c009c0c4 400d5bdc S FinalizerWatchd
u0_a7 1378 91 461036 28676
ffffffff 400d59b0 S com.google.android.calendar
u0_a7 1380 1378 461036 28676
c009c0c4 400d5bdc S GC
u0_a7 1383 1378 461036 28676
c00827fc 400d5494 S Signal Catcher
u0_a7 1384 1378 461036 28676
c0408d14 400d569c S JDWP
u0_a7 1385 1378 461036 28676
c009c0c4 400d5bdc S Compiler
u0_a7 1386 1378 461036 28676
c009c0c4 400d5bdc S ReferenceQueueD
u0_a7 1387 1378 461036 28676
c009c0c4 400d5bdc S FinalizerDaemon
u0_a7 1388 1378 461036 28676
c009c0c4 400d5bdc S FinalizerWatchd
u0_a7 1389 1378 461036 28676 fg
c035ac7c 400d4ad4 S Binder_1
u0_a7 1390 1378 461036 28676 fg
c035ac7c 400d4ad4 S Binder_2
u0_a7 1393 1378 461036 28676
c009c0c4 400d5bdc S pool-1-thread-1
u0_a7 1395 1378 461036 28676 bg
c009c0c4 400d5bdc S AsyncTask #1
u0_a7 1410 1378 461036 28676
c009c0c4 400d5bdc S pool-2-thread-1
u0_a7 1411 1378 461036 28676 bg
c009c0c4 400d5bdc S AsyncTask #2
u0_a7 1428 1378 461036 28676
c01258cc 400d59b0 S AsyncQueryWorke
u0_a7 1469 1378 461036 28676 bg
c009c0c4 400d5bdc S AsyncTask #3
u0_a7 1563 1378 461036 28676
c009c0c4 400d5bdc S pool-3-thread-1
u0_a7 1564 1378 461036 28676 bg
c009c0c4 400d5bdc S AsyncTask #4
After the fix, now only kernel workers and native system services run in root cgroup:
USER PID PPID VSIZE RSS PCY WCHAN PC NAME
root 91 1 441304 35048
ffffffff 4007abf8 S zygote
root 1490 91 441304 35048
c009c0c4 4007bbdc S ReferenceQueueD
root 1491 91 441304 35048
c009c0c4 4007bbdc S FinalizerDaemon
root 1493 91 441304 35048
c009c0c4 4007bbdc S FinalizerWatchd
u0_a7 1335 91 460032 32124 bg
ffffffff 4007b9b0 S com.google.android.calendar
u0_a7 1337 1335 460032 32124 bg
c009c0c4 4007bbdc S GC
u0_a7 1338 1335 460032 32124 bg
c00827fc 4007b494 S Signal Catcher
u0_a7 1341 1335 460032 32124 bg
c0408d14 4007b69c S JDWP
u0_a7 1342 1335 460032 32124 bg
c009c0c4 4007bbdc S Compiler
u0_a7 1343 1335 460032 32124 bg
c009c0c4 4007bbdc S ReferenceQueueD
u0_a7 1344 1335 460032 32124 bg
c009c0c4 4007bbdc S FinalizerDaemon
u0_a7 1345 1335 460032 32124 bg
c009c0c4 4007bbdc S FinalizerWatchd
u0_a7 1346 1335 460032 32124 fg
c035ac7c 4007aad4 S Binder_1
u0_a7 1347 1335 460032 32124 fg
c035ac7c 4007aad4 S Binder_2
u0_a7 1351 1335 460032 32124 bg
c009c0c4 4007bbdc S AsyncTask #1
u0_a7 1380 1335 460032 32124 bg
c01258cc 4007b9b0 S AsyncQueryWorke
u0_a7 1417 1335 460032 32124 bg
c009c0c4 4007bbdc S AsyncTask #2
u0_a7 1452 1335 460032 32124 bg
c009c0c4 4007bbdc S AsyncTask #3
u0_a7 1555 1335 460032 32124 bg
c01258cc 4007b9b0 S Thread-134
u0_a7 1691 1335 460032 32124 bg
c009c0c4 4007bbdc S pool-3-thread-1
u0_a7 1692 1335 460032 32124 bg
c009c0c4 4007bbdc S AsyncTask #4
Not shown, but system_server also runs in fg (it already did; this change
didn't affect that).
Change-Id: I516960a102c9d59fc9bfb5888d90a7645d178dcf
Elliott Hughes [Fri, 20 Apr 2012 23:47:54 +0000 (16:47 -0700)]
am
d2a4bb85: Merge "Fix a leak in the JIT."
* commit '
d2a4bb85573f20edd751557dfdca2033652b9f36':
Fix a leak in the JIT.
Elliott Hughes [Fri, 20 Apr 2012 17:11:41 +0000 (10:11 -0700)]
Merge "Fix a leak in the JIT."
Elliott Hughes [Fri, 20 Apr 2012 05:56:08 +0000 (22:56 -0700)]
am
53b07f7b: Merge "Fix a small memory leak."
* commit '
53b07f7bc2fb344727511e3a1f7ce8f10e36e7b0':
Fix a small memory leak.
Elliott Hughes [Fri, 20 Apr 2012 00:16:08 +0000 (17:16 -0700)]
Fix a leak in the JIT.
We should use the JIT's arena rather than explicit allocation/deallocation.
Change-Id: I12b78cb1586222b082b140e4a1db00969ce23e3c
Elliott Hughes [Thu, 19 Apr 2012 22:45:10 +0000 (15:45 -0700)]
Merge "Fix a small memory leak."
Elliott Hughes [Sat, 7 Jan 2012 01:25:14 +0000 (17:25 -0800)]
Fix a small memory leak.
Found by someone reading the code, rather than because we saw a crash. This is
only a small leak, and you'd have to be dumping threads (because of an ANR) or
creating a new thread to provoke it.
(cherry picked from commit
6d1a1dfd0ef006e19067b6ffd927160d0c6d9647)
Change-Id: Id857efca8d34b20d1acaa452c3fe5d2975e2572b
The Android Automerger [Tue, 17 Apr 2012 13:59:46 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
jeffhao [Mon, 16 Apr 2012 18:12:46 +0000 (11:12 -0700)]
Merge "Output number of bytes used by LinearAlloc during dexopt."