OSDN Git Service
Barry Hayes [Tue, 9 Mar 2010 16:33:37 +0000 (08:33 -0800)]
Merge "Previous changes put unlinkedJavaLangClass on the heap. It makes HprofReader unhappy, because it has a NULL class. So now we won't dump objects with a NULL class. This also suppresses dumping of uninitialized objects." into dalvik-dev
Elliott Hughes [Tue, 9 Mar 2010 03:10:58 +0000 (19:10 -0800)]
Fix a comment.
Change-Id: Iba79dbc04876d5c7cb93aba56541e7dda3c6f887
Elliott Hughes [Tue, 9 Mar 2010 03:01:37 +0000 (19:01 -0800)]
Merge "Remove libcore-disabled." into dalvik-dev
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:12:40 +0000 (18:12 -0800)]
am
3521d8c2: Add an empty CleanSpec.mk
Merge commit '
3521d8c26899611b385c685fa903ae2c8f3e0d92' into dalvik-dev
* commit '
3521d8c26899611b385c685fa903ae2c8f3e0d92':
Add an empty CleanSpec.mk
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:06 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk
Change-Id: I43d2404e71aa2bc0d3d6aada35d613bb484129e7
Elliott Hughes [Tue, 9 Mar 2010 01:53:31 +0000 (17:53 -0800)]
Fix build (missing #include in sim build).
Change-Id: I8691db582f2d2d926da308a813d9f1864bedcd6d
Elliott Hughes [Tue, 9 Mar 2010 01:52:06 +0000 (17:52 -0800)]
Remove libcore-disabled.
It's in revision control if we ever need it, and we won't.
Change-Id: I1f6f15b83047c266400ea5d7ab2f8fc51bf9e2b7
Elliott Hughes [Tue, 9 Mar 2010 01:38:17 +0000 (17:38 -0800)]
Merge "Implement the Java 6 NetworkInterface/InterfaceAddress functionality." into dalvik-dev
Elliott Hughes [Thu, 4 Mar 2010 23:12:37 +0000 (15:12 -0800)]
Implement the Java 6 NetworkInterface/InterfaceAddress functionality.
The Java bits are based on harmony's code (though only the bit that pulls
out the sub-interfaces is copied verbatim), but the native side is new
code, continuing our previous plan of (a) doing the least possible work
on the native side and (b) using the BSD getifaddrs(3) interface as our
portability layer.
This patch also updates our NetworkInterfaceTest to be the latest code
from harmony's java6 branch.
We pass all the harmony and jtreg tests, and visual inspection shows that
the untested (and hard to test) bits -- such as prefix length and hardware
address -- are correct.
Jesse Wilson [Tue, 9 Mar 2010 01:00:19 +0000 (17:00 -0800)]
am
631bbbff: Merge "Adding support for getUserData() and setUserData() to DOM nodes."
Merge commit '
631bbbff684e9fe41a5a08ffa3e13fa3bed01212' into dalvik-dev
* commit '
631bbbff684e9fe41a5a08ffa3e13fa3bed01212':
Adding support for getUserData() and setUserData() to DOM nodes.
Jesse Wilson [Tue, 9 Mar 2010 00:55:58 +0000 (16:55 -0800)]
Merge "Adding support for getUserData() and setUserData() to DOM nodes."
Jesse Wilson [Tue, 9 Mar 2010 00:19:39 +0000 (16:19 -0800)]
Adding support for getUserData() and setUserData() to DOM nodes.
Also making sure both Document and DocumentType get assigned
a Document value when possible; this is necessary to store the
user data objects.
Barry Hayes [Mon, 8 Mar 2010 21:57:34 +0000 (13:57 -0800)]
Previous changes put unlinkedJavaLangClass on the heap. It makes
HprofReader unhappy, because it has a NULL class. So now we won't
dump objects with a NULL class. This also suppresses dumping of
uninitialized objects.
Change-Id: Ie6713d4e665ab6e518f13338367ee874903e2862
Elliott Hughes [Mon, 8 Mar 2010 21:59:43 +0000 (13:59 -0800)]
Merge "Support IPv4-compatible IPv6 addresses on IPv4 sockets." into dalvik-dev
Bill Buzbee [Mon, 8 Mar 2010 20:50:30 +0000 (12:50 -0800)]
am
2fc03c33: Jit: fix for
2483131 - VM daemon thread shutdown with JIT enabled
Merge commit '
2fc03c3399cc33dc1c7d669e8970a87144ec7b97' into dalvik-dev
* commit '
2fc03c3399cc33dc1c7d669e8970a87144ec7b97':
Jit: fix for
2483131 - VM daemon thread shutdown with JIT enabled
Bill Buzbee [Mon, 8 Mar 2010 19:30:19 +0000 (11:30 -0800)]
Jit: fix for
2483131 - VM daemon thread shutdown with JIT enabled
As part of shutdown, the Jit needs to unchain all translations so that
they can respond to suspend requests. This change introduces a
dvmJitUnchainAll() into shutdown, and also removes some previous
housecleaning that freed our key tables. We can't actually free those
because suspended threads in the process of shutting down may hold
references.
Change-Id: I7aad332e7195a94970c25a25b2d9fda5607bec08
Elliott Hughes [Sat, 6 Mar 2010 04:37:25 +0000 (20:37 -0800)]
Support IPv4-compatible IPv6 addresses on IPv4 sockets.
Bug:
2194581
Change-Id: I825835280e9d7d88a4db3fa817dfb4234fc19039
Bill Buzbee [Mon, 8 Mar 2010 14:33:51 +0000 (06:33 -0800)]
am
fc519dc8: Jit: Make most Jit compile failures non-fatal; just abort offending translation
Merge commit '
fc519dc8f4444f6d93806ec15ce7445b322070fd' into dalvik-dev
* commit '
fc519dc8f4444f6d93806ec15ce7445b322070fd':
Jit: Make most Jit compile failures non-fatal; just abort offending translation
Bill Buzbee [Sun, 7 Mar 2010 07:30:57 +0000 (23:30 -0800)]
Jit: Make most Jit compile failures non-fatal; just abort offending translation
Issue
2175597 Jit compile failures should abort translation, but not the VM
Added new dvmCompileAbort() to replace uses of dvmAbort() when something goes
wrong during the compliation of a trace. In that case, we'll abort the translation
and set it's head to the interpret-only "translation".
Carl Shapiro [Sat, 6 Mar 2010 01:39:05 +0000 (17:39 -0800)]
am
164d1279: Merge "Jit: Fix for issue
2487769, Simplify in-line thin lock release"
Merge commit '
164d1279b67ec13061e473cb453b1ff24189e0e0' into dalvik-dev
* commit '
164d1279b67ec13061e473cb453b1ff24189e0e0':
Jit: Fix for issue
2487769, Simplify in-line thin lock release
Carl Shapiro [Sat, 6 Mar 2010 01:34:05 +0000 (17:34 -0800)]
Merge "Jit: Fix for issue
2487769, Simplify in-line thin lock release"
Elliott Hughes [Sat, 6 Mar 2010 01:09:59 +0000 (17:09 -0800)]
Use a manually-synchronized HashMap instead of ConcurrentHashMap in LocaleData.
ConcurrentHashMap is our slowest choice at the moment:
ConcurrentHashMapGet 782 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
HashMapGet 272 XXXXXXXXXX|||||||||||||||
HashMapGet_Synchronized 317 XXXXXXXXXXXX|||||||||||||
HashtableGet 325 XXXXXXXXXXXX||||||||||||||
LinkedHashMapGet 280 XXXXXXXXXX|||||||||||||||
The cost of some commonly-created temporary objects (such as
DateFormatSymbols) is dominated by the lookup of the locale data. This patch
takes "new DateFormatSymbols" from 3us to 2.3us on passion/froyo (a 23% drop).
Bug:
2492505
Ben Cheng [Fri, 5 Mar 2010 23:41:24 +0000 (15:41 -0800)]
am
f8069e84: Merge "Collect more JIT stats in the assert build."
Merge commit '
f8069e844054d29f320a9ece29fc638a884bbf69' into dalvik-dev
* commit '
f8069e844054d29f320a9ece29fc638a884bbf69':
Collect more JIT stats in the assert build.
Ben Cheng [Fri, 5 Mar 2010 23:37:30 +0000 (15:37 -0800)]
Merge "Collect more JIT stats in the assert build."
Ben Cheng [Fri, 5 Mar 2010 23:27:21 +0000 (15:27 -0800)]
Collect more JIT stats in the assert build.
New stuff includes breakdown of callsite types (ie monomorphic vs polymorphic
vs monoporphic resolved to native), total time spent in JIT'ing, and average
JIT time per compilation.
Example output:
D/dalvikvm( 840): 4042 compilations using 1976 + 329108 bytes
D/dalvikvm( 840): Compiler arena uses 10 blocks (8100 bytes each)
D/dalvikvm( 840): Compiler work queue length is 0/36
D/dalvikvm( 840): size if 8192, entries used is 4137
D/dalvikvm( 840): JIT: 4137 traces, 8192 slots, 1099 chains, 40 thresh, Non-blocking
D/dalvikvm( 840): JIT: Lookups:
1128780 hits, 168564 misses; 179520 normal, 6 punt
D/dalvikvm( 840): JIT: noChainExit: 528464 IC miss, 194708 interp callsite, 0 switch overflow
D/dalvikvm( 840): JIT: Invoke: 507 mono, 988 poly, 72 native, 1038 return
D/dalvikvm( 840): JIT: Total compilation time: 2342 ms
D/dalvikvm( 840): JIT: Avg unit compilation time: 579 us
D/dalvikvm( 840): JIT: 3357 Translation chains, 97 interp stubs
D/dalvikvm( 840): dalvik.vm.jit.op = 0-2,4-5,7-8,a-c,e-16,19-1a,1c-23,26,28-29,2b-2f,31-3d,44-4b,4d-51,60,62-63,68-69,70-72,76-78,7b,81-82,84,87,89,8d-93,95-98,a1,a3,a6,a8-a9,b0-b3,b5-b6,bb-bf,c6-c8,d0,d2-d6,d8,da-e2,ee-f0,f2-fb,
D/dalvikvm( 840): Code size stats: 50666/105126 (compiled/total Dalvik), 329108 (native)
Costin Manolache [Fri, 5 Mar 2010 23:02:33 +0000 (15:02 -0800)]
am
1a29c735: Merge "Fix server side SSLEngine ServerKeyExchange signature."
Merge commit '
1a29c735752f4082c8e32347f4a6b10c4fdeb1f5' into dalvik-dev
* commit '
1a29c735752f4082c8e32347f4a6b10c4fdeb1f5':
Fix server side SSLEngine ServerKeyExchange signature.
Costin Manolache [Fri, 5 Mar 2010 22:56:05 +0000 (14:56 -0800)]
Merge "Fix server side SSLEngine ServerKeyExchange signature."
Andy McFadden [Fri, 5 Mar 2010 20:59:25 +0000 (12:59 -0800)]
Merge "Add instructions for volatile wide fields." into dalvik-dev
Andy McFadden [Fri, 5 Mar 2010 15:24:27 +0000 (07:24 -0800)]
Add instructions for volatile wide fields.
This adds four new instructions for accessing volatile wide fields (long
and double). The JLS requires that such accesses are atomic, but the
VM doesn't otherwise make guarantees about the atomicity of reads and
writes on 64-bit fields.
There are no behavioral changes. This just adds definitions for the new
instructions and a couple of tests. The current implementation is just
the non-volatile form of the instructions or a C stub, but since we're
not generating them it doesn't really matter yet.
Also:
- bumped Dalvik version to 1.3.0
- added a note to the x86-atom TODO list
For bug
1633591.
Barry Hayes [Fri, 5 Mar 2010 20:04:14 +0000 (12:04 -0800)]
Merge "Fix a broken assert and some broken comments about unlinkedJavaLangClass." into dalvik-dev
Bill Buzbee [Fri, 5 Mar 2010 18:56:37 +0000 (10:56 -0800)]
Jit: Fix for issue
2487769, Simplify in-line thin lock release
The Jit was using ldrex/strex to clear an owned thin lock in the
fast path. This was not necessary - an integer store works and is
much faster.
Jesse Wilson [Fri, 5 Mar 2010 18:48:21 +0000 (10:48 -0800)]
am
101cbfe4: Merge "Implementing the Java 7 APIs for DeflaterOutputStreams."
Merge commit '
101cbfe486ad1744f666e924f600dd1b8cdecea7' into dalvik-dev
* commit '
101cbfe486ad1744f666e924f600dd1b8cdecea7':
Implementing the Java 7 APIs for DeflaterOutputStreams.
Barry Hayes [Fri, 5 Mar 2010 17:51:12 +0000 (09:51 -0800)]
Fix a broken assert and some broken comments about unlinkedJavaLangClass.
Jesse Wilson [Fri, 5 Mar 2010 18:21:16 +0000 (10:21 -0800)]
Merge "Implementing the Java 7 APIs for DeflaterOutputStreams."
Jesse Wilson [Fri, 5 Mar 2010 01:18:44 +0000 (17:18 -0800)]
Implementing the Java 7 APIs for DeflaterOutputStreams.
See bug
1729487.
Costin Manolache [Tue, 2 Mar 2010 21:47:01 +0000 (13:47 -0800)]
Fix server side SSLEngine ServerKeyExchange signature.
Code using SSLEngine for non-blocking SSL can't talk with openssl as a client,
since the signature is computed on different content (and openssl checks it,
unlike java). The fix is to use strip the 0x00 prefix when signing - like
it is done when generating the message, refactored both to use a common
method. We also include the length in the signature, it was also missing.
Jesse Wilson [Thu, 4 Mar 2010 18:36:07 +0000 (10:36 -0800)]
Merge "Add messages to the ArrayStoreExceptions thrown by arraycopy()." into dalvik-dev
Elliott Hughes [Thu, 4 Mar 2010 16:09:13 +0000 (08:09 -0800)]
am
c9b3aeb6: Prevent java.text.Normalizer from getting a default constructor.
Merge commit '
c9b3aeb659ac420bdc3d3c550423ab1fec5fde4c' into dalvik-dev
* commit '
c9b3aeb659ac420bdc3d3c550423ab1fec5fde4c':
Prevent java.text.Normalizer from getting a default constructor.
Elliott Hughes [Thu, 4 Mar 2010 05:35:41 +0000 (21:35 -0800)]
Prevent java.text.Normalizer from getting a default constructor.
The dalvik continuous build's new jdiff run caught this.
Elliott Hughes [Thu, 4 Mar 2010 02:20:11 +0000 (18:20 -0800)]
am
042cc582: Merge "Don\'t call a method that can be overridden from File\'s constructors."
Merge commit '
042cc58283c6a16db56fd758481388eee0f78619' into dalvik-dev
* commit '
042cc58283c6a16db56fd758481388eee0f78619':
Don't call a method that can be overridden from File's constructors.
Elliott Hughes [Thu, 4 Mar 2010 02:14:40 +0000 (18:14 -0800)]
Merge "Don't call a method that can be overridden from File's constructors."
Andy McFadden [Thu, 4 Mar 2010 02:01:02 +0000 (18:01 -0800)]
am
21cb2bea: Merge "Update local copy of getSchedulerGroup."
Merge commit '
21cb2bead6020dfcb7c594638dddd36528b4ef41' into dalvik-dev
* commit '
21cb2bead6020dfcb7c594638dddd36528b4ef41':
Update local copy of getSchedulerGroup.
Andy McFadden [Thu, 4 Mar 2010 01:53:00 +0000 (17:53 -0800)]
Merge "Update local copy of getSchedulerGroup."
Elliott Hughes [Thu, 4 Mar 2010 01:39:14 +0000 (17:39 -0800)]
Don't call a method that can be overridden from File's constructors.
Bug:
2486943
Jesse Wilson [Wed, 3 Mar 2010 20:34:19 +0000 (12:34 -0800)]
Add messages to the ArrayStoreExceptions thrown by arraycopy().
See bug
2396302.
Andy McFadden [Wed, 3 Mar 2010 23:37:10 +0000 (15:37 -0800)]
Update local copy of getSchedulerGroup.
The getSchedulerGroup() in libcutils was updated, but for some reason we
have our own copy in the VM. This change brings it up to date so we
stop crashing every time something requests a virtual stack (e.g. with a
"kill -3 <pid>").
(The function is now an exact clone -- the previous version was slightly
modified.)
Bill Buzbee [Wed, 3 Mar 2010 23:35:49 +0000 (15:35 -0800)]
am
85a3fa26: Merge "Jit: Sapphire tuning - mostly scheduling."
Merge commit '
85a3fa260497657c62de2186841b243e177330eb' into dalvik-dev
* commit '
85a3fa260497657c62de2186841b243e177330eb':
Jit: Sapphire tuning - mostly scheduling.
Bill Buzbee [Wed, 3 Mar 2010 23:30:35 +0000 (15:30 -0800)]
Merge "Jit: Sapphire tuning - mostly scheduling."
Bill Buzbee [Wed, 3 Mar 2010 00:14:41 +0000 (16:14 -0800)]
Jit: Sapphire tuning - mostly scheduling.
Re-enabled load/store motion that had inadvertently been turned off for
non-armv7 targets. Tagged memory references with the kind of memory
they touch (Dalvik frame, literal pool, heap) to enable more aggressive
load hoisting. Eliminated some largely duplicate code in the target
specific files. Reworked temp register allocation code to allocate next
temp round-robin (to improve scheduling opportunities).
Overall, nice gain for Sapphire. Shows 5% to 15% on some benchmarks, and
measurable improvements for Passion.
Elliott Hughes [Wed, 3 Mar 2010 21:31:27 +0000 (13:31 -0800)]
am
b99b5cd0: am
b16b78db: am
275acdff: Copy Froyo\'s version of MulticastSocketTest to Eclair for CTS.
Merge commit '
b99b5cd0be8ab0d9791768c21ffd0d637b564df8' into dalvik-dev
* commit '
b99b5cd0be8ab0d9791768c21ffd0d637b564df8':
Copy Froyo's version of MulticastSocketTest to Eclair for CTS.
Elliott Hughes [Wed, 3 Mar 2010 21:23:46 +0000 (13:23 -0800)]
am
b16b78db: am
275acdff: Copy Froyo\'s version of MulticastSocketTest to Eclair for CTS.
Merge commit '
b16b78db118036d7df2cf5705baa18f34bd42eec'
* commit '
b16b78db118036d7df2cf5705baa18f34bd42eec':
Copy Froyo's version of MulticastSocketTest to Eclair for CTS.
Elliott Hughes [Wed, 3 Mar 2010 21:12:27 +0000 (13:12 -0800)]
am
275acdff: Copy Froyo\'s version of MulticastSocketTest to Eclair for CTS.
Merge commit '
275acdff64a58f407cec552e7027cb07414b48ef' into eclair-plus-aosp
* commit '
275acdff64a58f407cec552e7027cb07414b48ef':
Copy Froyo's version of MulticastSocketTest to Eclair for CTS.
Elliott Hughes [Wed, 3 Mar 2010 08:28:41 +0000 (00:28 -0800)]
Improve error checking and error reporting in java.util.Formatter.
This causes three new harmony failures, in tests specifically designed to
probe exception priorities (despite the fact that the RI explicitly doesn't
define exception priorities).
Comically, this same change actually fixes 24 jtreg tests that were failing
because of differences in exception priorities between harmony and the RI.
What I care about is that the new code is way easier to understand, shouldn't
waste as much space in our puny instruction caches, should be a more tempting
JIT target, and lets the actual formatting code assume that it's only ever
called in a valid way.
Bug:
2477140
Elliott Hughes [Wed, 3 Mar 2010 07:58:39 +0000 (23:58 -0800)]
Copy Froyo's version of MulticastSocketTest to Eclair for CTS.
Partners are seeing test failures from the old tests, which were very bogus.
Elliott Hughes [Wed, 3 Mar 2010 00:01:12 +0000 (16:01 -0800)]
Merge "Add (but @hide) String.isEmpty and Locale.ROOT." into dalvik-dev
Elliott Hughes [Tue, 2 Mar 2010 23:29:53 +0000 (15:29 -0800)]
Add (but @hide) String.isEmpty and Locale.ROOT.
Andy McFadden [Tue, 2 Mar 2010 23:27:25 +0000 (15:27 -0800)]
am
d682adfa: Merge "Switch thread\'s cgroup during spin-on-suspend."
Merge commit '
d682adface0ef5679e0f272ad7f50deb713b6a5b' into dalvik-dev
* commit '
d682adface0ef5679e0f272ad7f50deb713b6a5b':
Switch thread's cgroup during spin-on-suspend.
Andy McFadden [Tue, 2 Mar 2010 23:21:18 +0000 (15:21 -0800)]
Merge "Switch thread's cgroup during spin-on-suspend."
Carl Shapiro [Tue, 2 Mar 2010 23:18:35 +0000 (15:18 -0800)]
am
fb8eb6b1: Merge "Print the self thread id and the owning thread id in the description of the IllegalMonitorExcpetion throw by unlockMonitor."
Merge commit '
fb8eb6b1534c142ccc91844e6507a3f67d16a457' into dalvik-dev
* commit '
fb8eb6b1534c142ccc91844e6507a3f67d16a457':
Print the self thread id and the owning thread id in the description
Elliott Hughes [Tue, 2 Mar 2010 23:18:32 +0000 (15:18 -0800)]
am
59c1f5cb: Use assertEquals rather than assertTrue/assertFalse.
Merge commit '
59c1f5cb8bea87144b473170adb0b0dae7267937' into dalvik-dev
* commit '
59c1f5cb8bea87144b473170adb0b0dae7267937':
Use assertEquals rather than assertTrue/assertFalse.
Carl Shapiro [Tue, 2 Mar 2010 23:12:53 +0000 (15:12 -0800)]
Merge "Print the self thread id and the owning thread id in the description of the IllegalMonitorExcpetion throw by unlockMonitor."
Elliott Hughes [Tue, 2 Mar 2010 23:04:09 +0000 (15:04 -0800)]
Use assertEquals rather than assertTrue/assertFalse.
Andy McFadden [Tue, 2 Mar 2010 22:23:04 +0000 (14:23 -0800)]
Switch thread's cgroup during spin-on-suspend.
Dalvik uses a safe-point suspend mechanism, in which threads are asked
to suspend and do so at their earliest convenience. The thread doing
the asking will sleep-spin until all threads have complied. If a thread
keeps on running, we get a "spin on suspend" situation.
The VM tries to correct matters by raising the priority of the spinning
thread if it's below normal. Until now it was just fiddling with the
"nice" value, but it appears that isn't enough (e.g. bug
2467653). We
now also change the thread's process group from "background" to
"foreground" in an attempt to get it some CPU.
Also includes some changes as part of the Log Reduction Act:
- Don't log the thread stacks on the first spin-on-suspend iteration.
The act of logging can itself be quite a drag.
- Removed the redundant and unnecessary "dumping state" line, as well
as some dead glibc-only code.
- While waiting for daemon threads to shut down, only show the "not
ready yet" message on the first iteration.
Elliott Hughes [Tue, 2 Mar 2010 21:59:04 +0000 (13:59 -0800)]
am
971b5067: Add our home-grown Normalizer tests.
Merge commit '
971b50675ea0c140abb326ffb75fe79442eb6eec' into dalvik-dev
* commit '
971b50675ea0c140abb326ffb75fe79442eb6eec':
Add our home-grown Normalizer tests.
Brian Carlstrom [Tue, 2 Mar 2010 21:51:32 +0000 (13:51 -0800)]
vogar should chdir to android_root
I often run vogar from various working directories but several
internal paths assume that it is run from the android_root.
Elliott Hughes [Tue, 2 Mar 2010 21:24:31 +0000 (13:24 -0800)]
Add our home-grown Normalizer tests.
Originally https://android-git.corp.google.com/g/42517.
Barry Hayes [Wed, 24 Feb 2010 17:19:07 +0000 (09:19 -0800)]
Added assert to dvmInterpHandleFillArrayData.
Arrays of objects should never make it to there.
Barry Hayes [Mon, 1 Mar 2010 17:27:59 +0000 (09:27 -0800)]
Move allocation of the uninitialized class object on to the object heap.
Elliott Hughes [Tue, 2 Mar 2010 04:11:37 +0000 (20:11 -0800)]
am
10ebc7d0: Merge "Implement (but @hide) java.text.Normalizer from Java 6."
Merge commit '
10ebc7d0b84dcb98e1a7eeac96ef06acdfc8d184' into dalvik-dev
* commit '
10ebc7d0b84dcb98e1a7eeac96ef06acdfc8d184':
Implement (but @hide) java.text.Normalizer from Java 6.
Elliott Hughes [Tue, 2 Mar 2010 04:07:07 +0000 (20:07 -0800)]
Merge "Implement (but @hide) java.text.Normalizer from Java 6."
Jesse Wilson [Tue, 2 Mar 2010 03:19:31 +0000 (19:19 -0800)]
am
acf4a11b: Merge "Implementing almost all of Document.normalizeDocument()."
Merge commit '
acf4a11bf201ccdf4a4d2b429d33757556cdc0ed' into dalvik-dev
* commit '
acf4a11bf201ccdf4a4d2b429d33757556cdc0ed':
Implementing almost all of Document.normalizeDocument().
Jesse Wilson [Tue, 2 Mar 2010 03:15:57 +0000 (19:15 -0800)]
Merge "Implementing almost all of Document.normalizeDocument()."
Jesse Wilson [Tue, 2 Mar 2010 01:31:53 +0000 (17:31 -0800)]
Implementing almost all of Document.normalizeDocument().
This follows the rules specified by DOMConfiguration. In particular:
- replacing CDATA nodes with text
- splitting CDATA nodes
- merging text nodes
- stripping comments
- detecting invalid characters
I haven't added the normalization code for XML validation or namespaces.
Elliott Hughes [Tue, 2 Mar 2010 00:28:05 +0000 (16:28 -0800)]
Implement (but @hide) java.text.Normalizer from Java 6.
Based on https://android-git.corp.google.com/g/42516.
Includes the harmony tests from their Java 6 branch.
Bug: 719001
David 'Digit' Turner [Mon, 1 Mar 2010 23:57:17 +0000 (15:57 -0800)]
am
98376a27: Merge "Allow unpriviledged gdbserver to attach to debuggable processes."
Merge commit '
98376a27029e3ce4de36e5dc2379600be33ee4ae' into dalvik-dev
* commit '
98376a27029e3ce4de36e5dc2379600be33ee4ae':
Allow unpriviledged gdbserver to attach to debuggable processes.
David 'Digit' Turner [Mon, 1 Mar 2010 23:45:58 +0000 (15:45 -0800)]
Merge "Allow unpriviledged gdbserver to attach to debuggable processes."
David 'Digit' Turner [Tue, 23 Feb 2010 00:56:58 +0000 (16:56 -0800)]
Allow unpriviledged gdbserver to attach to debuggable processes.
This patch is used to allow an unprivileged gdbserver binary to
perform a ptrace attach to a debuggable process.
The kernel will only allow the attach to succeed under the following
conditions:
- gdbserver and the process are run under the exact same uids/gids
- the process is dumpable
The second condition requires this patch. The first one is ensured
by different changes to the platform (that don't directly touch Dalvik).
This is part of the work performed to allow native debugging of
applications on production devices.
Andy McFadden [Mon, 1 Mar 2010 21:43:35 +0000 (13:43 -0800)]
am
def26c1a: Merge "Added a simple check for stray tracked refs."
Merge commit '
def26c1aff8c80079ebfa766773f5405d054d901' into dalvik-dev
* commit '
def26c1aff8c80079ebfa766773f5405d054d901':
Added a simple check for stray tracked refs.
Andy McFadden [Mon, 1 Mar 2010 21:39:38 +0000 (13:39 -0800)]
Merge "Added a simple check for stray tracked refs."
Andy McFadden [Mon, 1 Mar 2010 20:43:52 +0000 (12:43 -0800)]
am
448cc386: Merge "Added an x86-atom "TODO" list."
Merge commit '
448cc386f87564ce251407f7907b7855d317edb7' into dalvik-dev
* commit '
448cc386f87564ce251407f7907b7855d317edb7':
Added an x86-atom "TODO" list.
Andy McFadden [Mon, 1 Mar 2010 20:40:06 +0000 (12:40 -0800)]
Merge "Added an x86-atom "TODO" list."
Andy McFadden [Mon, 1 Mar 2010 20:16:12 +0000 (12:16 -0800)]
Added an x86-atom "TODO" list.
Besides the obvious things (unimplemented opcodes), this points out a
couple of changes that were made to the interpreter and require a
corresponding change for x86-atom.
Elliott Hughes [Mon, 1 Mar 2010 19:22:54 +0000 (11:22 -0800)]
Add a missing android-changed marker, fix a half-finished one.
Elliott Hughes [Mon, 1 Mar 2010 18:59:42 +0000 (10:59 -0800)]
Use more efficient idioms for converting types.
(Because we only include the Java 5 JDBC driver, there was less to fix than I
thought; this code is copy & pasted into the other drivers.)
Andy McFadden [Mon, 1 Mar 2010 18:52:00 +0000 (10:52 -0800)]
Added a simple check for stray tracked refs.
The idea is to make sure the main thread is getting through the VM init
process with an empty tracked references table. If we find any, we
print a warning and dump the table, but continue on anyway.
My test was a trivial dvmMalloc(), which turned up a flaw in the ref
table dump code: it didn't deal with "raw" dvmMalloc sections. So
that's fixed as well.
Jesse Wilson [Mon, 1 Mar 2010 18:26:05 +0000 (10:26 -0800)]
am
ad71aa20: Merge "New implementation for DOMConfiguration."
Merge commit '
ad71aa2046502db784a8c861b30b11ddf88044f1' into dalvik-dev
* commit '
ad71aa2046502db784a8c861b30b11ddf88044f1':
New implementation for DOMConfiguration.
Elliott Hughes [Mon, 1 Mar 2010 18:26:01 +0000 (10:26 -0800)]
am
16525029: Merge "Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo."
Merge commit '
165250293744f0aadcb0a0bfba1b53b8a4fb99b7' into dalvik-dev
* commit '
165250293744f0aadcb0a0bfba1b53b8a4fb99b7':
Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo.
Jesse Wilson [Mon, 1 Mar 2010 18:21:05 +0000 (10:21 -0800)]
Merge "New implementation for DOMConfiguration."
Jesse Wilson [Sat, 27 Feb 2010 08:00:54 +0000 (00:00 -0800)]
New implementation for DOMConfiguration.
This API is disgusting. Its not regular, not typesafe, sparsely
implemented and overly specific. I'm implementing the minimum I can
get away with - exactly the same route taken by the RI.
The Parameter stuff feels a little bit like overkill, but it allowed
me to group related chunks of code together and avoid long chains of
equalsIgnoreCase if statements.
This is necessary to implement Document.normalize(), one of the
last remaining APIs in DOMv3.
Also fixing our implementation of Node.normalize() and adding tests
to discover a bug in that code. Previously a document like this:
"<foo>abc<br>def</foo>"
Would be normalized to this:
"<foo>abcdef<br></foo>"
Which is a horrible bug! Yuck.
Implementation and tests for Document.normalize() are forthcoming.
Elliott Hughes [Mon, 1 Mar 2010 18:19:46 +0000 (10:19 -0800)]
Merge "Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo."
Andy McFadden [Mon, 1 Mar 2010 03:36:45 +0000 (19:36 -0800)]
am
fcc61ec2: Merge "Don\'t set x86 arch variant."
Merge commit '
fcc61ec20932de83d385131983b47f82a2008cd3' into dalvik-dev
* commit '
fcc61ec20932de83d385131983b47f82a2008cd3':
Don't set x86 arch variant.
Jesse Wilson [Mon, 1 Mar 2010 03:36:41 +0000 (19:36 -0800)]
am
dd55f1bb: Merge "Adding tests to parse document attributes from the DOM."
Merge commit '
dd55f1bba1216e91206255f31de587062ed115b6' into dalvik-dev
* commit '
dd55f1bba1216e91206255f31de587062ed115b6':
Adding tests to parse document attributes from the DOM.
Andy McFadden [Mon, 1 Mar 2010 03:36:37 +0000 (19:36 -0800)]
am
f109fc4a: Merge "Update a few things in x86-atom."
Merge commit '
f109fc4aa8b26984e135cb8321bdde69b64c7878' into dalvik-dev
* commit '
f109fc4aa8b26984e135cb8321bdde69b64c7878':
Update a few things in x86-atom.
Ben Cheng [Mon, 1 Mar 2010 03:36:32 +0000 (19:36 -0800)]
am
40094c16: Tweak the interpreter entries and 2nd level trace filter to capture more traces.
Merge commit '
40094c16d9727cc1e047a7d4bddffe04dd566211' into dalvik-dev
* commit '
40094c16d9727cc1e047a7d4bddffe04dd566211':
Tweak the interpreter entries and 2nd level trace filter to capture more traces.
Brian Carlstrom [Sun, 28 Feb 2010 21:51:14 +0000 (13:51 -0800)]
resolved conflicts for merge of
e84bea92 to dalvik-dev
Elliott Hughes [Sun, 28 Feb 2010 19:31:52 +0000 (11:31 -0800)]
Merge "Upgrade our sqlite JDBC driver to version
20100131." into dalvik-dev
Elliott Hughes [Sun, 28 Feb 2010 19:10:10 +0000 (11:10 -0800)]
Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo.
We want to show the characters representing the flags, not the decimal
values of their ASCII representation. "Use overloading judiciously",
as the man says, or cause errors like this.
Seen in FRE56B (see https://android-git.corp.google.com/g/42528).
Elliott Hughes [Sun, 28 Feb 2010 09:41:22 +0000 (01:41 -0800)]
am
c85663a4: Merge "Fix a couple of typos in JIT function names."
Merge commit '
c85663a4856c476c4ead93bdf19e8a91b2d15e22' into dalvik-dev
* commit '
c85663a4856c476c4ead93bdf19e8a91b2d15e22':
Fix a couple of typos in JIT function names.
Bill Buzbee [Sun, 28 Feb 2010 09:41:17 +0000 (01:41 -0800)]
am
ac9f2112: Merge "Jit: fix typo that caused incorrect def mask for blr\'s."
Merge commit '
ac9f2112303e1353b875999d6481e2047789af9e' into dalvik-dev
* commit '
ac9f2112303e1353b875999d6481e2047789af9e':
Jit: fix typo that caused incorrect def mask for blr's.
Elliott Hughes [Sun, 28 Feb 2010 09:41:11 +0000 (01:41 -0800)]
am
f76b01c6: Merge "Document that Class.getSigners() always returns null."
Merge commit '
f76b01c6377ad4653dcdc37b2ca35db785219f80' into dalvik-dev
* commit '
f76b01c6377ad4653dcdc37b2ca35db785219f80':
Document that Class.getSigners() always returns null.