OSDN Git Service
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 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
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
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.
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
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
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: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: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
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: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
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 17:13:34 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: I20885f385cfb325be18c33862b8e4f293a8a6146
Jean-Baptiste Queru [Fri, 30 Apr 2010 15:12:32 +0000 (08:12 -0700)]
Delete libcore, now in its own project
Change-Id: I459e5acceeafc5d60a6cb0ff0958a8080615904a
Jean-Baptiste Queru [Fri, 30 Apr 2010 15:11:17 +0000 (08:11 -0700)]
Delete libcore, now in its own project
Change-Id: I8fccab6d7c9197448a07f660d8b5cd1ee4005a58
Jean-Baptiste Queru [Fri, 30 Apr 2010 15:10:30 +0000 (08:10 -0700)]
Delete libcore, now in its own project
Change-Id: Ibea0a93049e4fe0ae376f5b7647a41e3d548d7a9
Jean-Baptiste Queru [Fri, 30 Apr 2010 15:07:40 +0000 (08:07 -0700)]
Delete libcore, now in its own project
Change-Id: I6f35447116607f14805f4eaadeca4c1a88362194
Elliott Hughes [Fri, 30 Apr 2010 07:33:13 +0000 (00:33 -0700)]
Backport the setFixedLengthStreamingMode fix to froyo.
Bug:
2643503
Change-Id: Ia42c9407ac77721d7fec3b806135d4e9912ee8ca
Guang Zhu [Wed, 28 Apr 2010 18:33:48 +0000 (11:33 -0700)]
no emma instrumentation on core-test
* applying emma instrumentation causes OOM in dx
* test packages don't need emma instrumentation anyway, it's the
package under test that needs to be processed by emma
Change-Id: I8e65d3750aae716c52fb98d0b8cd41a748344516
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
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: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.
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
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 [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: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
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
Guang Zhu [Tue, 20 Apr 2010 21:53:41 +0000 (14:53 -0700)]
Merge "include emma into core library on conditional flag"
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
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 [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 [Mon, 19 Apr 2010 20:58:57 +0000 (13:58 -0700)]
Merge "openssl-1.0.0 upgrade"
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 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 [Thu, 15 Apr 2010 23:59:59 +0000 (16:59 -0700)]
am
54c9323e: am
6b4ba58e: Add a mechanism to long a sample of long running lock acquisitions.
Brian Carlstrom [Thu, 15 Apr 2010 21:00:03 +0000 (14:00 -0700)]
openssl-1.0.0 upgrade
external/openssl
Updated version to 1.0.0
openssl.version
Updated small records patch for 1.0.0. This is probably the most significant change.
patches/small_records.patch
Removed bad_version.patch since fix is included in 0.9.8n and beyond
patches/README
patches/bad_version.patch
openssl.config
Changed import_openssl.sh to generate armv4 asm with the 1.0.0
scripts, not our backported 0.9.9-dev backported version in
patches/arm-asm.patch.
import_openssl.sh
openssl.config
patches/README
patches/arm-asm.patch
Added -DOPENSSL_NO_STORE to match ./Configure output
Added -DOPENSSL_NO_WHIRLPOOL (no-whrlpool) to skip new optional cipher
android-config.mk
openssl.config
Fixed import to remove include directory during import like other
imported directories (apps, ssl, crypto)
import_openssl.sh
Updated UNNEEDED_SOURCES. Pruned Makefiles which we don't use.
openssl.config
Updated to build newly required files
patches/apps_Android.mk
patches/crypto_Android.mk
Disable some new openssl tools
patches/progs.patch
Automatically imported
android.testssl/
apps/
crypto/
e_os.h
e_os2.h
include/
ssl/
dalvik
Change makeCipherList to skip SSLv2 ciphers that 1.0.0 now returns
so there are not duplicate ciphersuite names in getEnabledCipherSuites.
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
Updated OpenSSLSocketImpl_cipherauthenticationmethod for new
SSL_CIPHER algorithms -> algorithm_auth (and const-ness)
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
Update to const SSL_CIPHER in OpenSSLSessionImpl_getCipherSuite (and cipherauthenticationmethod)
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
test_EnabledCipherSuites on both SSLSocketTest and
SSLServerSocketTest caught the makeCipherList problem. However the
asserts where a bit out of sync and didn't give good messages
because they didn't actually show what was going on. As part of
debugging the issue they found, I tried to make align the asserts
and improve their output for the future.
libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
vendor/google
Add const to X509V3_EXT_METHOD* for 1.0.0 compatibility
libraries/libjingle/talk/base/openssladapter.cc
Change-Id: I9e848c79772211d3956f8561ec526339b30e24a4
Carl Shapiro [Thu, 15 Apr 2010 22:32:07 +0000 (15:32 -0700)]
am
6b4ba58e: Add a mechanism to long a sample of long running lock acquisitions.
Merge commit '
6b4ba58ec937bfacba626112c46ebd003efbed21' into kraken
* commit '
6b4ba58ec937bfacba626112c46ebd003efbed21':
Add a mechanism to long a sample of long running lock acquisitions.
Jesse Wilson [Thu, 15 Apr 2010 19:34:29 +0000 (12:34 -0700)]
am
a8984fe8: (-s ours) am
ddc0d4c2: (-s ours) DO NOT MERGE. Suppressing tests that fail in CTS\' test runner.
Jesse Wilson [Thu, 15 Apr 2010 13:36:55 +0000 (06:36 -0700)]
am
e09ba122: Fixing PipedInputStreamTest to fill the buffer before dying on a dead reader.
Carl Shapiro [Fri, 9 Apr 2010 22:03:33 +0000 (15:03 -0700)]
Add a mechanism to long a sample of long running lock acquisitions.
Raphael [Tue, 13 Apr 2010 22:19:21 +0000 (15:19 -0700)]
Fix dexdump to build in Windows SDK under Linux
Change-Id: I0e57c81dcfc53d7065d420129d75ac32cda040e2
Jesse Wilson [Thu, 15 Apr 2010 00:08:44 +0000 (17:08 -0700)]
am
ddc0d4c2: (-s ours) DO NOT MERGE. Suppressing tests that fail in CTS\' test runner.
Merge commit '
ddc0d4c2f8d3fea4ddaf6e611ffd73a1169447e8' into kraken
* commit '
ddc0d4c2f8d3fea4ddaf6e611ffd73a1169447e8':
DO NOT MERGE. Suppressing tests that fail in CTS' test runner.
Jesse Wilson [Wed, 14 Apr 2010 21:43:12 +0000 (14:43 -0700)]
DO NOT MERGE. Suppressing tests that fail in CTS' test runner.
These tests have been verified to work successfully in run-core-tests.
We plan on unifying CTS and Dalvik's test running infrastructure in this
quarter so that we don't need such unfortunate hacks.
Test failures: http://b/issue?id=
2564250
Fix test runner: http://b/issue?id=
2215226
Change-Id: I3df2f4de10705dc470e397da2d0f014141573da1
Jesse Wilson [Wed, 14 Apr 2010 01:02:47 +0000 (18:02 -0700)]
Fixing PipedInputStreamTest to fill the buffer before dying on a dead reader.
Change-Id: Ie34a8bec7b2a34d2933225d6d4e04e0643dbcf99
Carl Shapiro [Fri, 9 Apr 2010 22:03:33 +0000 (15:03 -0700)]
Add a mechanism to long a sample of long running lock acquisitions.
Change-Id: Ic91c5f213bcfd72c6f630ef5102da2c6c7cc8ce4
Brian Carlstrom [Sat, 10 Apr 2010 18:54:58 +0000 (11:54 -0700)]
am
5fdfbeff: Fix SSL_shutdown error reporting to print a proper error instead of "Ok"
Brian Carlstrom [Sat, 10 Apr 2010 00:49:11 +0000 (17:49 -0700)]
Fix SSL_shutdown error reporting to print a proper error instead of "Ok"
There are other problematic error reporting cases to be fixed later, but this one seems to be the frequently occuring.
Change-Id: Ia5910cffb60cc694066be03d43ac1bb7eab47357