OSDN Git Service
Elliott Hughes [Tue, 27 Apr 2010 17:46:45 +0000 (10:46 -0700)]
Merge "Optimize idiv-int/lit for powers of 2." into dalvik-dev
Jesse Wilson [Tue, 27 Apr 2010 01:34:26 +0000 (18:34 -0700)]
Restore test expectations inadvertently deleted with vogar.
Elliott Hughes [Tue, 27 Apr 2010 00:40:13 +0000 (17:40 -0700)]
Optimize idiv-int/lit for powers of 2.
before:
DivideIntByConstant10 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXX|
DivideIntByConstant100 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXX|
DivideIntByConstant100_HandOptimized 34 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
DivideIntByConstant2 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXX|
DivideIntByConstant2048 22 XXXXXXXXXXXXXXXXXXX|||||||
DivideIntByConstant8 20 XXXXXXXXXXXXXXXXX||||||||
DivideIntByVariable10 21 XXXXXXXXXXXXXXXXXX|||||||
DivideIntByVariable2 21 XXXXXXXXXXXXXXXXXX|||||||
after:
benchmark ns logarithmic runtime
DivideIntByConstant10 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
DivideIntByConstant100 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
DivideIntByConstant100_HandOptimized 33 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
DivideIntByConstant2 11 XXXXXXXXX|||||||||||
DivideIntByConstant2048 13 XXXXXXXXXXX|||||||||||
DivideIntByConstant8 13 XXXXXXXXXXX|||||||||||
DivideIntByVariable10 21 XXXXXXXXXXXXXXXXXXX|||||||
DivideIntByVariable2 22 XXXXXXXXXXXXXXXXXXXX||||||
Bug:
2614702
Change-Id: I9dde73d80580446a362cdcc9b82959a4b6bfb384
Elliott Hughes [Mon, 26 Apr 2010 20:51:04 +0000 (13:51 -0700)]
Merge "Fix =/== bug." into dalvik-dev
Elliott Hughes [Mon, 26 Apr 2010 20:45:16 +0000 (13:45 -0700)]
Fix =/== bug.
Change-Id: I42c1ede0289334b7837d468763fecc61fc4a8bea
Jesse Wilson [Mon, 26 Apr 2010 18:20:40 +0000 (11:20 -0700)]
Merge "More merging of nio into luni" into dalvik-dev
Jesse Wilson [Mon, 26 Apr 2010 17:31:19 +0000 (10:31 -0700)]
Removing vogar from Dalvik's git tree; the source is now on code.google.com.
http://code.google.com/p/vogar/
Raphael [Mon, 26 Apr 2010 17:22:33 +0000 (10:22 -0700)]
am
b59dd513: am
5793d439: am
3e557951: am
42452494: Fix dexdump to build in Windows SDK under Linux
Merge commit '
b59dd51399f17f60c5e2c9909331887417b0778c' into dalvik-dev
* commit '
b59dd51399f17f60c5e2c9909331887417b0778c':
Fix dexdump to build in Windows SDK under Linux
Raphael [Mon, 26 Apr 2010 17:11:46 +0000 (10:11 -0700)]
am
5793d439: am
3e557951: am
42452494: Fix dexdump to build in Windows SDK under Linux
Raphael [Sat, 24 Apr 2010 00:21:42 +0000 (17:21 -0700)]
am
3e557951: am
42452494: Fix dexdump to build in Windows SDK under Linux
Merge commit '
3e557951fa772390551d50c85ddd584e4370fb15' into kraken
* commit '
3e557951fa772390551d50c85ddd584e4370fb15':
Fix dexdump to build in Windows SDK under Linux
Raphael [Sat, 24 Apr 2010 00:14:24 +0000 (17:14 -0700)]
am
42452494: Fix dexdump to build in Windows SDK under Linux
Merge commit '
4245249472f7172de80874190559f6d2ef9c3803' into froyo-plus-aosp
* commit '
4245249472f7172de80874190559f6d2ef9c3803':
Fix dexdump to build in Windows SDK under Linux
Elliott Hughes [Fri, 23 Apr 2010 23:24:53 +0000 (16:24 -0700)]
Merge "Dead code/cruft removal in the collation code." into dalvik-dev
Elliott Hughes [Fri, 23 Apr 2010 23:15:38 +0000 (16:15 -0700)]
Dead code/cruft removal in the collation code.
I've also renamed ScopedUtfChars::data to ScopedUtfChars::c_str, by analogy
with std::string (since this method has always been more like c_str than data).
This also fixes a few leaks on error paths.
The old code used to go all the way into native code to return a constant hash
code of 1, so I've removed all that and switched to the idiomatic bogo hash
code (with the idiomatic comment).
Change-Id: I25da8c422155860b5ab348786d369c6c7598135c
Peter Hallam [Fri, 23 Apr 2010 01:14:04 +0000 (18:14 -0700)]
More merging of nio into luni
Change-Id: Ib4356b3cd57490df8ff246ea6a4bc1c269ba848b
Raphael [Tue, 13 Apr 2010 22:19:21 +0000 (15:19 -0700)]
Fix dexdump to build in Windows SDK under Linux
(Merged from master Change I0e57c81d)
Andy McFadden [Fri, 23 Apr 2010 20:17:36 +0000 (13:17 -0700)]
am
29af77bf: am
ca88104b: am
770379e1: am
6efd4463: Fix a deadlock in the breakpoint code.
Merge commit '
29af77bfa00ac560680dea99cf0893fccc257176' into dalvik-dev
* commit '
29af77bfa00ac560680dea99cf0893fccc257176':
Fix a deadlock in the breakpoint code.
Andy McFadden [Fri, 23 Apr 2010 20:08:03 +0000 (13:08 -0700)]
am
ca88104b: am
770379e1: am
6efd4463: Fix a deadlock in the breakpoint code.
Andy McFadden [Fri, 23 Apr 2010 20:00:17 +0000 (13:00 -0700)]
am
770379e1: am
6efd4463: Fix a deadlock in the breakpoint code.
Merge commit '
770379e17e694ec6e08f1edb690a5e33ab81c684' into kraken
* commit '
770379e17e694ec6e08f1edb690a5e33ab81c684':
Fix a deadlock in the breakpoint code.
Carl Shapiro [Fri, 23 Apr 2010 19:58:18 +0000 (12:58 -0700)]
Merge "Import the copying collector." into dalvik-dev
Carl Shapiro [Thu, 15 Apr 2010 23:10:00 +0000 (16:10 -0700)]
Import the copying collector.
Change-Id: I48ef17afd9e5e8453e560a96d307f4f949d4ab5e
Andy McFadden [Fri, 23 Apr 2010 19:55:39 +0000 (12:55 -0700)]
am
6efd4463: Fix a deadlock in the breakpoint code.
Merge commit '
6efd446399ba7a9bb68bf8ddb5a458072a1381b0' into froyo-plus-aosp
* commit '
6efd446399ba7a9bb68bf8ddb5a458072a1381b0':
Fix a deadlock in the breakpoint code.
Andy McFadden [Fri, 23 Apr 2010 00:08:11 +0000 (17:08 -0700)]
Fix a deadlock in the breakpoint code.
In froyo we started using "hard" breakpoints, where we replace the
existing opcodes with breakpoint instructions. This requires some
coordination to avoid confusing the verifier. The previous approach
allowed the breakpoints to be inserted, and "undid" them while the
verifier ran; this worked, but caused us to be holding a lock for
an extended period.
The new approach just avoids altering the bytecode of unverified
classes, and then "flushes" the breakpoint set out between the time
when verification completes and class initialization starts. This
removes the possibility of blocking with the lock held, and makes
everything much simpler.
For bug
2615063.
(cherry-pick from dalvik-dev)
Change-Id: I75f19b0cc71fc0babb50ab299c6c5a865e06c919
Andy McFadden [Fri, 23 Apr 2010 18:51:10 +0000 (11:51 -0700)]
Merge "Fix a deadlock in the breakpoint code." into dalvik-dev
Jesse Wilson [Fri, 23 Apr 2010 18:29:28 +0000 (11:29 -0700)]
Merge "Fixing some logging tests, see b/issue?id=
2487338" into dalvik-dev
Andy McFadden [Fri, 23 Apr 2010 00:08:11 +0000 (17:08 -0700)]
Fix a deadlock in the breakpoint code.
In froyo we started using "hard" breakpoints, where we replace the
existing opcodes with breakpoint instructions. This requires some
coordination to avoid confusing the verifier. The previous approach
allowed the breakpoints to be inserted, and "undid" them while the
verifier ran; this worked, but caused us to be holding a lock for
an extended period.
The new approach just avoids altering the bytecode of unverified
classes, and then "flushes" the breakpoint set out between the time
when verification completes and class initialization starts. This
removes the possibility of blocking with the lock held, and makes
everything much simpler.
For bug
2615063.
Change-Id: I7f43e09a755fba27b335454659b3f04e8b2179ac
Jesse Wilson [Fri, 23 Apr 2010 01:41:59 +0000 (18:41 -0700)]
Fixing some logging tests, see b/issue?id=
2487338
Jesse Wilson [Thu, 22 Apr 2010 23:25:52 +0000 (16:25 -0700)]
Remove unnecessary IPv6 and IPv4 parsing from URI.
Cleanup URI and InetAddress exception localization.
Jesse Wilson [Thu, 22 Apr 2010 22:28:47 +0000 (15:28 -0700)]
Merge "Fixing java.lang.NullPointerException at java.net.URI$Helper.isValidDomainName" into dalvik-dev
Jesse Wilson [Thu, 22 Apr 2010 21:27:58 +0000 (14:27 -0700)]
Fixing java.lang.NullPointerException at java.net.URI$Helper.isValidDomainName
See http://b/issue?id=
2604061
Elliott Hughes [Thu, 22 Apr 2010 21:01:28 +0000 (14:01 -0700)]
Merge "java.text.RuleBasedCollator fixes." into dalvik-dev
Elliott Hughes [Thu, 22 Apr 2010 20:38:42 +0000 (13:38 -0700)]
java.text.RuleBasedCollator fixes.
Add expectations for broken harmony tests, add our own equivalent (but correct)
tets, and fix the bug turned up by the correct tests: the icu4jni
RuleBasedCollator was using toString to convert a CharacterIterator to a
String, resulting in iteration over the result of Object.toString (the class
name and identity hash code) rather than the characters of interest.
Also shut javac up about non-ASCII characters in Locale.java.
Bug:
2608742
Bug:
2608750
Change-Id: I2171789058c8116eacd7e5815bd483f0bc07c69b
The Android Open Source Project [Thu, 22 Apr 2010 20:49:06 +0000 (13:49 -0700)]
am
ed4035bc: am
d2203aa0: am
1beb43af: merge from open-source master
Merge commit '
ed4035bca3233c7a40c4d5679c3f7dfea9516c7e' into dalvik-dev
* commit '
ed4035bca3233c7a40c4d5679c3f7dfea9516c7e':
Improve the implementation of countOnes function to use only 12 operations.
The Android Open Source Project [Thu, 22 Apr 2010 20:39:14 +0000 (13:39 -0700)]
am
d2203aa0: am
1beb43af: merge from open-source master
The Android Open Source Project [Thu, 22 Apr 2010 20:25:29 +0000 (13:25 -0700)]
am
1beb43af: merge from open-source master
Merge commit '
1beb43af9350d47016c0e3ec55c1b2d4230cae7e' into kraken
* commit '
1beb43af9350d47016c0e3ec55c1b2d4230cae7e':
Improve the implementation of countOnes function to use only 12 operations.
The Android Open Source Project [Thu, 22 Apr 2010 19:44:36 +0000 (12:44 -0700)]
merge from open-source master
Change-Id: Ia08d4f55f5cdced2878777e0812c8cbbf26bb0d6
Elliott Hughes [Thu, 22 Apr 2010 00:34:53 +0000 (17:34 -0700)]
Update to the latest upstream collator tests.
I've pulled out the not-obviously-insane stuff we added, though I don't
know how useful it is. This change is mainly about reverting our broken
changes to these tests.
Bug:
2608750
Bug:
2608742
Change-Id: Ia4d0a7b12bfc5dfc3fad4b72254918acf74b418d
Jesse Wilson [Wed, 21 Apr 2010 23:33:10 +0000 (16:33 -0700)]
Merge "Suppress all failures in setSecurityManager() with vogar." into dalvik-dev
Jesse Wilson [Wed, 21 Apr 2010 21:36:15 +0000 (14:36 -0700)]
Suppress all failures in setSecurityManager() with vogar.
Elliott Hughes [Wed, 21 Apr 2010 20:48:48 +0000 (13:48 -0700)]
am
3825d34f: am
d4b6f6aa: am
1dd42bb9: Fix NetworkInterface on sholes/ppp.
Merge commit '
3825d34f9cd5057504ced60962638ffb54f14e38' into dalvik-dev
* commit '
3825d34f9cd5057504ced60962638ffb54f14e38':
Fix NetworkInterface on sholes/ppp.
Elliott Hughes [Wed, 21 Apr 2010 20:39:13 +0000 (13:39 -0700)]
am
d4b6f6aa: am
1dd42bb9: Fix NetworkInterface on sholes/ppp.
Elliott Hughes [Wed, 21 Apr 2010 20:29:59 +0000 (13:29 -0700)]
am
1dd42bb9: Fix NetworkInterface on sholes/ppp.
Merge commit '
1dd42bb9da388c55191449b848f9d82dc4673229' into kraken
* commit '
1dd42bb9da388c55191449b848f9d82dc4673229':
Fix NetworkInterface on sholes/ppp.
Elliott Hughes [Wed, 21 Apr 2010 19:53:02 +0000 (12:53 -0700)]
Merge "Fix Locale.getDisplayName for unlocalizable languages/countries/variants." into dalvik-dev
Elliott Hughes [Wed, 21 Apr 2010 19:48:25 +0000 (12:48 -0700)]
Fix NetworkInterface on sholes/ppp.
We need to use IFA_LOCAL to get the interface addresses; IFA_ADDRESS is the
remote address (which is usually the same as IFA_LOCAL, but not in the ppp
case).
Tested on sholes, where it fixes the test used in the bug; also tested on
passion, where it doesn't break the already-working test.
Bug:
2575983
Change-Id: Ib334a002dc099daeeb05cbc341fe233d4d11d2f7
Andy McFadden [Wed, 21 Apr 2010 17:33:56 +0000 (10:33 -0700)]
Merge "Add some .odex info to dexdump output." into dalvik-dev
Elliott Hughes [Wed, 21 Apr 2010 17:23:08 +0000 (10:23 -0700)]
Fix Locale.getDisplayName for unlocalizable languages/countries/variants.
This does not address the interpretation of script identifiers, but does bring us
in line with the RI's behavior. That's why the test doesn't use the example from
the bug.
Bug:
2611311
Change-Id: I54af89aaf418cd520dc6ebdb1e27dc1ac373f70f
Jesse Wilson [Wed, 21 Apr 2010 04:34:28 +0000 (21:34 -0700)]
Rewrite the HTTP connection pool used by HttpURLConnection.
This started off as incremental changes, but it ended up going
far enough that it earned the "rewrite" badge.
System.getProperty() is not called for every HTTP connection.
This is slightly controversial, but the old code had to bend
over backwards to support dynamic pool changes, and it didn't
even support the case when the pool shrank but not to 0.
The new code doesn't do I/O within static synchronized blocks.
This should reduce contention described here: http://b/issue?id=
2606547
Also: simpify implementation, prettier names, more focused doc.
Carl Shapiro [Tue, 20 Apr 2010 23:38:01 +0000 (16:38 -0700)]
am
0691c470: am
6f7ec8e6: am
28f4d74b: Merge "Remove dangerous logging code from unlockMonitor. It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state. This code was added to debug a transient error and ha
Merge commit '
0691c4701cf8cd32db1bc034dc5f544a807aeb3d' into dalvik-dev
* commit '
0691c4701cf8cd32db1bc034dc5f544a807aeb3d':
Remove dangerous logging code from unlockMonitor. It is unsafe to
Guang Zhu [Tue, 20 Apr 2010 23:37:58 +0000 (16:37 -0700)]
am
7e3d5fcd: Merge "include emma into core library on conditional flag"
Merge commit '
7e3d5fcddef15bf2dff71c2fe5ee794536819973' into dalvik-dev
* commit '
7e3d5fcddef15bf2dff71c2fe5ee794536819973':
include emma into core library on conditional flag
Huahui Wu [Tue, 20 Apr 2010 23:37:52 +0000 (16:37 -0700)]
am
91be9e67: am
9cfe27bd: am
8068ea8d: Update the ssl test so the client reads something from the server. This is needed when cut-through feature is needed as in b/
2586347. Dr. No approved in b/issue?id=
2511073 .
Merge commit '
91be9e671d7db5444aa8fa5f0101867ba8a73075' into dalvik-dev
* commit '
91be9e671d7db5444aa8fa5f0101867ba8a73075':
Update the ssl test so the client reads something from the server.
Jesse Wilson [Mon, 19 Apr 2010 22:01:12 +0000 (15:01 -0700)]
Fixing TimeZone.setDefault() documentation.
Set expectations for date formatting to tolerate "GMT-07" in the
output. The alternative is to emit an ambigous date string.
Applications that want pretty date formatting should use the
proper facilities: SimpleDateFormat, etc.
This problem was detected by org.apache.harmony.luni.tests.java.util.DateTest.test_toString
Carl Shapiro [Tue, 20 Apr 2010 23:06:27 +0000 (16:06 -0700)]
am
6f7ec8e6: am
28f4d74b: Merge "Remove dangerous logging code from unlockMonitor. It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state. This code was added to debug a transient error and has since been
Carl Shapiro [Tue, 20 Apr 2010 22:58:23 +0000 (15:58 -0700)]
am
28f4d74b: Merge "Remove dangerous logging code from unlockMonitor. It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state. This code was added to debug a transient error and has since been removed from
Merge commit '
28f4d74b59e9e40278c4f1fe797d8c75f51b5326' into kraken
* commit '
28f4d74b59e9e40278c4f1fe797d8c75f51b5326':
Remove dangerous logging code from unlockMonitor. It is unsafe to
Carl Shapiro [Tue, 20 Apr 2010 22:51:47 +0000 (15:51 -0700)]
Merge "Remove dangerous logging code from unlockMonitor. It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state. This code was added to debug a transient error and has since been removed from other branches." into froyo
Carl Shapiro [Tue, 20 Apr 2010 22:48:46 +0000 (15:48 -0700)]
resolved conflicts for merge of
ee25fc06 to dalvik-dev
Change-Id: Ib8c3c62b3b791a8087d7e6298006a6221726cf78
Jesse Wilson [Tue, 20 Apr 2010 22:32:27 +0000 (15:32 -0700)]
Merge "Fixing reset() on SAXParser and DocumentBuilder, and cleaning up nearby tests." into dalvik-dev
Andy McFadden [Tue, 20 Apr 2010 21:18:59 +0000 (14:18 -0700)]
Add some .odex info to dexdump output.
"dexdump -f" will now show the contents of the optimized DEX header if
one is present. A "table of contents" for the auxillary data is also
displayed.
As an added bonus, stop being lazy and sanitize the DEX magic before
printing it (it has an embedded newline and \0).
Change-Id: If9c5278785062cd0f44fc3d3ea0725ef0009932a
Guang Zhu [Tue, 20 Apr 2010 21:53:41 +0000 (14:53 -0700)]
Merge "include emma into core library on conditional flag"
Jesse Wilson [Tue, 20 Apr 2010 21:16:25 +0000 (14:16 -0700)]
Fixing reset() on SAXParser and DocumentBuilder, and cleaning up nearby tests.
Also fixing vogar to support a directory of test expectations, so we
can group them by file rather than colocating failures we want to fix
with those that we don't.
Elliott Hughes [Tue, 20 Apr 2010 21:02:19 +0000 (14:02 -0700)]
Merge "Fix a BigInteger(String) bug I introduced yesterday." into dalvik-dev
Andy McFadden [Tue, 20 Apr 2010 20:34:11 +0000 (13:34 -0700)]
Merge "Make plain "-Xint" work." into dalvik-dev
Elliott Hughes [Tue, 20 Apr 2010 20:22:03 +0000 (13:22 -0700)]
Fix a BigInteger(String) bug I introduced yesterday.
I broke parsing of integers in bases greater than 10.
Change-Id: I94c4a75c613a1cd8105b7477e68275a81d04d01b
Andy McFadden [Tue, 20 Apr 2010 20:17:52 +0000 (13:17 -0700)]
Make plain "-Xint" work.
Change-Id: I7a09a886df9722b60a861969f3e1a1a45988068a
Cosmin Cojocar [Sun, 18 Apr 2010 16:25:06 +0000 (18:25 +0200)]
Improve the implementation of countOnes function to use only 12 operations.
Change-Id: I01b62606a0c87b2937572f8cb7beafc956867353
Huahui Wu [Tue, 20 Apr 2010 19:51:07 +0000 (12:51 -0700)]
am
9cfe27bd: am
8068ea8d: Update the ssl test so the client reads something from the server. This is needed when cut-through feature is needed as in b/
2586347. Dr. No approved in b/issue?id=
2511073 .
Huahui Wu [Tue, 20 Apr 2010 19:43:39 +0000 (12:43 -0700)]
am
8068ea8d: Update the ssl test so the client reads something from the server. This is needed when cut-through feature is needed as in b/
2586347. Dr. No approved in b/issue?id=
2511073 .
Merge commit '
8068ea8daa37ac1e4d55c2ebd15bf9dda3d7891e' into kraken
* commit '
8068ea8daa37ac1e4d55c2ebd15bf9dda3d7891e':
Update the ssl test so the client reads something from the server.
Huahui Wu [Mon, 19 Apr 2010 22:05:17 +0000 (18:05 -0400)]
Update the ssl test so the client reads something from the server.
This is needed when cut-through feature is needed as in b/
2586347.
Dr. No approved in http://b/issue?id=
2511073 .
Change-Id: Id84724873522fe0435dbda342616da02783f7d6b
Brian Carlstrom [Tue, 20 Apr 2010 16:18:09 +0000 (09:18 -0700)]
Merge "Merge commit '
a0a3ad10' into manualmerge" into dalvik-dev
Carl Shapiro [Tue, 20 Apr 2010 07:53:13 +0000 (00:53 -0700)]
Remove dangerous logging code from unlockMonitor. It is unsafe to
dereference a potentially corrupt lock word to retrieve additional
information about the lock state. This code was added to debug a
transient error and has since been removed from other branches.
Change-Id: I5aabae531c52532929e8dbb71bdcc6cb7cee64f9
Carl Shapiro [Tue, 20 Apr 2010 07:29:56 +0000 (00:29 -0700)]
am
831eec93: am
b8fcf57f: Fix remaining small issues with the lock sampling.
Carl Shapiro [Tue, 20 Apr 2010 07:21:58 +0000 (00:21 -0700)]
am
b8fcf57f: Fix remaining small issues with the lock sampling.
Merge commit '
b8fcf57f13b4d37950cfbd72a6af401941d7bdd8' into kraken
* commit '
b8fcf57f13b4d37950cfbd72a6af401941d7bdd8':
Fix remaining small issues with the lock sampling.
Carl Shapiro [Tue, 20 Apr 2010 03:10:35 +0000 (20:10 -0700)]
Since we no longer make use of formatted I/O in the unlock monitor
exception case, revert to using dvmThrowException which does not treat
the description string as an output format.
Change-Id: Ice1dc04cb6d1e887af718022cc0b03c6d90f9a19
Carl Shapiro [Sat, 17 Apr 2010 00:33:15 +0000 (17:33 -0700)]
Fix remaining small issues with the lock sampling.
* Eliminate the now unused lockprofsample flag. The sample percentage
has been a function of the wait time an threshold since the previous
change.
* Eliminate some trailing whitespace that creeped into the previous
change.
* Eliminate the trailing newline from the event buffer. Because the
buffer pointer was not incremented this character was not seen in
the event log anyway.
* Document the lockProfThreshold global.
Change-Id: Ia1c1fcf862d76f5631601e05e7941e5171fab097
Brian Carlstrom [Tue, 20 Apr 2010 00:30:47 +0000 (17:30 -0700)]
Merge commit '
a0a3ad10' into manualmerge
Conflicts:
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
Change-Id: I23508e348c5de4103e9dda619ca230d0575f57ca
Carl Shapiro [Tue, 20 Apr 2010 00:01:40 +0000 (17:01 -0700)]
am
5005a521: am
612fa566: am
af69cf8d: Fix several issues with the lock sampling code. This change obsoletes the lockProfSample flag.
Merge commit '
5005a5210b941d18b7742469ba622b1c8a754b1e' into dalvik-dev
* commit '
5005a5210b941d18b7742469ba622b1c8a754b1e':
Fix several issues with the lock sampling code. This change obsoletes
Carl Shapiro [Tue, 20 Apr 2010 00:01:38 +0000 (17:01 -0700)]
am
bd4eaf95: am
54c9323e: am
6b4ba58e: Add a mechanism to long a sample of long running lock acquisitions.
Merge commit '
bd4eaf959e21f3e048366141896ce262f22e0e2c' into dalvik-dev
* commit '
bd4eaf959e21f3e048366141896ce262f22e0e2c':
Add a mechanism to long a sample of long running lock acquisitions.
Jesse Wilson [Tue, 20 Apr 2010 00:01:34 +0000 (17:01 -0700)]
am
a731357c: (-s ours) am
a8984fe8: (-s ours) am
ddc0d4c2: (-s ours) DO NOT MERGE. Suppressing tests that fail in CTS\' test runner.
Merge commit '
a731357c0cadaca3863f6fd0de1b8ffb39464220' into dalvik-dev
* commit '
a731357c0cadaca3863f6fd0de1b8ffb39464220':
DO NOT MERGE. Suppressing tests that fail in CTS' test runner.
Elliott Hughes [Mon, 19 Apr 2010 22:28:23 +0000 (15:28 -0700)]
Fix U_FILE_ACCESS_ERROR RuntimeException in String.getBytes("GB18030").
Bug:
2606807
Change-Id: Ie639ce6380e42e0eed2a7e360504f86a22f1fed8
Elliott Hughes [Mon, 19 Apr 2010 21:29:52 +0000 (14:29 -0700)]
Fix several BigInteger failures.
From Java 7 on, BigInteger also accepts a leading "+" in its string
constructors.
BigInteger has always claimed to accept non-ASCII digits, but our
implementation never has.
BigInteger.isProbablePrime is defined to return true for certainty <= 0,
but OpenSSL (on which we're based) takes the opposite stance.
Change-Id: I00bfc591a4d583460f71b7eec3de91bf6b03cd87
Elliott Hughes [Mon, 19 Apr 2010 21:11:56 +0000 (14:11 -0700)]
Merge "Speed up %d for locales with non-ASCII digits." into dalvik-dev
Elliott Hughes [Mon, 19 Apr 2010 18:10:41 +0000 (11:10 -0700)]
Speed up %d for locales with non-ASCII digits.
The small "localizeDigits" part of this change is the big speedup. It takes
%d in the "ar" Locale from 5x more expensive than "en_US", to just a small
percentage more expensive.
The big part of this change: removing the useless Transformer and FloatUtils
classes touches many lines (mostly just changing the level of indentation),
and only has a small percentage effect on performance. The motivation for
this is actually primarily that it makes the code easier to read, and makes
it easier to share code.
Change-Id: I07e86a3ee448510d9ae36579a9af283349f777f1
Brian Carlstrom [Mon, 19 Apr 2010 20:58:57 +0000 (13:58 -0700)]
Merge "openssl-1.0.0 upgrade"
Jesse Wilson [Mon, 19 Apr 2010 02:55:45 +0000 (19:55 -0700)]
Tidying up the error reporting.
We were spamming our logs with a bunch of redundant messages,
particularly surrounding timeouts. This should reduce the log
output to only the useful stuff when a test takes too long
to complete.
Also not blowing away the full XML report when a few tests
get lost along the way.
Elliott Hughes [Sun, 18 Apr 2010 17:38:03 +0000 (10:38 -0700)]
Remove a dangling import, and another unused Messages.java.
Also tidy up our two awt.font classes.
Change-Id: I931d348eef7265190f76c31f74c9a5d9ec5d6597
Elliott Hughes [Sun, 18 Apr 2010 17:17:46 +0000 (10:17 -0700)]
Merge "Remove the nio Messages.java I missed, and the three now-unused imports." into dalvik-dev
Elliott Hughes [Sun, 18 Apr 2010 17:00:54 +0000 (10:00 -0700)]
Remove the nio Messages.java I missed, and the three now-unused imports.
I seem to be having trouble deleting files lately...
Change-Id: I019acd19aa61acdeeee1ab6f7fb8a063a41a5534
Jesse Wilson [Sat, 17 Apr 2010 22:05:08 +0000 (15:05 -0700)]
Small vogar changes in response to the review for change 49052.
Brian Carlstrom [Sat, 17 Apr 2010 18:45:39 +0000 (11:45 -0700)]
Merge "Teaching vogar to run prebuilt .jar files." into dalvik-dev
Elliott Hughes [Sat, 17 Apr 2010 16:14:48 +0000 (09:14 -0700)]
Merge "Remove "messages" from the logging, math, and nio_char modules." into dalvik-dev
Elliott Hughes [Sat, 17 Apr 2010 06:49:40 +0000 (23:49 -0700)]
Remove two dead files.
java_lang_Character.cpp has long been dead; I killed AndroidSystemNatives.h
this afternoon. I'm not sure how their "git rm"s didn't get included in my
earlier patch.
Change-Id: Iaa73935846a474dbd25792ed0176ccea092e9f7c
Elliott Hughes [Sat, 17 Apr 2010 01:08:47 +0000 (18:08 -0700)]
Remove "messages" from the logging, math, and nio_char modules.
Change-Id: Ib61b132ce17fdd37956889e855bda35956f8ae62
Jesse Wilson [Sat, 17 Apr 2010 02:33:37 +0000 (19:33 -0700)]
Teaching vogar to run prebuilt .jar files.
Also trying to simplify some internals. We always build to
intermediate .jar files now.
I've renamed TestFinder to RunnerSpec and fixed its users.
Elliott Hughes [Sat, 17 Apr 2010 01:32:04 +0000 (18:32 -0700)]
Merge "Move the libcore registration out of libnativehelpers and into libcore." into dalvik-dev
Carl Shapiro [Sat, 17 Apr 2010 01:27:51 +0000 (18:27 -0700)]
am
612fa566: am
af69cf8d: Fix several issues with the lock sampling code. This change obsoletes the lockProfSample flag.
Carl Shapiro [Sat, 17 Apr 2010 01:19:00 +0000 (18:19 -0700)]
am
af69cf8d: Fix several issues with the lock sampling code. This change obsoletes the lockProfSample flag.
Merge commit '
af69cf8d062a42300852ddee6bcb9f189f5a1b83' into kraken
* commit '
af69cf8d062a42300852ddee6bcb9f189f5a1b83':
Fix several issues with the lock sampling code. This change obsoletes
Carl Shapiro [Sat, 17 Apr 2010 01:11:44 +0000 (18:11 -0700)]
Merge "Refinements to array and class object size computation." into dalvik-dev
Carl Shapiro [Sat, 17 Apr 2010 00:55:27 +0000 (17:55 -0700)]
Refinements to array and class object size computation.
* Rename dvmArrayObjectLength to dvmArrayObjectSize. In the context
of arrays length may refer to the length of the array data and not
the size of the array object instance.
* Add a new method dvmClassObjectSize which computes the total size of
a class object including its static fields.
Change-Id: I693ec8e66dfa5df35c9f35474c80411ea917c899
Elliott Hughes [Sat, 17 Apr 2010 00:44:12 +0000 (17:44 -0700)]
Move the libcore registration out of libnativehelpers and into libcore.
Bug: 754114
Change-Id: Iaa03def509c10cbaa12fd2128584b93d4be4a6b7
Carl Shapiro [Sat, 17 Apr 2010 00:33:15 +0000 (17:33 -0700)]
Fix several issues with the lock sampling code. This change obsoletes
the lockProfSample flag.
Change-Id: Idb1846fc3db4ff73678a0dae46aabbb5dbb8b957
Carl Shapiro [Sat, 17 Apr 2010 00:31:59 +0000 (17:31 -0700)]
Merge "Remove an unused enum." into dalvik-dev
Carl Shapiro [Fri, 16 Apr 2010 22:44:09 +0000 (15:44 -0700)]
Remove an unused enum.
Change-Id: I792a5a6b890ac37b3e1fa1f3e4a6413b7621d115