OSDN Git Service
Jeff Brown [Wed, 10 Aug 2011 20:57:59 +0000 (13:57 -0700)]
am
a0533621: am
9df264db: Merge "Add a dual clock profiler tracing mode."
* commit '
a05336218332abf2753c63a50ede7551afdab6b5':
Add a dual clock profiler tracing mode.
Jeff Brown [Wed, 10 Aug 2011 20:56:15 +0000 (13:56 -0700)]
am
9df264db: Merge "Add a dual clock profiler tracing mode."
* commit '
9df264db156d091f7c1de30295f4c5d330ca3694':
Add a dual clock profiler tracing mode.
Jeff Brown [Wed, 10 Aug 2011 20:41:26 +0000 (13:41 -0700)]
Merge "Add a dual clock profiler tracing mode."
Jeff Brown [Wed, 20 Jul 2011 02:01:05 +0000 (19:01 -0700)]
Add a dual clock profiler tracing mode.
Dalvik previously supported using either the thread-cpu clock
or the real time clock as the timebase for profiler traces.
This change adds a dual clock mode where both thread-cpu time
and real time timestamps are collected.
Using dual clock mode significantly improves TraceView ability
to accurately reconstruct the global timeline of events,
particularly on SMP systems.
For now, thread-cpu mode remains the default.
Dual clock mode can be enabled by running the following command
and restarting the system server.
adb shell setprop dalvik.vm.extra-opts -Xprofile:dualclock
Change-Id: I14db2ae93325ac01efcc8ed02e8747cc0e834e29
Raphael [Tue, 12 Jul 2011 04:18:18 +0000 (21:18 -0700)]
resolved conflicts for merge of
c3ff6a0b to honeycomb-plus-aosp
Change-Id: I6b9cfdc27b2654bd832cfd06678a173449f992bc
Raphael Moll [Tue, 12 Jul 2011 03:06:20 +0000 (20:06 -0700)]
am
bf62959b: Merge "Dex for Windows: Support paths with spaces."
* commit '
bf62959bd8382e458a1aee6b491cb7da703984fb':
Dex for Windows: Support paths with spaces.
Raphael Moll [Tue, 12 Jul 2011 02:56:16 +0000 (19:56 -0700)]
Merge "Dex for Windows: Support paths with spaces."
Raphael Moll [Mon, 11 Jul 2011 23:59:46 +0000 (16:59 -0700)]
am
53015360: am
5a57e766: Merge "Change dx.bat to Windows EOL."
* commit '
53015360753df7325e3cc84c44bee5b48b497436':
Change dx.bat to Windows EOL.
Raphael Moll [Mon, 11 Jul 2011 23:57:50 +0000 (16:57 -0700)]
am
5a57e766: Merge "Change dx.bat to Windows EOL."
* commit '
5a57e766a662184902e215b52cb943e02d9fa827':
Change dx.bat to Windows EOL.
Raphael Moll [Mon, 11 Jul 2011 23:50:51 +0000 (16:50 -0700)]
Merge "Change dx.bat to Windows EOL."
Raphael Moll [Mon, 11 Jul 2011 22:18:49 +0000 (18:18 -0400)]
Dex for Windows: Support paths with spaces.
1- Change the format of the command line parsed by dx.jar.
Parameters with values are usually specified with one
single argument e.g.
--output=/some/path with spaces
That breaks for a variety of reasons on windows, so the first
step is to allow a new 2-parameter form:
--output "/some/path with spaces"
2- The next step is fixing the way the dx.bat wrapper
extracts the -J parameters to be able to cope with
arguments that contain spaces.
SDK bugs: 4567, 18388
Change-Id: Ia837e7307998c0bf41ae39abb36abebfc27da104
David 'Digit' Turner [Mon, 11 Jul 2011 22:18:45 +0000 (15:18 -0700)]
am
c8d71801: resolved conflicts for merge of
d0d351b2 to gingerbread-plus-aosp
* commit '
c8d718012b0ac4abf668a9f494c33d2dd8a314e5':
Only use O_BINARY if it is defined (windows compatibility)
Update to allow x86-atom build for FI on Gingerbread
Combined patch from master branch
Raphael Moll [Mon, 11 Jul 2011 22:16:34 +0000 (18:16 -0400)]
Change dx.bat to Windows EOL.
Change-Id: I0adc6101297e8491814599d345b3cfd3278837cd
David 'Digit' Turner [Mon, 11 Jul 2011 21:20:22 +0000 (23:20 +0200)]
resolved conflicts for merge of
d0d351b2 to gingerbread-plus-aosp
Change-Id: I1594c21fb3dd761b1e2275be2019ec139cf64174
David 'Digit' Turner [Fri, 8 Jul 2011 16:19:01 +0000 (18:19 +0200)]
merge intel x86 patches into gingerbread branch
Elliott Hughes [Wed, 22 Jun 2011 17:30:17 +0000 (10:30 -0700)]
am
03c60a44: Merge "Undecoded jobject leaking in through attachThread"
* commit '
03c60a44861951126affa75ba8ee4233c136fe92':
Undecoded jobject leaking in through attachThread
Elliott Hughes [Wed, 22 Jun 2011 16:25:01 +0000 (09:25 -0700)]
Merge "Undecoded jobject leaking in through attachThread"
Carl Shapiro [Wed, 15 Jun 2011 04:59:05 +0000 (21:59 -0700)]
am
1dd6e412: am
a028d87f: Always grow the limit address of the a heap along with its size.
* commit '
1dd6e4124b5ec8b7392163cb055028678aaf042d':
Always grow the limit address of the a heap along with its size.
Carl Shapiro [Wed, 15 Jun 2011 04:56:54 +0000 (21:56 -0700)]
am
a028d87f: Always grow the limit address of the a heap along with its size.
* commit '
a028d87fb310eae8cac821183aa91567ec8cb0f9':
Always grow the limit address of the a heap along with its size.
Carl Shapiro [Wed, 15 Jun 2011 03:51:45 +0000 (20:51 -0700)]
Always grow the limit address of the a heap along with its size.
Previously, clearing the growth limit only updated the maximumSize of
the unlimited heap without updating the limit value. This caused any
operations iterated over the extent of the heap to ignore allocations
beyond the original heap size. With this change the limit is always
kept in agreement with the maximumSize.
Bug:
4539441
Change-Id: I08c8004e724549d196e1fd5d6ad22efc85b0c8d2
Bruce Beare [Mon, 6 Jun 2011 17:50:57 +0000 (10:50 -0700)]
Only use O_BINARY if it is defined (windows compatibility)
Change-Id: Iaa3c0812ef4d90d46b4031be7f4faca84c7d7200
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Johnnie Birch [Fri, 18 Feb 2011 18:06:23 +0000 (10:06 -0800)]
Update to allow x86-atom build for FI on Gingerbread
Also handles most TODO.txt items and contains some rewriting of the dispatch code.
Also adds a newline to the end of files that did not previously end with a newline.
Change-Id: Ifa627ac3d493447013524eb0be178b5b6d952612
Bruce Beare [Wed, 1 Jun 2011 22:10:47 +0000 (15:10 -0700)]
Combined patch from master branch
From: Jack Ren <jack.ren@intel.com>
Date: Tue, 1 Mar 2011 21:10:42 +0800
Subject: [PATCH 1/2] sync with korg/master commit
dd19f5b91a1032e60871febb143850fd81000c5a
following patches are applied in one time:
commit
dd19f5b91a1032e60871febb143850fd81000c5a
Merge:
2b3d7e8 a62c84f
Author: Romain Guy <romainguy@android.com>
Date: Thu Feb 24 11:24:47 2011 -0800
Merge "Fix for a crash when GC weak references."
commit
2b3d7e8eccd7cbf64b2ac41c05073a9191d0d3b3
Merge:
ef4b061 b4719ed
Author: Raphael Moll <ralf@android.com>
Date: Tue Feb 22 14:55:59 2011 -0800
Merge "Open dexdump files in binary mode."
commit
b4719eda048c4dc4a4b6e5280c7a2b8299051078
Author: Raphael Moll <ralf@android.com>
Date: Wed Feb 16 13:39:27 2011 -0800
Open dexdump files in binary mode.
Requires change Ia5c0a59e from system/core
(which defines O_BINARY globally.)
commit
a62c84f62a27a08d6bef6da0b96913d616dd659f
Author: Mattias Petersson <mattias.petersson@sonyericsson.com>
Date: Tue Dec 21 09:28:04 2010 +0100
Fix for a crash when GC weak references.
When a weak reference had been cleared there was a small risk that
the VM crashed when the cleared reference was garbage collected.
This is an example of code that can cause the problem:
Integer referent = new Integer(10);
wref = new WeakReference<Integer>(referent);
wref.clear(); //set the referent to null
When a garbage collection starts, all objects are scanned, looking
for objects that can be collected. During this phase, a list of
weak references is created. A check is performed to ensure that
only references with a non-null referent are added to this list.
In most cases, for the example above, the referent will be null
at this point, and it will never be added to the list. But if
the timing is extremely bad it looks like it is possible for the
reference to end up on the list before the referent has been set
to null, and the referent is set to null a little while later.
This means that we now have a reference on the list with a null
referent.
A bit later in the garbage collection flow, the list of weak
s is traversed in order to clear the references that
can be collected. Here we got the crash because the code asserted
that the referent of the references in the list should be
non-null. And in some rare cases it actually was null. The fix
is simply to remove the assert.
commit
ef4b0613d6952770aefac07d503955eb7b962d2b
Merge:
464104b e9503ef
Author: Andy McFadden <fadden@android.com>
Date: Mon Nov 8 19:38:19 2010 -0800
am
e9503ef8: am
886130bc: (-s ours) Two patches.
* commit '
e9503ef8c460f4818062ecc80a9e0b4f8c6745b8':
Two patches.
Change-Id: I04c1c9204af8197a4352358d805af40f1312d2ea
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Mark Gordon [Fri, 20 May 2011 21:18:36 +0000 (17:18 -0400)]
Undecoded jobject leaking in through attachThread
Change-Id: I6b03227dc07d53862467395531b8dca07d2381ef
Carl Shapiro [Wed, 20 Apr 2011 14:46:59 +0000 (07:46 -0700)]
am
e4195e1c: Fix a type error in the allocation of non-moving arrays.
* commit '
e4195e1c91f4ea3c6192070fd3c9b9e4e6d429ae':
Fix a type error in the allocation of non-moving arrays.
Carl Shapiro [Mon, 18 Apr 2011 22:08:21 +0000 (15:08 -0700)]
Fix a type error in the allocation of non-moving arrays.
Originally, non-moving arrays were allocated with dvmAllocObjectArray.
However, dvmAllocObjectArray does not respect the width of the user
supplied element class and substitutes a hard coded value of 4 bytes.
This change replaces dvmAllocObjectArray with dvmAllocArrayByClass.
dvmAllocArrayByClass consults the element class for its width when
computing the storage size for the array being allocated.
Bug:
4309030
Sriram Raman [Tue, 19 Apr 2011 21:34:29 +0000 (14:34 -0700)]
am
a0739ea3: am
af242824: Revert "Fix a type error in the allocation of non-moving arrays." per Ryan\'s request
* commit '
a0739ea3040b578a53de817688ab5e9f17c0ce72':
Revert "Fix a type error in the allocation of non-moving arrays." per Ryan's request
Sriram Raman [Tue, 19 Apr 2011 21:29:47 +0000 (14:29 -0700)]
am
af242824: Revert "Fix a type error in the allocation of non-moving arrays." per Ryan\'s request
* commit '
af242824dcedbbe39c92b49d148e7ff50267e47f':
Revert "Fix a type error in the allocation of non-moving arrays." per Ryan's request
Sriram Raman [Tue, 19 Apr 2011 21:17:27 +0000 (17:17 -0400)]
Revert "Fix a type error in the allocation of non-moving arrays." per Ryan's request
This reverts commit
bdd06aadab6214d2378b7d5078f92bfb14e7e3dc.
Change-Id: Ifbb4bd7941fe4f2e9d02ca2b7d77186edae4dd55
Carl Shapiro [Tue, 19 Apr 2011 19:07:46 +0000 (12:07 -0700)]
am
bb8c2f35: am
bdd06aad: Fix a type error in the allocation of non-moving arrays.
* commit '
bb8c2f35e2155b6eec92e692666df8c67810ded6':
Fix a type error in the allocation of non-moving arrays.
Carl Shapiro [Tue, 19 Apr 2011 18:43:46 +0000 (11:43 -0700)]
am
bdd06aad: Fix a type error in the allocation of non-moving arrays.
* commit '
bdd06aadab6214d2378b7d5078f92bfb14e7e3dc':
Fix a type error in the allocation of non-moving arrays.
Carl Shapiro [Mon, 18 Apr 2011 22:08:21 +0000 (15:08 -0700)]
Fix a type error in the allocation of non-moving arrays.
Originally, non-moving arrays were allocated with dvmAllocObjectArray.
However, dvmAllocObjectArray does not respect the width of the user
supplied element class and substitutes a hard coded value of 4 bytes.
This change replaces dvmAllocObjectArray with dvmAllocArrayByClass.
dvmAllocArrayByClass consults the element class for its width when
computing the storage size for the array being allocated.
Bug:
4309030
Change-Id: I9cfe1b62ea61f03e46f44ad2be0d1cce1bef7cdd
Dan Bornstein [Thu, 24 Mar 2011 00:56:38 +0000 (17:56 -0700)]
am
b1101e84: am
486ac3c0: Removing inaccurate and unmaintained docs.
* commit '
b1101e847312da8ee98a26e25058f93ba381f1ac':
Removing inaccurate and unmaintained docs.
Dan Bornstein [Thu, 24 Mar 2011 00:53:04 +0000 (17:53 -0700)]
am
486ac3c0: Removing inaccurate and unmaintained docs.
* commit '
486ac3c0a90b05be5af4b82801ef325e83241057':
Removing inaccurate and unmaintained docs.
Dan Bornstein [Wed, 23 Mar 2011 22:26:58 +0000 (15:26 -0700)]
Removing inaccurate and unmaintained docs.
Change-Id: Ifef37063e844e4eb9ccc8111a1f1263fe26bd517
buzbee [Tue, 8 Mar 2011 15:17:52 +0000 (07:17 -0800)]
resolved conflicts for merge of
d063e255 to honeycomb-plus-aosp
Change-Id: I3c4d6895209ccba61ec3a14c24274939a7fc65e8
David Turner [Sat, 5 Mar 2011 09:08:13 +0000 (01:08 -0800)]
Merge "Update to allow x86-atom build for FI on Gingerbread"
Raphael [Wed, 2 Mar 2011 22:37:37 +0000 (14:37 -0800)]
Fix build.
The build server is stuck waiting for the O_BINARY change
from system/core. This will unblock it.
Change-Id: Iedd5f7a6cb140ac07b5084948a69eb5d94e2070f
Romain Guy [Wed, 2 Mar 2011 20:53:48 +0000 (12:53 -0800)]
am
7027ab61: am
88041260: am
dd19f5b9: Merge "Fix for a crash when GC weak references."
* commit '
7027ab6198f9d27b376e467971d55f14b160e40f':
Fix for a crash when GC weak references.
Raphael Moll [Wed, 2 Mar 2011 20:53:46 +0000 (12:53 -0800)]
am
0c91e9d5: am
98e0347a: am
2b3d7e8e: Merge "Open dexdump files in binary mode."
* commit '
0c91e9d5a4078bc1c6da2c225bde5fb703fd9d58':
Open dexdump files in binary mode.
Romain Guy [Tue, 1 Mar 2011 21:50:40 +0000 (13:50 -0800)]
am
88041260: am
dd19f5b9: Merge "Fix for a crash when GC weak references."
* commit '
88041260251335cc497db4708f0057d5367da8b4':
Fix for a crash when GC weak references.
Raphael Moll [Tue, 1 Mar 2011 21:50:37 +0000 (13:50 -0800)]
am
98e0347a: am
2b3d7e8e: Merge "Open dexdump files in binary mode."
* commit '
98e0347a7f016764403384567267db6e9dcf8edf':
Open dexdump files in binary mode.
Romain Guy [Tue, 1 Mar 2011 20:39:47 +0000 (12:39 -0800)]
am
dd19f5b9: Merge "Fix for a crash when GC weak references."
* commit '
dd19f5b91a1032e60871febb143850fd81000c5a':
Fix for a crash when GC weak references.
Raphael Moll [Tue, 1 Mar 2011 20:39:44 +0000 (12:39 -0800)]
am
2b3d7e8e: Merge "Open dexdump files in binary mode."
* commit '
2b3d7e8eccd7cbf64b2ac41c05073a9191d0d3b3':
Open dexdump files in binary mode.
Xavier Ducrohet [Tue, 1 Mar 2011 02:16:32 +0000 (18:16 -0800)]
Add notice file for dx.jar and dexdump
Change-Id: I0094d382e866b8767383516abd367c98712da594
Romain Guy [Thu, 24 Feb 2011 19:24:47 +0000 (11:24 -0800)]
Merge "Fix for a crash when GC weak references."
Dan Bornstein [Wed, 23 Feb 2011 23:30:24 +0000 (15:30 -0800)]
Add new comparator function.
This one compares a DexProto with a list of method parameter types,
and it is immediately useful in the new getMethod() reflection code,
to avoid doing a bunch of extra string manipulation.
While I was in the territory, I removed some comment redundancy.
Change-Id: I5049e2ac4606e44a65c3c426ac2f880a891c51f9
Jesse Wilson [Wed, 23 Feb 2011 21:32:57 +0000 (13:32 -0800)]
Merge "Optimize Class.getMethod() by loading only one method."
Jesse Wilson [Wed, 23 Feb 2011 04:20:36 +0000 (20:20 -0800)]
Optimize Class.getMethod() by loading only one method.
Change-Id: Ia2cd776c0a14914264e8d94e978d55854ed75623
http://b/
3431686
Raphael Moll [Tue, 22 Feb 2011 22:55:59 +0000 (14:55 -0800)]
Merge "Open dexdump files in binary mode."
Andy McFadden [Tue, 22 Feb 2011 22:09:19 +0000 (14:09 -0800)]
Bump Dalvik version.
Minor increase to differentiate HC MR1 from HC.
Change-Id: I2ccd57d4952c19c2df2fe948ce60c476819450d4
Johnnie Birch [Fri, 18 Feb 2011 18:06:23 +0000 (10:06 -0800)]
Update to allow x86-atom build for FI on Gingerbread
Also handles most TODO.txt items and contains some rewriting of the dispatch code.
Also adds a newline to the end of files that did not previously end with a newline.
Change-Id: I0cf3e77dc7bbf5ed7ec8538ef4d7d8740e296640
Ying Wang [Sat, 19 Feb 2011 00:56:41 +0000 (16:56 -0800)]
Fix prelink for libdvm.
Change-Id: If91f46f80c1b1947683720e8187cecb0f7077b94
Bug:
3470019
Raphael Moll [Wed, 16 Feb 2011 21:39:27 +0000 (13:39 -0800)]
Open dexdump files in binary mode.
Requires change Ia5c0a59e from system/core
(which defines O_BINARY globally.)
Change-Id: If814608ee9662190a7cf80aae2ad2451d88364ae
Kenny Root [Wed, 16 Feb 2011 18:15:52 +0000 (10:15 -0800)]
Clean up use of HAVE_ANDROID_OS
HAVE_ANDROID_OS was defined as "1" for targets, but never defined as "0"
for non-targets. Changing them to #ifdef should be safe and matches all
the other uses of HAVE_ANDROID_OS throughout the system.
Change-Id: I077aee39b08ce82327a571d9aca0cae422a0ebb5
Andy McFadden [Mon, 14 Feb 2011 22:04:42 +0000 (14:04 -0800)]
Fix "all stubs" interpreter
The "all stubs" interpreter is the recommended starting point for
anyone creating a "fast" interpreter on a new CPU. This cleans
up some minor bit rot in the code and documentation.
Bug
3452689
Change-Id: I6bc3b0b5da11955d842d5fc5f16cb1a2209d4a89
Andy McFadden [Wed, 9 Feb 2011 16:10:49 +0000 (08:10 -0800)]
Merge "Make Release(JNI_COMMIT) faster"
Andy McFadden [Wed, 9 Feb 2011 00:24:34 +0000 (16:24 -0800)]
Make Release(JNI_COMMIT) faster
The Release<primitive>ArrayElements and ReleasePrimitiveArrayCritical
calls take a "mode" argument. If you pass in JNI_COMMIT, the storage
isn't actually released; instead, the buffer contents are flushed to
the backing storage. If the VM has handed you a pointer to the raw
data rather than a copy, the call is a no-op.
In its present incarnation, it's a no-op that changes the thread state,
adding overhead and the possibility of suspension. This change moves
the test for JNI_COMMIT outside the enter/exit macros.
Bug
3430203
Change-Id: I8426647ee02b2336c5c90146028fc207cfbacc3a
Andy McFadden [Wed, 9 Feb 2011 00:12:33 +0000 (16:12 -0800)]
Remove JNI_FORCE_C
This hasn't been useful in a really long time.
Change-Id: Ieea01f5d051bc8fc671f7414af3bed626ece75f1
Andy McFadden [Wed, 9 Feb 2011 00:03:05 +0000 (16:03 -0800)]
Merge "Added JNI hack to support JNI hack"
Andy McFadden [Tue, 8 Feb 2011 20:07:32 +0000 (12:07 -0800)]
Added JNI hack to support JNI hack
Some of our graphics code wants to get a pointer, release it, and then
continue to use it. The "forcecopy" mode of CheckJNI was designed
to find any code that does this. It succeeded.
To support the behavior, we provide a JNI helper function that does
the dirty work. It passes a magic value into the Get and Release calls
that causes "forcecopy" to skip the copy. When forcecopy is not
enabled, the values are simply ignored.
To avoid any possibility of the function getting published in the NDK,
the function is not described in JNIHelp.h.
Bug
3409356
Change-Id: Ibd20d12ba6d3d3236ebf5760f7ccaa8c557e3774
Kenny Root [Wed, 2 Feb 2011 23:07:00 +0000 (15:07 -0800)]
Free some strings in error paths
Change-Id: I54629ca65c30960f930ce6886e0915e360e20237
Andy McFadden [Mon, 7 Feb 2011 23:49:13 +0000 (15:49 -0800)]
Avoid double-free on error.
In certain circumstances on a -user build we could end up trying to
free a buffer twice.
Bug
3431477
Change-Id: I1cce1da0e32aabc85d5c5c69346224c6db49b8ee
Andy McFadden [Thu, 3 Feb 2011 00:55:41 +0000 (16:55 -0800)]
Ensure word atomicity in System.arraycopy
The VM needs to ensure that updates to 16-bit and 32-bit fields
and array elements happen atomically. System.arraycopy was calling
memmmove(), which in bionic happens to copy a byte at a time.
The new plan is to have bionic provide a platform-optimized memmove
variant that makes guarantees about word sizes. If it is not present
(either because it hasn't been written for the current platform,
or we're not linking against bionic), we will use a trivial copy loop.
We assume that the memmove-by-word implementation does whatever
it needs to for best performance. For example, if the function
determines that memcpy() is word-safe and will be faster, it can
call that. The VM no longer makes assumptions about the internal
workings of libc functions.
I also rearranged the code to avoid making indirect calls, reading
function addresses from memory, and using integer multiplication
instructions when a simple shift will do. (gcc now generates the
whole thing as one function.)
Also, added some primitive array copy tests to 011-array-copy.
Bug
3398352
Change-Id: I4677ee1c87998697a93e61f39a48b3f391e8e11b
Carl Shapiro [Wed, 2 Feb 2011 21:22:53 +0000 (13:22 -0800)]
am
168ae921: am
e7bf56c5: Use the global maximum to compute the size of a new mspace.
* commit '
168ae921fb68f2af7fbb62619232ec27bb741bea':
Use the global maximum to compute the size of a new mspace.
Carl Shapiro [Wed, 2 Feb 2011 21:18:48 +0000 (13:18 -0800)]
am
e7bf56c5: Use the global maximum to compute the size of a new mspace.
* commit '
e7bf56c584b8b2c3d60f79a27a4a2e9a6b1e2f22':
Use the global maximum to compute the size of a new mspace.
Carl Shapiro [Wed, 2 Feb 2011 04:19:04 +0000 (20:19 -0800)]
Use the global maximum to compute the size of a new mspace.
The global maximum was used for the initial specificaion but a local
maximum was used for post-Zygote mspace creations. This prevented a
clearing of the growth limit from having the intended effect.
Bug:
3414804
Change-Id: I47e0c1510f2212849e3b738c5578bbd7b1aff27d
Andy McFadden [Tue, 1 Feb 2011 22:02:59 +0000 (14:02 -0800)]
Update doc with actual version number.
Honeycomb is 3.0.
Change-Id: Ic7f15a9e2345344acdc787db153f8b8c559fe15f
The Android Open Source Project [Sun, 30 Jan 2011 20:53:55 +0000 (12:53 -0800)]
am
d820da20: Reconcile gingerbread-plus-aosp and honeycomb
* commit '
d820da20e28c0468324125a8a2bf75c3c4c01c27':
The Android Open Source Project [Sun, 30 Jan 2011 20:39:54 +0000 (12:39 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: Ic8c04a257aaf0ecf5348d176def5bedc6c640ee0
The Android Open Source Project [Sun, 30 Jan 2011 20:39:54 +0000 (12:39 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I03cce63a718a19c27445efd2c48a7886f22f7ed1
Dan Bornstein [Sat, 29 Jan 2011 18:51:59 +0000 (10:51 -0800)]
am
81058aaf: (-s ours) Use bcopy() to move object refs around within an array. DO NOT MERGE.
* commit '
81058aaf92c188cc20273edd0275329fc304aca2':
Use bcopy() to move object refs around within an array. DO NOT MERGE.
Dan Bornstein [Sat, 29 Jan 2011 16:47:06 +0000 (08:47 -0800)]
am
b46125f2: (-s ours) am
08e54499: (-s ours) am
81058aaf: Use bcopy() to move object refs around within an array. DO NOT MERGE.
* commit '
b46125f27e83da6b9844a502b11ffff48c59f729':
Use bcopy() to move object refs around within an array. DO NOT MERGE.
Dan Bornstein [Sat, 29 Jan 2011 16:44:07 +0000 (08:44 -0800)]
am
08e54499: (-s ours) am
81058aaf: Use bcopy() to move object refs around within an array. DO NOT MERGE.
* commit '
08e5449920e616cab1895eda309c20e109e5752e':
Use bcopy() to move object refs around within an array. DO NOT MERGE.
Dan Bornstein [Thu, 27 Jan 2011 23:28:25 +0000 (15:28 -0800)]
am
81058aaf: Use bcopy() to move object refs around within an array. DO NOT MERGE.
* commit '
81058aaf92c188cc20273edd0275329fc304aca2':
Use bcopy() to move object refs around within an array. DO NOT MERGE.
Dan Bornstein [Thu, 27 Jan 2011 23:10:56 +0000 (15:10 -0800)]
am
99d4ea09: am
3207edfa: Use bcopy() to move object refs around within an array.
* commit '
99d4ea09cb64768d0e1f2149f7e3af7d37172be7':
Use bcopy() to move object refs around within an array.
Dan Bornstein [Thu, 27 Jan 2011 22:59:38 +0000 (14:59 -0800)]
am
3207edfa: Use bcopy() to move object refs around within an array.
* commit '
3207edfa2de55be1207ff3e10409e7b291e33ab1':
Use bcopy() to move object refs around within an array.
Dan Bornstein [Thu, 27 Jan 2011 19:38:37 +0000 (11:38 -0800)]
Use bcopy() to move object refs around within an array. DO NOT MERGE.
bcopy() guarantees that pointer-size words are stored atomically, and
so this prevents the gc from seeing a pointer in mid-change.
Bug:
3399673
Change-Id: Ic7d795e5d397548e9d6d8c11a585d86838cf8a44
Dan Bornstein [Thu, 27 Jan 2011 19:38:37 +0000 (11:38 -0800)]
Use bcopy() to move object refs around within an array.
bcopy() guarantees that pointer-size words are stored atomically, and
so this prevents the gc from seeing a pointer in mid-change.
Change-Id: I7ba426c5b54a3459504211d88cca1b07383168bb
Dan Bornstein [Thu, 27 Jan 2011 05:55:38 +0000 (21:55 -0800)]
am
6ad1992b: (-s ours) am
70b130f5: (-s ours) Clean up/out some comments. DO NOT MERGE.
* commit '
6ad1992b311937963d44be68f3ec0255a87d82b8':
Clean up/out some comments. DO NOT MERGE.
Dan Bornstein [Thu, 27 Jan 2011 05:48:09 +0000 (21:48 -0800)]
am
f741b8e1: am
80a30431: (-s ours) Remove some pointless tests.
* commit '
f741b8e112834cb3c140ca81890dc41126649dee':
Remove some pointless tests.
Carl Shapiro [Thu, 27 Jan 2011 05:35:57 +0000 (21:35 -0800)]
am
76675cb5: am
9b6881c2: Fix accidental transposition of partial and concurrent values.
* commit '
76675cb52e5d5ddeaefd81ec83841e0c503d3411':
Fix accidental transposition of partial and concurrent values.
Carl Shapiro [Thu, 27 Jan 2011 05:16:31 +0000 (21:16 -0800)]
am
9b6881c2: Fix accidental transposition of partial and concurrent values.
* commit '
9b6881c26d58a46e6478294d83554fb9e3a85625':
Fix accidental transposition of partial and concurrent values.
Carl Shapiro [Thu, 27 Jan 2011 02:41:03 +0000 (18:41 -0800)]
Fix accidental transposition of partial and concurrent values.
In the event of an allocation failure a full, concurrent collection was
initiated instead of a partial, non-concurrent collection. This change
assigns the correct boolean values to that settings.
These values should be made enums to ensure this does not happen again.
Bug:
3379352
Change-Id: I9336e8f832cf02e4a74745cd475914a0c312ea4e
Carl Shapiro [Thu, 27 Jan 2011 03:13:02 +0000 (19:13 -0800)]
am
a4c8f3fa: am
d6b23e5c: Merge "Package garbage collection policy parameters into a single structure." into honeycomb
* commit '
a4c8f3fae538b56a003e0546b8c001d68873a650':
Package garbage collection policy parameters into a single structure.
Carl Shapiro [Thu, 27 Jan 2011 02:06:35 +0000 (18:06 -0800)]
am
d6b23e5c: Merge "Package garbage collection policy parameters into a single structure." into honeycomb
* commit '
d6b23e5ca90e011b6ede0d3592922616df3e33ec':
Package garbage collection policy parameters into a single structure.
Carl Shapiro [Thu, 27 Jan 2011 02:02:17 +0000 (18:02 -0800)]
Merge "Package garbage collection policy parameters into a single structure." into honeycomb
Carl Shapiro [Thu, 27 Jan 2011 01:25:27 +0000 (17:25 -0800)]
Package garbage collection policy parameters into a single structure.
The garbage collection policy had been determined informally. This change
defines the garbage collection behavior in a centralized location making it
clear how the system will behave when requesting a garbage collection in one
of the four common situations. This change is required to allow us to change
the policy for an explicit garbage collection.
In addition, this change hoists out the thread priority toggle from the
main garbage collector routine into two simple subroutines making this
it much easier to read and spot behavior differences.
Bug:
3379352
Change-Id: If0d7d9ef337819598fb6e268f7a127f2bae23580
Carl Shapiro [Wed, 26 Jan 2011 21:03:44 +0000 (13:03 -0800)]
am
4d7dd569: Handle the case of referent clearing during tracing.
* commit '
4d7dd56902150ab8db4c20a191bad112928839e9':
Handle the case of referent clearing during tracing.
Carl Shapiro [Wed, 26 Jan 2011 21:03:40 +0000 (13:03 -0800)]
am
6159ef45: (-s ours) Parameterize instance counting to include subclasses.
* commit '
6159ef4520073ae8e7ce7b7d1f7648b161a33302':
Parameterize instance counting to include subclasses.
Andy McFadden [Tue, 25 Jan 2011 20:41:36 +0000 (12:41 -0800)]
am
ee875bb3: am
80e8d7f9: Increase default stack size
* commit '
ee875bb3c019e278500c000cdd99b34e629e42eb':
Increase default stack size
Andy McFadden [Tue, 25 Jan 2011 20:38:42 +0000 (12:38 -0800)]
am
80e8d7f9: Increase default stack size
* commit '
80e8d7f9ca9b49437bec6224162d7bb7f42392da':
Increase default stack size
Andy McFadden [Tue, 25 Jan 2011 20:26:41 +0000 (12:26 -0800)]
Increase default stack size
This increases the default stack size from 12KB to 16KB.
Bug
3388513
Change-Id: I7f7c3f75b749ca2145a96434e89e6500f79973e4
Carl Shapiro [Mon, 24 Jan 2011 21:32:44 +0000 (13:32 -0800)]
am
704c48da: am
a4313feb: Remove unprotected reads in the instance counting routines.
* commit '
704c48daff6bd4f1e824eccb7171c08d32b86ea1':
Remove unprotected reads in the instance counting routines.
Carl Shapiro [Mon, 24 Jan 2011 20:38:56 +0000 (12:38 -0800)]
am
a4313feb: Remove unprotected reads in the instance counting routines.
* commit '
a4313feb23dd454905a3297bdc9ba745e6066a16':
Remove unprotected reads in the instance counting routines.
Carl Shapiro [Mon, 24 Jan 2011 20:31:09 +0000 (12:31 -0800)]
Remove unprotected reads in the instance counting routines.
In the past, the instance counters would read the live bitmap, acquire
the heap lock, and then scan the live bitmap. Reading the live bitmap
ahead of acquiring the heap lock gives the holder of the heap lock an
opportunity to invalidate the copy of the live bitmap read by the
instance counter routine. For example, the garbage collector could
swap the mark and live bitmaps before releasing the heap lock. This
change makes the read of the live bitmap safe by moving it into the
critical section.
Bug:
3271510
Change-Id: Ic02171e9ec3b4d24e83773199f00a18a75707427
Carl Shapiro [Mon, 24 Jan 2011 01:00:45 +0000 (17:00 -0800)]
am
e1a5956b: am
0eac12e0: Merge "Replace collect with clear for the SoftReference policy." into honeycomb
* commit '
e1a5956bd9d3d7b89a09b554804c967a30c13932':
Replace collect with clear for the SoftReference policy.
Carl Shapiro [Mon, 24 Jan 2011 01:00:43 +0000 (17:00 -0800)]
am
e1034238: am
b387ce8a: Remove references to android_atomic_swap.
* commit '
e10342385c9845cd82ac73c3b0d9b26c4a3dcd15':
Remove references to android_atomic_swap.
Carl Shapiro [Mon, 24 Jan 2011 00:07:52 +0000 (16:07 -0800)]
am
0eac12e0: Merge "Replace collect with clear for the SoftReference policy." into honeycomb
* commit '
0eac12e0b26c3cdfa3d16e73cc8d7ebd889c846b':
Replace collect with clear for the SoftReference policy.
Carl Shapiro [Mon, 24 Jan 2011 00:05:57 +0000 (16:05 -0800)]
Merge "Replace collect with clear for the SoftReference policy." into honeycomb