OSDN Git Service
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
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
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 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
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: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: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: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 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
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: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: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
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 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.
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.
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
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
Jesse Wilson [Tue, 6 Apr 2010 22:54:01 +0000 (15:54 -0700)]
Merge "Adding support for hash '#' comments to our JSON parser." into froyo
Jesse Wilson [Tue, 6 Apr 2010 21:16:28 +0000 (14:16 -0700)]
Adding support for hash '#' comments to our JSON parser.
Neither the JSON RFC nor the documentation of Crockford's
implementation mention these comments, but somehow the
old parser used to support these. And so we shall also.
See bug
2571423.
Change-Id: I77d64c5ec53278d8df5fe1873404f1241320504b
Andy McFadden [Tue, 6 Apr 2010 21:23:37 +0000 (14:23 -0700)]
Merge "Trivial doc change: froyo is 2.2." into froyo
Andy McFadden [Tue, 6 Apr 2010 20:45:38 +0000 (13:45 -0700)]
Trivial doc change: froyo is 2.2.
Change-Id: Icce3770dd318ec8853d5120c13a85656ed1171ea
Elliott Hughes [Mon, 5 Apr 2010 23:13:54 +0000 (16:13 -0700)]
Merge "Froyo InputStream.available documentation improvement." into froyo
Elliott Hughes [Mon, 5 Apr 2010 18:33:58 +0000 (11:33 -0700)]
Froyo InputStream.available documentation improvement.
This method causes a lot of confusion, and we can do a lot better. (Ideally,
the API would either not exist or be something like "public boolean ready()".)
I've removed poor-quality documentation overrides too, so the full
documentation is visible in most places. (InflaterInputStream is an obvious
exception.)
Also, to a lesser extent, improve the InputStream.skip documentation.
Change-Id: I6d6cd788e6a32ad4a2613d1e381610f1ad8575fe
Andy McFadden [Mon, 5 Apr 2010 17:07:30 +0000 (10:07 -0700)]
Added a note about android:vmSafeMode.
Seems like a good thing to note here, along with the system properties that
accomplish the same thing system-wide.
(This is a minor documentation change only.)
Change-Id: Ib9adbd612d662fd2da3a02f49e730040fba8a7f3
Ben Cheng [Fri, 2 Apr 2010 22:04:53 +0000 (15:04 -0700)]
Clean up the codegen for invoking helper callout functions.
All invoked functions are documented in compiler/codegen/arm/CalloutHelper.h
Bug:
2567981
Change-Id: Ia7cd4107272df1b0b5588fbcc0aafcc6d0723d60
Brian Carlstrom [Fri, 2 Apr 2010 21:40:07 +0000 (14:40 -0700)]
Remove JSON License from NOTICE file
Change-Id: Ie4426f8e33ddef42916e88adeaf672714212d3a3
Ben Cheng [Thu, 1 Apr 2010 20:32:30 +0000 (13:32 -0700)]
Merge "Accept the "-Xjitdisableopt" flag as advertised." into froyo
Ben Cheng [Thu, 1 Apr 2010 20:26:54 +0000 (13:26 -0700)]
Accept the "-Xjitdisableopt" flag as advertised.
Bug:
2542212
Change-Id: I6819bbbaf43ccb9a1e35cc576cfd6e5440b9578b
Ben Cheng [Wed, 31 Mar 2010 18:59:18 +0000 (11:59 -0700)]
Fix a race condition in JIT state refresh under debugging / misc code cleanup.
Bug:
2561283
Change-Id: I9fd94928f3e661de97098808340ea92b28cafa07
Andy McFadden [Wed, 31 Mar 2010 15:43:28 +0000 (08:43 -0700)]
Merge "Fix misuse of ALLOC_DONT_TRACK." into froyo
Brian Carlstrom [Tue, 30 Mar 2010 23:28:48 +0000 (16:28 -0700)]
Remove debug message from OpenSSL JNI code
Change-Id: I70c68087b7d109634eb3240dca1f27e6f20d3da6
Andy McFadden [Tue, 30 Mar 2010 22:49:07 +0000 (15:49 -0700)]
Fix misuse of ALLOC_DONT_TRACK.
The internal String creation function doesn't allow ALLOC_DONT_TRACK.
This changes the call to use ALLOC_DEFAULT and then explicitly release
the tracked allocation.
For bug
2558142.
Change-Id: I57dfa4824578c3a3a33f6836b75f51391cc73746
Elliott Hughes [Tue, 30 Mar 2010 22:18:26 +0000 (15:18 -0700)]
Add an @KnownFailure annotation.
Bug:
2489458
Change-Id: Ib1121c6190b63baae8dbc6a8a598c3f5a510cfaf
Bill Buzbee [Sat, 27 Mar 2010 17:58:03 +0000 (10:58 -0700)]
Fix for
2542488 JIT codegen bug with overlapping wide operands
Change-Id: I2f31492f68cb753f76dd664cd6b0a52d7d32de4c
Ben Cheng [Sat, 27 Mar 2010 00:45:28 +0000 (17:45 -0700)]
Improve JIT self verifier test coverage to follow single-step instructions.
Bug:
2549326
Change-Id: I01412d4aac1379b61c90fe6e59c534b33be93f66
Jesse Wilson [Fri, 26 Mar 2010 22:21:11 +0000 (15:21 -0700)]
Merge "Fixing tests to handle changes in our behaviour since DOM 3." into froyo
Jesse Wilson [Fri, 26 Mar 2010 21:49:30 +0000 (14:49 -0700)]
Suppressing additional tests that fail in Froyo.
Our File class doesn't do SecurityManager checks at the same time as it
did previously.
We added a failing logging test but not the fix.
We moved the SQL drivers around, causing some SQL tests to fail.
A new logging test doesn't load its resources using the safe pattern.
Change-Id: I34ab81e4001969aa536f61a89c277ae2b879d49d
Jesse Wilson [Fri, 26 Mar 2010 21:03:36 +0000 (14:03 -0700)]
Fixing tests to handle changes in our behaviour since DOM 3.
Our exception priority has changed for DOM attributes. We
previously used to throw DOMExceptions with namespace error
codes and now throw DOMExceptions with character error codes
when the attribute name is malformed. This caused changes to
many tests.
Another notable behaviour change is that we now supply the
qname (like the RI) where previously we did not. It is optional,
but we now include it for RI-consistency.
Yet another behaviour change is that we don't look at System
properties when choosing a SAX implementation. This simplifies
our internals significantly. End users who want an alternative
SAX implementation should construct it manually.
Also adding @KnownFailure tags for new tests that we have
never yet passed.
Change-Id: I6f81bedd7c2a0867086dc507b3220c2b07c4d3d3
Ben Cheng [Thu, 25 Mar 2010 23:16:02 +0000 (16:16 -0700)]
Use correct resource flags for Dalvik ld/st instructions to enable code motion.
Change-Id: I9b371af4150b6245c0ff59eea63d83406edbbcee
Jesse Wilson [Thu, 25 Mar 2010 20:31:43 +0000 (13:31 -0700)]
Test and document our handling of nulls with getString().
Our behaviour is consistent with Crockford's.
The test confirms that the behaviour is consistent with the report
of that bug, which the submitter claims is not how it should behave.
http://code.google.com/p/android/issues/detail?id=7257
Change-Id: Ibace4bd995e3cbc8fb6c9dc509f8f4491865a647
Bill Buzbee [Thu, 25 Mar 2010 20:07:45 +0000 (13:07 -0700)]
Merge "Jit: Fix for
2542488 JIT codegen bug with overlapping wide operands"
Bill Buzbee [Thu, 25 Mar 2010 17:38:34 +0000 (10:38 -0700)]
Jit: Fix for
2542488 JIT codegen bug with overlapping wide operands
Change-Id: I7b922e223fe1f5242d1f3db1fa18f54aaed725af
Elliott Hughes [Thu, 25 Mar 2010 06:38:48 +0000 (23:38 -0700)]
Fix java.util.Random's constructors.
Subclasses rely on having their overridden setSeed called by Random's
constructors, and the RI actually documents this behavior. (The
documentation even changed between Java 5 and Java 6 to make it _more_
explicit.)
This patch keeps that part of I6239d93bb46876ef1c4a5e155a6dc1ac6fab4eae
that improved our randomness, but reverts the attempt to fix Random's
uncouth behavior.
Also a regression test so we don't try to fix Random again in future.
Bug:
2502231
Change-Id: Ieea1009145c74eac9475c0cd5066dabad20eb114
Kenny Root [Thu, 25 Mar 2010 00:07:15 +0000 (17:07 -0700)]
Merge "Don't leak memory on failed pipe or mutex init"
Kenny Root [Thu, 25 Mar 2010 00:01:22 +0000 (17:01 -0700)]
Don't leak memory on failed pipe or mutex init
SSL allocation might fail on pipe or mutex creation, so free allocated
memory when that happens.
Change-Id: Ibe3813cb652db1e880e3acf0dc1fa37fbe0ad455
Ben Cheng [Wed, 24 Mar 2010 22:49:50 +0000 (15:49 -0700)]
Merge "Fix for the JIT blocking mode plus some code cleanup."
Ben Cheng [Wed, 24 Mar 2010 22:24:19 +0000 (15:24 -0700)]
Fix for the JIT blocking mode plus some code cleanup.
Bug:
2517606
Change-Id: I2b5aa92ceaf23d484329330ae20de5966704280b
Andy McFadden [Wed, 24 Mar 2010 20:03:08 +0000 (13:03 -0700)]
Switch to VMWAIT while outputting trace data.
One of the traces from a monkey run suggests we stalled out during the
open/write/close part of writing the trace data. To reduce the chances
of spin-on-suspending here we now switch to VMWAIT during the I/O.
For bug
2541030.
Change-Id: Ice832988213741976917fdd36afa12a694a42e81
Elliott Hughes [Tue, 23 Mar 2010 23:23:02 +0000 (16:23 -0700)]
Merge "Improve java.net.InetAddress.getLocalHost documentation."
Bill Buzbee [Tue, 23 Mar 2010 21:34:11 +0000 (14:34 -0700)]
Jit: disable for Sapphire.
Change-Id: I3c48f239ef9a83fac1ef05d18ea1b00ab27879ff
Elliott Hughes [Tue, 23 Mar 2010 21:21:27 +0000 (14:21 -0700)]
Improve java.net.InetAddress.getLocalHost documentation.
Bug:
1518707
Change-Id: I741a7a28325320949e84e997e6a49d3356c9a308
Andy McFadden [Tue, 23 Mar 2010 19:34:43 +0000 (12:34 -0700)]
Further refinements to "kill other thread".
Switched from SIGSEGV to SIGSTKFLT. Otherwise it looks like we're
seg-faulting in code that was actually executing just fine.
Ignore SIGSEGV before returning. This avoids creating a second dump
when dvmAbort() is called. (If the caller's stack trace were at all
interesting, we wouldn't be here, and we can do without the log spam.)
Added some more details to the logging.
For bug
2517042.
Change-Id: Ifff7fd75d6dbf7e3663152787f8921dda215fe40
Bill Buzbee [Mon, 22 Mar 2010 20:59:45 +0000 (13:59 -0700)]
Jit: Re-enable for Sapphire
Change-Id: Icbfd8781756c2c7cde88140ed40766e29448b1ff
Andy McFadden [Fri, 19 Mar 2010 22:35:40 +0000 (15:35 -0700)]
Merge "Use pthread_kill(3) instead of kill(2)."
Andy McFadden [Fri, 19 Mar 2010 22:18:57 +0000 (15:18 -0700)]
Use pthread_kill(3) instead of kill(2).
Another swing at useful native traces. pthread_kill(3) uses tkill(2)
instead of kill(2), so we may have a better chance of the signal landing
on the right thread.
For bug
2517042.
Change-Id: I62871c1e21b11442ea52c861397674f1644f4da9
Jesse Wilson [Fri, 19 Mar 2010 20:39:28 +0000 (13:39 -0700)]
Merge "Fixing namespace+prefix mode in Expat and removing optional fields from callbacks."
Jesse Wilson [Fri, 19 Mar 2010 19:51:43 +0000 (12:51 -0700)]
Fixing namespace+prefix mode in Expat and removing optional fields from callbacks.
The first part is related to bug 6632:
http://code.google.com/p/android/issues/detail?id=6632
I added these optional fields back when I was originally updating
the XML parser for Froyo. I've decided to remove them to simplify
migrating between Android and the RI. It should also save some
object allocations.
Note that the RI v5 and the RI v6 behave differently for optional
values on attributes; this motivated me to add the otherwise
unfortunate assertOneOf() method to the testcase. (We behave more
like RI v6, which is to supply the values upon request)
Change-Id: Icfa5d29976a86bf194b3ed7c0d9e2275c3bff9dd
Bjorn Bringert [Fri, 19 Mar 2010 11:22:40 +0000 (11:22 +0000)]
Move String creation outside O(n^2) path in LogManager
This more than halves the number of Strings and StringBuilders created
when constructing a GoogleHttpClient and executing a single
HTTP request.
Bug http://b/issue?id=
2529141
Change-Id: Ia8268fd692b08cf82e4abbffe1459e461e9f7e68
Andy McFadden [Thu, 18 Mar 2010 23:57:30 +0000 (16:57 -0700)]
Merge "Increase sleep delays on debug thread kill."
Andy McFadden [Thu, 18 Mar 2010 23:27:14 +0000 (16:27 -0700)]
Increase sleep delays on debug thread kill.
It appears the delays between the signals were insufficient for a busy
system. This increases the timeouts to larger values, which may or may
not be sufficient. What's really needed here is a way to monitor
debuggerd's activity, but that seems like a lot of work for what this
wants to accomplish.
Also, set gDvm.nativeDebuggerActive to true to prevent the heapworker
watchdog timeout from firing. (Either somebody is going to attach a
debugger soon, or the process is going to die, so it's reasonable to
do here.)
Change-Id: Ic92590499871860ef766147eeaa6efc7afb4acdc
Jesse Wilson [Thu, 18 Mar 2010 18:18:42 +0000 (11:18 -0700)]
Drop needless parens from Javadoc.
Although this violates my longstanding style preference, it agrees
with almighty JJB's official ArrayList, which is Good Enough For Me.
Change-Id: I7b608c12e04d0b7789bfcabeab4b7347ad22baca
Jesse Wilson [Thu, 18 Mar 2010 18:14:45 +0000 (11:14 -0700)]
Merge "Javadoc for JSONArray."
Jesse Wilson [Thu, 18 Mar 2010 06:50:48 +0000 (23:50 -0700)]
Javadoc for JSONArray.
Change-Id: I3aced2607b48210f76887e0d42b591c098ce5db7
Ben Cheng [Thu, 18 Mar 2010 06:32:26 +0000 (23:32 -0700)]
Bug fix for JIT peephole optimization.
Bug:
2520500
Change-Id: I36dbd8b3a6d13c40f9735df4918ab02b5f053b07
Jesse Wilson [Wed, 17 Mar 2010 23:16:15 +0000 (16:16 -0700)]
Fixing 10 of the XPath failures caused by a malformed Document.
See bug
2518858.
This makes our XPath implementation fail the exact same tests
as the RI's. (which we assume is also based on Apache Xalan)
Change-Id: I9a98323113c95609651e948ad11113f84ccd87ec
Jesse Wilson [Wed, 17 Mar 2010 18:42:23 +0000 (11:42 -0700)]
Merge "Exercising our XPath implementation with 279 of Jaxen's tests."
Jesse Wilson [Wed, 17 Mar 2010 18:18:15 +0000 (11:18 -0700)]
Merge "Javadocs for JSONObject."
Jesse Wilson [Wed, 17 Mar 2010 06:41:33 +0000 (23:41 -0700)]
Javadocs for JSONObject.
Change-Id: I5ec9df6a3a9baac8f4f498890cd35feff774737a
Jesse Wilson [Tue, 16 Mar 2010 23:52:54 +0000 (16:52 -0700)]
Exercising our XPath implementation with 279 of Jaxen's tests.
Both our implementation and the RIv6 fail 29 tests, 17 of which are
"could not find function" failures regarding our common lack of
support for the evaluate(), document(), upper-case() and lower-case()
functions.
In addition, our implementation fails 10 additional tests:
xml/moreover.xml / /child::node() "expected:<1> but was:<3>"
xml/simple.xml / string() "expected:<abd> but was:<"
xml/web.xml / /child::node() "expected:<web-app> but was:<>"
xml/web.xml / child::node() "expected:<web-app> but was:<>"
xml/web.xml / name(/child::node()) "expected:<web-app> but was:<>"
xml/web.xml / name(/child::node()) "expected:<web-app> but was:<>"
xml/web.xml / name(/node()) "expected:<web-app> but was:<>"
xml/web.xml / name(child::node()) "expected:<web-app> but was:<>"
xml/web.xml / name(node()) "expected:<web-app> but was:<>"
xml/web.xml /* name(../child::node()) "expected:<web-app> but was:<>"
Change-Id: Icb4695bbf826fd8f1c1ffae5e857169ff551f75e
Ben Cheng [Tue, 16 Mar 2010 23:20:48 +0000 (16:20 -0700)]
Add missing macro SIGNATURE_BREAKPOINT.
Change-Id: I9e450b7b2ff34a3609a99bf8fe11e3efa88ccc30
Ben Cheng [Tue, 16 Mar 2010 23:16:08 +0000 (16:16 -0700)]
Merge "Implement signature-based breakpoint for the JIT compiler."
Carl Shapiro [Tue, 16 Mar 2010 23:08:38 +0000 (16:08 -0700)]
Merge "Replace a use of index with strchr."
Ben Cheng [Tue, 16 Mar 2010 23:04:11 +0000 (16:04 -0700)]
Implement signature-based breakpoint for the JIT compiler.
The JIT compiler will replay itself with verbose printing if the compiled
instruction stream matches the customized signature from memory dump in the
bugreports.
Change-Id: I024082c5744903273b24a0a73468b9c0d3588ad5
Carl Shapiro [Tue, 16 Mar 2010 22:18:53 +0000 (15:18 -0700)]
Replace a use of index with strchr.
Change-Id: I2c1238bc1bd0945533712d0d74a761721b8408a3
Bill Buzbee [Tue, 16 Mar 2010 19:41:43 +0000 (12:41 -0700)]
Jit: Fix register usage bug - Issue
2518825 native crash running ARMv5te JIT
Change I8ca61804 added a call to dvmCanPutArrayElement for APUT_OBJECT,
but did so in a way that violated register usage restrictions. This change
tells the register allocation system what registers we expect to remain
live across the call to dvmCanPutArrayElement.
Change-Id: Icd83b888ba60768a196070d62d07d12c7a3c73c6