OSDN Git Service
Jean-Baptiste Queru [Fri, 7 May 2010 00:13:06 +0000 (17:13 -0700)]
am
ac2a3585: am
206edb63: am
71c9526e: am
99632b11: manual merge from froyo
Merge commit '
ac2a358546cf2b5bab43a39eb40549d31932c64d' into dalvik-dev
* commit '
ac2a358546cf2b5bab43a39eb40549d31932c64d':
Plug leak in class initialization.
Jean-Baptiste Queru [Fri, 7 May 2010 00:13:04 +0000 (17:13 -0700)]
am
551a96fb: am
0c0d3893: am
173de779: am
b2520c7f: manual merge from froyo
Merge commit '
551a96fbb09043734fe3622cdc49dc161486d79b' into dalvik-dev
* commit '
551a96fbb09043734fe3622cdc49dc161486d79b':
DO NOT MERGE: Rewrite the HTTP connection pool used by HttpURLConnection.
Jean-Baptiste Queru [Fri, 7 May 2010 00:09:49 +0000 (17:09 -0700)]
am
206edb63: am
71c9526e: am
99632b11: manual merge from froyo
Jean-Baptiste Queru [Fri, 7 May 2010 00:09:47 +0000 (17:09 -0700)]
am
0c0d3893: am
173de779: am
b2520c7f: manual merge from froyo
Jean-Baptiste Queru [Thu, 6 May 2010 23:34:42 +0000 (16:34 -0700)]
am
71c9526e: am
99632b11: manual merge from froyo
Jean-Baptiste Queru [Thu, 6 May 2010 23:34:39 +0000 (16:34 -0700)]
am
173de779: am
b2520c7f: manual merge from froyo
Jean-Baptiste Queru [Thu, 6 May 2010 23:31:40 +0000 (16:31 -0700)]
am
99632b11: manual merge from froyo
Merge commit '
99632b1107cfec56f07aa4941e770e5d449391b7' into kraken
* commit '
99632b1107cfec56f07aa4941e770e5d449391b7':
Plug leak in class initialization.
Jean-Baptiste Queru [Thu, 6 May 2010 23:31:38 +0000 (16:31 -0700)]
am
b2520c7f: manual merge from froyo
Merge commit '
b2520c7f1348cfcb3fa9c2e039140c1addb7688a' into kraken
* commit '
b2520c7f1348cfcb3fa9c2e039140c1addb7688a':
DO NOT MERGE: Rewrite the HTTP connection pool used by HttpURLConnection.
Jean-Baptiste Queru [Thu, 6 May 2010 23:20:19 +0000 (16:20 -0700)]
manual merge from froyo
Change-Id: Ied6d44cd7a54a62e4613b026b8ca9451630f63e1
Jean-Baptiste Queru [Thu, 6 May 2010 23:20:06 +0000 (16:20 -0700)]
manual merge from froyo
Change-Id: I0f7ff92c18a3d047047fd8aca04e0bda4a8c97b9
Andy McFadden [Thu, 6 May 2010 22:41:28 +0000 (15:41 -0700)]
am
60751517: (-s ours) am
d6bec833: am
80a4e249: Dalvik Zip rewrite.
Merge commit '
60751517acb65abf5a4f5cede844d8932dea9542' into dalvik-dev
* commit '
60751517acb65abf5a4f5cede844d8932dea9542':
Dalvik Zip rewrite.
Andy McFadden [Thu, 6 May 2010 22:33:01 +0000 (15:33 -0700)]
am
d6bec833: am
80a4e249: Dalvik Zip rewrite.
Andy McFadden [Thu, 6 May 2010 20:39:07 +0000 (13:39 -0700)]
Plug leak in class initialization.
Don't add static fields and methods to the resolved-items table if the
defining class is still being initialized. If we do, other threads can
then access those fields and methods without first performing an "is the
class initialized" test.
We will end up performing static field and method resolution more often
now than before. On a Nexus One, zygote class preload time went from
2227ms to 2239ms (i.e. the performance difference is in the noise).
Bug
2655384.
Change-Id: Ib0c285ef23d58ae709be65f09efb68e73f982084
Andy McFadden [Thu, 6 May 2010 22:07:48 +0000 (15:07 -0700)]
am
80a4e249: Dalvik Zip rewrite.
Andy McFadden [Fri, 23 Apr 2010 23:34:52 +0000 (16:34 -0700)]
Dalvik Zip rewrite.
Change the way zip archives are handled. This is necessary to deal with
very large (~1GB) APK files, for which our current approach of mapping
the entire file falls over.
We now do the classic scavenger hunt for the End Of Central Directory magic
on a buffer of data read from the file, instead of a memory-mapped section.
We use what we find to create a map that covers the Central Directory only.
For most uses in the VM this is all we really need, since we just want
to check file attributes vs. the optimized DEX to see if we're out of date.
If the caller is interested in unpacking the file contents, we have to
do an additional file read to discover the size of the Local File Header
section so we can skip past it. We also now do a file-to-file extraction
using read() calls instead of a buffer-to-file extraction on mmap()ed data.
No difference in performance (as measured by first-boot dexopt).
Since this is more of a rewrite than an update, I also took the opportunity
to change buffer size variables from "long" to "size_t", and normalized
return values to int (some were using bool, which is common in the VM but
was mixed in the zip code). Failure messages are now all LOGW with the
word "Zip" up front (didn't want to change log tag away from "dalvikvm").
Also, removed a not-quite-right check in the "map part of a file" code,
and clarified that the file offset is absolute.
For bug
2620103.
Change-Id: I745fb15abb541376f467969ffe422222676f1e5f
Andy McFadden [Thu, 6 May 2010 00:09:15 +0000 (17:09 -0700)]
Added a class initialization test.
This tests for races during init, and correctness after an exception is
thrown partway through.
For bug
2655384.
Change-Id: I837ec435d1655e49b8b39f4129bd321857172870
Jesse Wilson [Thu, 6 May 2010 17:54:21 +0000 (10:54 -0700)]
DO NOT MERGE: 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.
Originally submitted to dalvik-dev.
https://android-git.corp.google.com/g/49309
Change-Id: I815c3123838b29cd2d9b39346e5c2486e1f5a2d2
Jesse Wilson [Wed, 5 May 2010 21:27:24 +0000 (14:27 -0700)]
am
6854a7fc: am
faaab7ba: am
f6cd559a: am
c2c14690: am
4751c150: Fixing bulk reads in ByteArray.MyInputStream
Merge commit '
6854a7fc047633b57e1d1962fd2a9ce439051aa1' into dalvik-dev
* commit '
6854a7fc047633b57e1d1962fd2a9ce439051aa1':
Fixing bulk reads in ByteArray.MyInputStream
Jesse Wilson [Wed, 5 May 2010 21:18:53 +0000 (14:18 -0700)]
am
faaab7ba: am
f6cd559a: am
c2c14690: am
4751c150: Fixing bulk reads in ByteArray.MyInputStream
Jesse Wilson [Wed, 5 May 2010 21:17:36 +0000 (14:17 -0700)]
am
f6cd559a: am
c2c14690: am
4751c150: Fixing bulk reads in ByteArray.MyInputStream
Jesse Wilson [Wed, 5 May 2010 21:16:14 +0000 (14:16 -0700)]
am
c2c14690: am
4751c150: Fixing bulk reads in ByteArray.MyInputStream
Merge commit '
c2c146902f6258c16612b05d4b281c8a60b59898' into kraken
* commit '
c2c146902f6258c16612b05d4b281c8a60b59898':
Fixing bulk reads in ByteArray.MyInputStream
Jesse Wilson [Wed, 5 May 2010 21:14:22 +0000 (14:14 -0700)]
am
4751c150: Fixing bulk reads in ByteArray.MyInputStream
Merge commit '
4751c150542ec282f6c6d58984974edec6c0a045' into froyo-plus-aosp
* commit '
4751c150542ec282f6c6d58984974edec6c0a045':
Fixing bulk reads in ByteArray.MyInputStream
Barry Hayes [Wed, 5 May 2010 21:11:09 +0000 (14:11 -0700)]
Merge "The "partial GC" code should not copy immune bits when doing a full GC." into dalvik-dev
Jesse Wilson [Mon, 3 May 2010 22:27:11 +0000 (15:27 -0700)]
Fixing bulk reads in ByteArray.MyInputStream
This has never worked properly, but it didn't matter until recently
because neither the JDK's nor early Dalvik's DataInputStream was
exercising it. But in 2.0, Dalvik's DataInputStream prefers bulk
reads, which exercises this code when run on-device.
http://code.google.com/p/android/issues/detail?id=8115
The problem was that System.arraycopy call didn't include the start
offset in the call.
Barry Hayes [Tue, 4 May 2010 20:32:12 +0000 (13:32 -0700)]
The "partial GC" code should not copy immune bits when doing a full GC.
Change-Id: I09f032e9a1dda585bd2475fc6d6f93f3ef1fc036
Andy McFadden [Tue, 4 May 2010 23:20:08 +0000 (16:20 -0700)]
Merge "Write until we fall over." into dalvik-dev
Andy McFadden [Tue, 4 May 2010 22:41:22 +0000 (15:41 -0700)]
Write until we fall over.
Implement enh's idea about repeating write() until it fails. Use it
in the zip expander and dexopt, which have an above-average chance of
failing due to lack of disk space.
Replace a stray DEFAULT_PAGE_SIZE with SYSTEM_PAGE_SIZE. Apparently I
missed that during the Great Page Size Unification.
Change-Id: Id173cb7669330deebe2f24ae23ece4009a90e3bd
Carl Shapiro [Tue, 4 May 2010 22:20:54 +0000 (15:20 -0700)]
Merge "Fix the identity hash code getter." into dalvik-dev
Carl Shapiro [Tue, 4 May 2010 17:44:47 +0000 (10:44 -0700)]
Propertly pin native method arguments.
All objects that must be pinned during a collection must be discovered
before the scanning phase. This ensures that the collector will not
relocate an object only to discover that its address cannot change.
Change-Id: I074eb02be22e62a764eb26ac85b5f66637e5015e
Carl Shapiro [Tue, 4 May 2010 18:19:53 +0000 (11:19 -0700)]
Fix the identity hash code getter.
The address of the hash code for array objects was incorrectly rounded
up to the next double word instead of the next word as the comment
suggested. Also, assert that we are not in receipt of a class object.
Class objects should not be in the hashed-and-moved state as they are
not yet relocatable.
Change-Id: I0d2ee147f3c144d7308e80aea32fc3dd1719402e
Carl Shapiro [Tue, 4 May 2010 07:53:44 +0000 (00:53 -0700)]
Merge "Properly relocate objects with exposed identity hash codes." into dalvik-dev
Carl Shapiro [Tue, 4 May 2010 03:14:14 +0000 (20:14 -0700)]
Properly relocate objects with exposed identity hash codes.
When the transporter encounters an identity hashed object it will
allocate an additional word in to-space that it fills with the
identity hash code. The identity has code is the from-space address
for uncopied objects and a word immediately after the instance for
copied objects. The transporter will update the hash code state when
it relocates the identity hash code.
All size computations are now performed by objectSize which now
interprets the hash code state. Similarly, all transportation logic
has been moved to transportObject which knows how to allocate and fill
the word holding the identity hash code.
Change-Id: I4920e18299850168b41158de748c8331be541ca1
Andy McFadden [Tue, 4 May 2010 00:22:27 +0000 (17:22 -0700)]
am
c0829fc9: (-s ours) am
7b04830a: am
80f7e83f: am
78115b68: am
c03da3e8: Fix breakpoint handling on switch statements.
Merge commit '
c0829fc9cd9dc4bc04db166df419931d40e72897' into dalvik-dev
* commit '
c0829fc9cd9dc4bc04db166df419931d40e72897':
Fix breakpoint handling on switch statements.
Andy McFadden [Tue, 4 May 2010 00:12:25 +0000 (17:12 -0700)]
am
7b04830a: am
80f7e83f: am
78115b68: am
c03da3e8: Fix breakpoint handling on switch statements.
Andy McFadden [Tue, 4 May 2010 00:10:48 +0000 (17:10 -0700)]
am
80f7e83f: am
78115b68: am
c03da3e8: Fix breakpoint handling on switch statements.
Andy McFadden [Tue, 4 May 2010 00:09:16 +0000 (17:09 -0700)]
am
78115b68: am
c03da3e8: Fix breakpoint handling on switch statements.
Merge commit '
78115b6899e6aa70a3834c3a5f7df9c53765b4ee' into kraken
* commit '
78115b6899e6aa70a3834c3a5f7df9c53765b4ee':
Fix breakpoint handling on switch statements.
Andy McFadden [Tue, 4 May 2010 00:08:07 +0000 (17:08 -0700)]
am
c03da3e8: Fix breakpoint handling on switch statements.
Merge commit '
c03da3e87a0537b211f2300d594597d84898b8f7' into froyo-plus-aosp
* commit '
c03da3e87a0537b211f2300d594597d84898b8f7':
Fix breakpoint handling on switch statements.
Andy McFadden [Mon, 3 May 2010 23:11:20 +0000 (16:11 -0700)]
Fix breakpoint handling on switch statements.
Some debuggers (Eclipse and IntelliJ, but not jdb) appear to set
breakpoints at all addresses associated with a given bytecode offset.
Because dx emits line number information for the data tables used
by "switch" statements, we end up setting a breakpoint on the start
of the switch data.
In the past this wasn't a problem, but now that we're using "hard"
breakpoints it's causing the magic number at the start of the table
to be overwritten. An explict test on the magic number is causing
the intepreter to throw an InternalError.
The quick fix is to refuse to stomp on a "magic" NOP. Assuming the
line number table is otherwise valid and doesn't point into the middle
of a multi-word instruction, this should solve the problem. (We can
check this during verification.)
Bug
2643148.
Change-Id: Ic96947da14ea2346a67f0eb769a1c006153da448
Andy McFadden [Mon, 3 May 2010 23:51:26 +0000 (16:51 -0700)]
Merge "Fix breakpoint handling on switch statements." into dalvik-dev
Jesse Wilson [Mon, 3 May 2010 23:32:39 +0000 (16:32 -0700)]
Merge "Fixing bulk reads in ByteArray.MyInputStream" into dalvik-dev
The Android Open Source Project [Mon, 3 May 2010 23:28:45 +0000 (16:28 -0700)]
am
7580722d: am
860728a3: am
e5ab92a2: am
cf6ab741: merge from open-source master
Merge commit '
7580722dd42463043e5192b86c1ca77b7fb6c4b5' into dalvik-dev
* commit '
7580722dd42463043e5192b86c1ca77b7fb6c4b5':
Adapt to new location of libcore
Delete libcore, now in its own project
Andy McFadden [Mon, 3 May 2010 23:11:20 +0000 (16:11 -0700)]
Fix breakpoint handling on switch statements.
Some debuggers (Eclipse and IntelliJ, but not jdb) appear to set
breakpoints at all addresses associated with a given bytecode offset.
Because dx emits line number information for the data tables used
by "switch" statements, we end up setting a breakpoint on the start
of the switch data.
In the past this wasn't a problem, but now that we're using "hard"
breakpoints it's causing the magic number at the start of the table
to be overwritten. An explict test on the magic number is causing
the intepreter to throw an InternalError.
The quick fix is to refuse to stomp on a "magic" NOP. Assuming the
line number table is otherwise valid and doesn't point into the middle
of a multi-word instruction, this should solve the problem. (We can
check this during verification.)
Bug
2643148.
Change-Id: I8fe35539508fa4f56a3eecc375acc058cf9568e4
The Android Open Source Project [Mon, 3 May 2010 23:20:41 +0000 (16:20 -0700)]
am
860728a3: am
e5ab92a2: am
cf6ab741: merge from open-source master
The Android Open Source Project [Mon, 3 May 2010 23:19:05 +0000 (16:19 -0700)]
am
e5ab92a2: am
cf6ab741: merge from open-source master
The Android Open Source Project [Mon, 3 May 2010 23:17:51 +0000 (16:17 -0700)]
am
cf6ab741: merge from open-source master
Merge commit '
cf6ab741c2a50b61d6cf1b1617e7a908caece6dd' into kraken
* commit '
cf6ab741c2a50b61d6cf1b1617e7a908caece6dd':
Adapt to new location of libcore
Delete libcore, now in its own project
The Android Open Source Project [Mon, 3 May 2010 23:16:09 +0000 (16:16 -0700)]
merge from open-source master
Change-Id: I323b3e716af939a3307189e694f4cdb83b4eda80
Jesse Wilson [Mon, 3 May 2010 22:27:11 +0000 (15:27 -0700)]
Fixing bulk reads in ByteArray.MyInputStream
This has never worked properly, but it didn't matter until recently
because neither the JDK's nor early Dalvik's DataInputStream was
exercising it. But in 2.0, Dalvik's DataInputStream prefers bulk
reads, which exercises this code when run on-device.
http://code.google.com/p/android/issues/detail?id=8115
The problem was that System.arraycopy call didn't include the start
offset in the call.
Jean-Baptiste Queru [Mon, 3 May 2010 16:39:27 +0000 (09:39 -0700)]
Adapt to new location of libcore
Change-Id: Ic8106513bd8bd27ccd785f792dca5b2b48fdf9f5
Ben Cheng [Mon, 3 May 2010 01:30:59 +0000 (18:30 -0700)]
am
d1bf0ff1: am
632320c9: am
948c39d2: am
ff1965e6: am
743fe2ce: Merge "Throw an exception in JIT\'ed code if dvmFindInterfaceMethodInCache returns NULL" into froyo
Merge commit '
d1bf0ff180ba3a6fbd9c668301be68de5c97f443' into dalvik-dev
* commit '
d1bf0ff180ba3a6fbd9c668301be68de5c97f443':
Throw an exception in JIT'ed code if dvmFindInterfaceMethodInCache returns NULL
Ben Cheng [Mon, 3 May 2010 01:30:57 +0000 (18:30 -0700)]
am
02a1acfa: am
e7295d6c: am
560b3568: am
8dbde000: am
73e00c82: Merge "Fix a memory ordering bug when updating the inline cache for predicted chaining." into froyo
Merge commit '
02a1acfa7dd85f4a3db87fbd278ffd4c63a15b4a' into dalvik-dev
* commit '
02a1acfa7dd85f4a3db87fbd278ffd4c63a15b4a':
Fix a memory ordering bug when updating the inline cache for predicted chaining.
Ben Cheng [Mon, 3 May 2010 01:29:39 +0000 (18:29 -0700)]
am
632320c9: am
948c39d2: am
ff1965e6: am
743fe2ce: Merge "Throw an exception in JIT\'ed code if dvmFindInterfaceMethodInCache returns NULL" into froyo
Ben Cheng [Mon, 3 May 2010 01:29:30 +0000 (18:29 -0700)]
am
e7295d6c: am
560b3568: am
8dbde000: am
73e00c82: Merge "Fix a memory ordering bug when updating the inline cache for predicted chaining." into froyo
Ben Cheng [Mon, 3 May 2010 01:28:32 +0000 (18:28 -0700)]
am
948c39d2: am
ff1965e6: am
743fe2ce: Merge "Throw an exception in JIT\'ed code if dvmFindInterfaceMethodInCache returns NULL" into froyo
Ben Cheng [Mon, 3 May 2010 01:28:29 +0000 (18:28 -0700)]
am
560b3568: am
8dbde000: am
73e00c82: Merge "Fix a memory ordering bug when updating the inline cache for predicted chaining." into froyo
Ben Cheng [Mon, 3 May 2010 01:27:25 +0000 (18:27 -0700)]
am
ff1965e6: am
743fe2ce: Merge "Throw an exception in JIT\'ed code if dvmFindInterfaceMethodInCache returns NULL" into froyo
Merge commit '
ff1965e61f4cfe0f31598945d751be2f3aa4b7f3' into kraken
* commit '
ff1965e61f4cfe0f31598945d751be2f3aa4b7f3':
Throw an exception in JIT'ed code if dvmFindInterfaceMethodInCache returns NULL
Ben Cheng [Mon, 3 May 2010 01:27:23 +0000 (18:27 -0700)]
am
8dbde000: am
73e00c82: Merge "Fix a memory ordering bug when updating the inline cache for predicted chaining." into froyo
Merge commit '
8dbde000c30b0dd60d1ff204a35a232ee916f2d8' into kraken
* commit '
8dbde000c30b0dd60d1ff204a35a232ee916f2d8':
Fix a memory ordering bug when updating the inline cache for predicted chaining.
Ben Cheng [Mon, 3 May 2010 01:25:33 +0000 (18:25 -0700)]
am
743fe2ce: Merge "Throw an exception in JIT\'ed code if dvmFindInterfaceMethodInCache returns NULL" into froyo
Merge commit '
743fe2ce4915304560849a17c7625d23ec50999c' into froyo-plus-aosp
* commit '
743fe2ce4915304560849a17c7625d23ec50999c':
Throw an exception in JIT'ed code if dvmFindInterfaceMethodInCache returns NULL
Ben Cheng [Mon, 3 May 2010 01:25:28 +0000 (18:25 -0700)]
am
73e00c82: Merge "Fix a memory ordering bug when updating the inline cache for predicted chaining." into froyo
Merge commit '
73e00c829a82e4aec8720260989dad0a19d18c7c' into froyo-plus-aosp
* commit '
73e00c829a82e4aec8720260989dad0a19d18c7c':
Fix a memory ordering bug when updating the inline cache for predicted chaining.
Ben Cheng [Mon, 3 May 2010 01:18:48 +0000 (18:18 -0700)]
Merge "Throw an exception in JIT'ed code if dvmFindInterfaceMethodInCache returns NULL" into froyo
Ben Cheng [Mon, 3 May 2010 01:18:38 +0000 (18:18 -0700)]
Merge "Fix a memory ordering bug when updating the inline cache for predicted chaining." into froyo
repo sync [Sun, 2 May 2010 23:24:16 +0000 (16:24 -0700)]
am
23498ca0: am
e6d15c5f: am
b8062e17: am
0a310052: resolved conflicts for merge of
f3565212 to froyo-plus-aosp
Merge commit '
23498ca0a60505d5a38c37cc770cd7e4a7cf50f0' into dalvik-dev
* commit '
23498ca0a60505d5a38c37cc770cd7e4a7cf50f0':
Backport the setFixedLengthStreamingMode fix to froyo.
Jean-Baptiste Queru [Sun, 2 May 2010 23:24:14 +0000 (16:24 -0700)]
am
cfb42287: am
b6c0adc1: am
b40ffdb4: am
57cf2608: Adapt to new location of libcore
Merge commit '
cfb42287277a188ecefa02d0d64f64a12a1909e1' into dalvik-dev
* commit '
cfb42287277a188ecefa02d0d64f64a12a1909e1':
Adapt to new location of libcore
Jean-Baptiste Queru [Sun, 2 May 2010 23:24:11 +0000 (16:24 -0700)]
am
b5d6f9d5: am
d6b31b85: am
2366260f: am
3e905b77: Delete libcore, now in its own project
Merge commit '
b5d6f9d5fee38bd7ddf00b82bd89d38c82aa13e9' into dalvik-dev
* commit '
b5d6f9d5fee38bd7ddf00b82bd89d38c82aa13e9':
Delete libcore, now in its own project
repo sync [Sun, 2 May 2010 23:15:37 +0000 (16:15 -0700)]
am
e6d15c5f: am
b8062e17: am
0a310052: resolved conflicts for merge of
f3565212 to froyo-plus-aosp
Jean-Baptiste Queru [Sun, 2 May 2010 23:15:33 +0000 (16:15 -0700)]
am
b6c0adc1: am
b40ffdb4: am
57cf2608: Adapt to new location of libcore
Jean-Baptiste Queru [Sun, 2 May 2010 23:15:30 +0000 (16:15 -0700)]
am
d6b31b85: am
2366260f: am
3e905b77: Delete libcore, now in its own project
repo sync [Sun, 2 May 2010 23:13:41 +0000 (16:13 -0700)]
am
b8062e17: am
0a310052: resolved conflicts for merge of
f3565212 to froyo-plus-aosp
Jean-Baptiste Queru [Sun, 2 May 2010 23:13:39 +0000 (16:13 -0700)]
am
b40ffdb4: am
57cf2608: Adapt to new location of libcore
Jean-Baptiste Queru [Sun, 2 May 2010 23:13:37 +0000 (16:13 -0700)]
am
2366260f: am
3e905b77: Delete libcore, now in its own project
repo sync [Sun, 2 May 2010 23:11:56 +0000 (16:11 -0700)]
am
0a310052: resolved conflicts for merge of
f3565212 to froyo-plus-aosp
Merge commit '
0a310052e8c7e150d1b983687ca94270ca91acb4' into kraken
* commit '
0a310052e8c7e150d1b983687ca94270ca91acb4':
Backport the setFixedLengthStreamingMode fix to froyo.
Jean-Baptiste Queru [Sun, 2 May 2010 23:11:21 +0000 (16:11 -0700)]
am
57cf2608: Adapt to new location of libcore
Merge commit '
57cf2608873e13d609350bdcf33070e5cf0d15bf' into kraken
* commit '
57cf2608873e13d609350bdcf33070e5cf0d15bf':
Adapt to new location of libcore
Jean-Baptiste Queru [Sun, 2 May 2010 23:11:19 +0000 (16:11 -0700)]
am
3e905b77: Delete libcore, now in its own project
Merge commit '
3e905b77ea5bf8c2f9276d64fc280827fc3cd1c4' into kraken
* commit '
3e905b77ea5bf8c2f9276d64fc280827fc3cd1c4':
Delete libcore, now in its own project
Ben Cheng [Sun, 2 May 2010 17:45:32 +0000 (10:45 -0700)]
Throw an exception in JIT'ed code if dvmFindInterfaceMethodInCache returns NULL
Bug:
2642019
Change-Id: Iec2be8f61388d99b1500bb144e56b86febe76c0b
Carl Shapiro [Sun, 2 May 2010 06:35:15 +0000 (23:35 -0700)]
Merge "Import outs scanning code. References discovered in the outs section are now pinned. Also, correct dvmHeapSourceContains to return false when called with addresses outside the heap. This had caused an assert to be tripped in the bitmap code. This was a divergence in behavior from the original (mark sweep) implementation." into dalvik-dev
Carl Shapiro [Sun, 2 May 2010 05:27:56 +0000 (22:27 -0700)]
Import outs scanning code. References discovered in the outs section
are now pinned. Also, correct dvmHeapSourceContains to return false
when called with addresses outside the heap. This had caused an
assert to be tripped in the bitmap code. This was a divergence in
behavior from the original (mark sweep) implementation.
Change-Id: Ic735b2f894698ba4fdf26707a6f59c57ca4b0fa9
Carl Shapiro [Sun, 2 May 2010 05:10:08 +0000 (22:10 -0700)]
Merge "Use a more meaningful condition to regulate the presence of "outs" scanning." into dalvik-dev
Carl Shapiro [Sun, 2 May 2010 03:30:29 +0000 (20:30 -0700)]
Use a more meaningful condition to regulate the presence of "outs"
scanning.
Change-Id: Iabe25ccc1b8b487a66e4f9d30af144c2d1c95c8d
Carl Shapiro [Sun, 2 May 2010 03:08:57 +0000 (20:08 -0700)]
Include stddef.h instead of stdlib.h for size_t definition.
Change-Id: Id3fa2dff0279985ca865caf7e3dfa7b4e77ee345
repo sync [Sat, 1 May 2010 19:37:06 +0000 (12:37 -0700)]
resolved conflicts for merge of
f3565212 to froyo-plus-aosp
Change-Id: I5e14e57bcdac566dd8eca95c92f45503a2760b4e
Ben Cheng [Fri, 30 Apr 2010 22:14:00 +0000 (15:14 -0700)]
Fix a memory ordering bug when updating the inline cache for predicted chaining.
Also collect the statistics about fast/queued/dropped IC update. Example
output:
D/dalvikvm( 86): JIT: ICPatch: 603 fast, 6 queued; 0 dropped
Bug:
2642019
Change-Id: I8cffdc9e422189bfd94bf845bcb2cff516f37077
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:11:19 +0000 (15:11 -0700)]
am
0323dfc6: am
385fcfb2: am
f2b0c540: Adapt to new location of libcore
Merge commit '
0323dfc60840dc7a37169892525d02a231344487' into dalvik-dev
* commit '
0323dfc60840dc7a37169892525d02a231344487':
Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:11:17 +0000 (15:11 -0700)]
am
65975562: am
105dd144: am
0c041d22: Delete libcore, now in its own project
Merge commit '
65975562fd2843fc4bc3d9acbca4d42301f867da' into dalvik-dev
* commit '
65975562fd2843fc4bc3d9acbca4d42301f867da':
Delete libcore, now in its own project
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:11:14 +0000 (15:11 -0700)]
am
bda07e21: am
11998b33: Adapt to new location of libcore
Merge commit '
bda07e21fbc1b471fb077183b689312e0a91c02b' into dalvik-dev
* commit '
bda07e21fbc1b471fb077183b689312e0a91c02b':
Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:11:12 +0000 (15:11 -0700)]
am
2b7c1146: am
a87b6301: Delete libcore, now in its own project
Merge commit '
2b7c114648c234baed89cea73d145d814677ccec' into dalvik-dev
* commit '
2b7c114648c234baed89cea73d145d814677ccec':
Delete libcore, now in its own project
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:08:49 +0000 (15:08 -0700)]
am
385fcfb2: am
f2b0c540: Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:08:47 +0000 (15:08 -0700)]
am
105dd144: am
0c041d22: Delete libcore, now in its own project
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:08:24 +0000 (15:08 -0700)]
am
11998b33: Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:08:15 +0000 (15:08 -0700)]
am
a87b6301: Delete libcore, now in its own project
Jean-Baptiste Queru [Fri, 30 Apr 2010 20:57:27 +0000 (13:57 -0700)]
Delete libcore, now in its own project
Change-Id: Id5f98ddaeb626616cbc48112b3166403ae8d5c78
Jesse Wilson [Fri, 30 Apr 2010 20:34:21 +0000 (13:34 -0700)]
Merge "Merge xml module into luni" into dalvik-dev
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:34 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: I90f482f22fbac82aedbec649a72a465560c3136f
Jean-Baptiste Queru [Fri, 30 Apr 2010 20:20:39 +0000 (13:20 -0700)]
am
f2b0c540: Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 20:20:29 +0000 (13:20 -0700)]
am
0c041d22: Delete libcore, now in its own project
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:34 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: I602be6c3a9df32b33526158d46b406e4196a577b
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:34 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: Ic63de1ef810434dad7e07dcfd8452f1630ec70c5
Jean-Baptiste Queru [Fri, 30 Apr 2010 19:50:55 +0000 (12:50 -0700)]
am
0f93168f: Adapt to new location of libcore
Merge commit '
0f93168feebe941eeb5096a6dc0c7c08bfc1cda8' into dalvik-dev
* commit '
0f93168feebe941eeb5096a6dc0c7c08bfc1cda8':
Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 19:50:51 +0000 (12:50 -0700)]
am
7da2e838: (-s ours) Delete libcore, now in its own project
Merge commit '
7da2e83857e3da7c1339e0ffdcb66e9e6f07a968' into dalvik-dev
* commit '
7da2e83857e3da7c1339e0ffdcb66e9e6f07a968':
Delete libcore, now in its own project
Andy McFadden [Fri, 30 Apr 2010 19:18:28 +0000 (12:18 -0700)]
Merge "Minor tweaks." into dalvik-dev
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:34 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: I20885f385cfb325be18c33862b8e4f293a8a6146
Peter Hallam [Fri, 30 Apr 2010 18:10:30 +0000 (11:10 -0700)]
Merge xml module into luni
Change-Id: Icf83d5ee1f7f62de1923a68af3926d311c27ca99