OSDN Git Service

android-x86/dalvik.git
14 years agoMerge "The "referent" field of java.lang.ref.Reference objects is NOT included in...
Barry Hayes [Fri, 19 Mar 2010 19:57:52 +0000 (12:57 -0700)]
Merge "The "referent" field of java.lang.ref.Reference objects is NOT included in ifieldRefCount. See Class.c precacheReferenceOffsets for this amusing bit of VM trivia." into dalvik-dev

14 years agoThe "referent" field of java.lang.ref.Reference objects is NOT
Barry Hayes [Fri, 19 Mar 2010 17:10:59 +0000 (10:10 -0700)]
The "referent" field of java.lang.ref.Reference objects is NOT
included in ifieldRefCount.
See Class.c precacheReferenceOffsets for this amusing bit of VM trivia.

Added an explicit VERIFY_REFERENCE of the Reference.referent field for
subclasses of Reference.

Change-Id: Ibc8a059ffb353d60b681af1d3a5520c2443d3864

14 years agoam e073b0e8: Move String creation outside O(n^2) path in LogManager
Bjorn Bringert [Fri, 19 Mar 2010 17:08:00 +0000 (10:08 -0700)]
am e073b0e8: Move String creation outside O(n^2) path in LogManager

Merge commit 'e073b0e86ea089a08685202f78fe446cd03b3d49' into dalvik-dev

* commit 'e073b0e86ea089a08685202f78fe446cd03b3d49':
  Move String creation outside O(n^2) path in LogManager

14 years agoMove String creation outside O(n^2) path in LogManager
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

14 years agoMerge "Add's Java 6's DecimalFormat.setRoundingMode (et cetera)." into dalvik-dev
Elliott Hughes [Fri, 19 Mar 2010 01:12:07 +0000 (18:12 -0700)]
Merge "Add's Java 6's DecimalFormat.setRoundingMode (et cetera)." into dalvik-dev

14 years agoAdd's Java 6's DecimalFormat.setRoundingMode (et cetera).
Elliott Hughes [Fri, 19 Mar 2010 00:00:07 +0000 (17:00 -0700)]
Add's Java 6's DecimalFormat.setRoundingMode (et cetera).

Format and NumberFormat's bogusly-public constructors became protected with
Java 6. DecimalFormat gained more control over rounding behavior. There's a
slight mismatch with our ICU4C-based implementation in that ICU4C doesn't
support RoundingMode.UNNECESSARY, so I've had to fake that (but I doubt it's
used much, if at all).

I've pulled out the obviously Android-specific tests from the harmony
DecimalFormatTest.java, but I've only brought back the rounding mode changes
from the current harmony code to avoid the new tests' dependencies. I've also
added one new test of my own, to check that setMaximumFractionDigits affects
rounding as it should (since the harmony tests don't test this, and it's
somewhat subtle).

Bug: 2497395
Change-Id: Ifafc8bb051e078ead988073281f5c33f0aeb130a

14 years agoam 94e57f7b: Merge "Increase sleep delays on debug thread kill."
Andy McFadden [Fri, 19 Mar 2010 00:05:40 +0000 (17:05 -0700)]
am 94e57f7b: Merge "Increase sleep delays on debug thread kill."

Merge commit '94e57f7bb8e60210e379bfea29471db059a7edca' into dalvik-dev

* commit '94e57f7bb8e60210e379bfea29471db059a7edca':
  Increase sleep delays on debug thread kill.

14 years agoMerge "Increase sleep delays on debug thread kill."
Andy McFadden [Thu, 18 Mar 2010 23:57:30 +0000 (16:57 -0700)]
Merge "Increase sleep delays on debug thread kill."

14 years agoIncrease 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

14 years agoMerge "Add Java 6's Scanner.reset and fix RuleBasedCollator's javadoc." into dalvik-dev
Elliott Hughes [Thu, 18 Mar 2010 20:41:41 +0000 (13:41 -0700)]
Merge "Add Java 6's Scanner.reset and fix RuleBasedCollator's javadoc." into dalvik-dev

14 years agoAdd Java 6's Scanner.reset and fix RuleBasedCollator's javadoc.
Elliott Hughes [Thu, 18 Mar 2010 18:31:16 +0000 (11:31 -0700)]
Add Java 6's Scanner.reset and fix RuleBasedCollator's javadoc.

(The harmony ScannerTest.java is quite different from ours, and doesn't test
this trivial method anyway.)

Bug: 2497395
Change-Id: I8b2b3db7233f766ef70bfdbfdcdfbd0f23e4bdb4

14 years agoam 253eebd3: Drop needless parens from Javadoc.
Jesse Wilson [Thu, 18 Mar 2010 18:25:12 +0000 (11:25 -0700)]
am 253eebd3: Drop needless parens from Javadoc.

Merge commit '253eebd34a7a4a30b20cbfd42dbfd7117af8a154' into dalvik-dev

* commit '253eebd34a7a4a30b20cbfd42dbfd7117af8a154':
  Drop needless parens from Javadoc.

14 years agoam 1573a78e: Merge "Javadoc for JSONArray."
Jesse Wilson [Thu, 18 Mar 2010 18:20:17 +0000 (11:20 -0700)]
am 1573a78e: Merge "Javadoc for JSONArray."

Merge commit '1573a78ed4898aaf4a38abf6ea0ab1254459282b' into dalvik-dev

* commit '1573a78ed4898aaf4a38abf6ea0ab1254459282b':
  Javadoc for JSONArray.

14 years agoDrop needless parens from Javadoc.
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

14 years agoMerge "Javadoc for JSONArray."
Jesse Wilson [Thu, 18 Mar 2010 18:14:45 +0000 (11:14 -0700)]
Merge "Javadoc for JSONArray."

14 years agoJavadoc for JSONArray.
Jesse Wilson [Thu, 18 Mar 2010 06:50:48 +0000 (23:50 -0700)]
Javadoc for JSONArray.

Change-Id: I3aced2607b48210f76887e0d42b591c098ce5db7

14 years agoam 58ece73d: Bug fix for JIT peephole optimization.
Ben Cheng [Thu, 18 Mar 2010 16:37:50 +0000 (09:37 -0700)]
am 58ece73d: Bug fix for JIT peephole optimization.

Merge commit '58ece73d25c78a05b94c820c5ec65b8a2edca81f' into dalvik-dev

* commit '58ece73d25c78a05b94c820c5ec65b8a2edca81f':
  Bug fix for JIT peephole optimization.

14 years agoBug fix for JIT peephole optimization.
Ben Cheng [Thu, 18 Mar 2010 06:32:26 +0000 (23:32 -0700)]
Bug fix for JIT peephole optimization.

Bug: 2520500
Change-Id: I36dbd8b3a6d13c40f9735df4918ab02b5f053b07

14 years agoMerge "Add Java 6's Logger.GLOBAL_LOGGER_NAME field." into dalvik-dev
Elliott Hughes [Wed, 17 Mar 2010 23:41:34 +0000 (16:41 -0700)]
Merge "Add Java 6's Logger.GLOBAL_LOGGER_NAME field." into dalvik-dev

14 years agoam 31275264: Fixing 10 of the XPath failures caused by a malformed Document.
Jesse Wilson [Wed, 17 Mar 2010 23:36:36 +0000 (16:36 -0700)]
am 31275264: Fixing 10 of the XPath failures caused by a malformed Document.

Merge commit '312752642a4539788952260fc517d286f6a6202e' into dalvik-dev

* commit '312752642a4539788952260fc517d286f6a6202e':
  Fixing 10 of the XPath failures caused by a malformed Document.

14 years agoAdd Java 6's Logger.GLOBAL_LOGGER_NAME field.
Elliott Hughes [Wed, 17 Mar 2010 23:28:07 +0000 (16:28 -0700)]
Add Java 6's Logger.GLOBAL_LOGGER_NAME field.

Also deprecated Logger.global.

Bug: 2497395
Change-Id: I28e5f83116277430c4eb0773b238670c0dd80847

14 years agoAdd Java 6's new PipedReader/PipedInputStream constructors.
Elliott Hughes [Wed, 17 Mar 2010 22:54:54 +0000 (15:54 -0700)]
Add Java 6's new PipedReader/PipedInputStream constructors.

Also bring back the latest harmony java6 branch tests, and modify them to pass
with our deliberate [spec-compliant] exception changes.

Bug: 2497395
Change-Id: Ifb3f9bf48f8eec4120f9e59b03beb3969cfe0cd3

14 years agoFixing 10 of the XPath failures caused by a malformed Document.
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

14 years agoFixing an import of a JUnit class that isn't available in dalvik-dev.
Jesse Wilson [Wed, 17 Mar 2010 21:52:33 +0000 (14:52 -0700)]
Fixing an import of a JUnit class that isn't available in dalvik-dev.

14 years agoMerge "Add Java 6's ObjectStreamClass.lookupAny." into dalvik-dev
Elliott Hughes [Wed, 17 Mar 2010 19:02:09 +0000 (12:02 -0700)]
Merge "Add Java 6's ObjectStreamClass.lookupAny." into dalvik-dev

14 years agoam f6976780: Merge "Exercising our XPath implementation with 279 of Jaxen\'s tests."
Jesse Wilson [Wed, 17 Mar 2010 18:46:54 +0000 (11:46 -0700)]
am f6976780: Merge "Exercising our XPath implementation with 279 of Jaxen\'s tests."

Merge commit 'f6976780647c6b9bb168cc7a9c5c8f4ce1425caf' into dalvik-dev

* commit 'f6976780647c6b9bb168cc7a9c5c8f4ce1425caf':
  Exercising our XPath implementation with 279 of Jaxen's tests.

14 years agoMerge "Exercising our XPath implementation with 279 of Jaxen's tests."
Jesse Wilson [Wed, 17 Mar 2010 18:42:23 +0000 (11:42 -0700)]
Merge "Exercising our XPath implementation with 279 of Jaxen's tests."

14 years agoAdd Java 6's ObjectStreamClass.lookupAny.
Elliott Hughes [Wed, 17 Mar 2010 18:42:16 +0000 (11:42 -0700)]
Add Java 6's ObjectStreamClass.lookupAny.

Also bring back the latest harmony java6 tests. We fail two of these tests,
but this is not a regression caused by this patch: our existing code fails
the same tests in the same way, so we already had the bugs and just didn't
know.

Bug: 2497395
Change-Id: I70412cdea747c30ea8d19a55d2ae5e73d3c59c1a

14 years agoam 82ebe52a: Merge "Javadocs for JSONObject."
Jesse Wilson [Wed, 17 Mar 2010 18:24:53 +0000 (11:24 -0700)]
am 82ebe52a: Merge "Javadocs for JSONObject."

Merge commit '82ebe52a3e4ee91ccbef38d241b2b1fd9409a03e' into dalvik-dev

* commit '82ebe52a3e4ee91ccbef38d241b2b1fd9409a03e':
  Javadocs for JSONObject.

14 years agoMerge "Javadocs for JSONObject."
Jesse Wilson [Wed, 17 Mar 2010 18:18:15 +0000 (11:18 -0700)]
Merge "Javadocs for JSONObject."

14 years agoJavadocs for JSONObject.
Jesse Wilson [Wed, 17 Mar 2010 06:41:33 +0000 (23:41 -0700)]
Javadocs for JSONObject.

Change-Id: I5ec9df6a3a9baac8f4f498890cd35feff774737a

14 years agoMerge "misc DalvikRunner changes" into dalvik-dev
Brian Carlstrom [Wed, 17 Mar 2010 16:23:40 +0000 (09:23 -0700)]
Merge "misc DalvikRunner changes" into dalvik-dev

14 years agoMerge "Add Java 6's PrintStream.clearError/PrintWriter.clearError methods." into...
Elliott Hughes [Wed, 17 Mar 2010 04:01:49 +0000 (21:01 -0700)]
Merge "Add Java 6's PrintStream.clearError/PrintWriter.clearError methods." into dalvik-dev

14 years agoAdd Java 6's PrintStream.clearError/PrintWriter.clearError methods.
Elliott Hughes [Wed, 17 Mar 2010 01:02:50 +0000 (18:02 -0700)]
Add Java 6's PrintStream.clearError/PrintWriter.clearError methods.

Also bring back the latest harmony java6 branch tests.

Bug: 2497395
Change-Id: I242e9a7d0446b46faaa5b28e0348806e999d8fdf

14 years agoFix "run-core-tests.sh" to work again.
Elliott Hughes [Wed, 17 Mar 2010 00:33:15 +0000 (17:33 -0700)]
Fix "run-core-tests.sh" to work again.

cshapiro was complaining about this the other week, and I needed it today.
We should fix the duplication, but Android's crippled shell makes that
awkward, and this is the simplest thing that lets us carry on working...

Change-Id: I4c1a764d6069ba55a021631acdc4d6a665df0089

14 years agoMerge "Add Java 6's java.io.Console." into dalvik-dev
Elliott Hughes [Wed, 17 Mar 2010 00:31:41 +0000 (17:31 -0700)]
Merge "Add Java 6's java.io.Console." into dalvik-dev

14 years agoAdd Java 6's java.io.Console.
Elliott Hughes [Tue, 16 Mar 2010 23:43:17 +0000 (16:43 -0700)]
Add Java 6's java.io.Console.

This is actually functional, if you're in the mood to "adb shell".

The implementation is based on harmony's, but with the initialization and
native code rewritten, with readPassword responsible for echoing a newline (so
we don't have to play silly tricks with the ECHONL flag), and a vastly
simplified ConsoleReader class. I've also rewritten the documentation.

Change-Id: I902b47fb27a8fdb2d6f067bb905ee02c6a10e454

14 years agoExercising our XPath implementation with 279 of Jaxen's tests.
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

14 years agomisc DalvikRunner changes
Brian Carlstrom [Fri, 12 Mar 2010 21:27:03 +0000 (13:27 -0800)]
misc DalvikRunner changes

Summary:
- "vogar --debug-port <port>" now overrides --timeout-seconds to be zero
  to prevent timeouts during interactive debugging
- "vogar --timeout-seconds 0" now disables timeout
  as a side-effect of the previous change
- "vogar" no longer defaults to "javac -Xmaxerrs 1"
  This is to make using vogar's output more useful when iteratively developing tests.
  continuous build needs to use "vogar --javac-arg -Xmaxerrs --javac-arg 1"
- "vogar --ident ''" allows disabling of output formating
  This prevents output parsing problems for Emacs *compilation* buffers

Change-Id: I599590c9c4fe3c57524af5c4d7f2be2e30ad4685

14 years agoam 9fa39c91: Add missing macro SIGNATURE_BREAKPOINT.
Ben Cheng [Tue, 16 Mar 2010 23:30:00 +0000 (16:30 -0700)]
am 9fa39c91: Add missing macro SIGNATURE_BREAKPOINT.

Merge commit '9fa39c91c885a05ce544d0899089212321413c13' into dalvik-dev

* commit '9fa39c91c885a05ce544d0899089212321413c13':
  Add missing macro SIGNATURE_BREAKPOINT.

14 years agoAdd missing macro SIGNATURE_BREAKPOINT.
Ben Cheng [Tue, 16 Mar 2010 23:20:48 +0000 (16:20 -0700)]
Add missing macro SIGNATURE_BREAKPOINT.

Change-Id: I9e450b7b2ff34a3609a99bf8fe11e3efa88ccc30

14 years agoam 79cea5c9: Merge "Implement signature-based breakpoint for the JIT compiler."
Ben Cheng [Tue, 16 Mar 2010 23:20:43 +0000 (16:20 -0700)]
am 79cea5c9: Merge "Implement signature-based breakpoint for the JIT compiler."

Merge commit '79cea5c97267e0b3e35e0c2b70e2662aa533f200' into dalvik-dev

* commit '79cea5c97267e0b3e35e0c2b70e2662aa533f200':
  Implement signature-based breakpoint for the JIT compiler.

14 years agoMerge "Implement signature-based breakpoint for the JIT compiler."
Ben Cheng [Tue, 16 Mar 2010 23:16:08 +0000 (16:16 -0700)]
Merge "Implement signature-based breakpoint for the JIT compiler."

14 years agoam 288de8e6: Merge "Replace a use of index with strchr."
Carl Shapiro [Tue, 16 Mar 2010 23:14:08 +0000 (16:14 -0700)]
am 288de8e6: Merge "Replace a use of index with strchr."

Merge commit '288de8e67b5a2c2e6a19372a2b99f17ca17de2fa' into dalvik-dev

* commit '288de8e67b5a2c2e6a19372a2b99f17ca17de2fa':
  Replace a use of index with strchr.

14 years agoMerge "Replace a use of index with strchr."
Carl Shapiro [Tue, 16 Mar 2010 23:08:38 +0000 (16:08 -0700)]
Merge "Replace a use of index with strchr."

14 years agoImplement signature-based breakpoint for the JIT compiler.
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

14 years agoImport the heap verification code from the copying collector. The
Carl Shapiro [Tue, 16 Mar 2010 10:26:49 +0000 (03:26 -0700)]
Import the heap verification code from the copying collector.  The
reference verification routine adds an extra argument so the base
address of an object can be passed to the verification code without
provoking a warning from GCC about breaking alias analysis.

Change-Id: Idd921bcc0e084c18bff1e209a8591ef55f57843a

14 years agoReplace a use of index with strchr.
Carl Shapiro [Tue, 16 Mar 2010 22:18:53 +0000 (15:18 -0700)]
Replace a use of index with strchr.

Change-Id: I2c1238bc1bd0945533712d0d74a761721b8408a3

14 years agoMerge "Add some certimport.sh documention" into dalvik-dev
Brian Carlstrom [Tue, 16 Mar 2010 21:55:07 +0000 (14:55 -0700)]
Merge "Add some certimport.sh documention" into dalvik-dev

14 years agoAdd some certimport.sh documention
Brian Carlstrom [Tue, 16 Mar 2010 21:39:56 +0000 (14:39 -0700)]
Add some certimport.sh documention

hku had some questions about the meaning of the filenames in
cacerts. ngm responded so I captured the knowledge in the
certimport.sh for future reference so we can continue to follow the
convention.

Change-Id: I79b4ed333e541f09d60143f785e5b10d3f5e60f4

14 years agoam 900a3afd: Jit: Fix register usage bug - Issue 2518825 native crash running ARMv5te JIT
Bill Buzbee [Tue, 16 Mar 2010 19:59:32 +0000 (12:59 -0700)]
am 900a3afd: Jit: Fix register usage bug - Issue 2518825 native crash running ARMv5te JIT

Merge commit '900a3afd0e8e0d88426b21447d601ee67e17b642' into dalvik-dev

* commit '900a3afd0e8e0d88426b21447d601ee67e17b642':
  Jit: Fix register usage bug - Issue 2518825 native crash running ARMv5te JIT

14 years agoJit: Fix register usage bug - Issue 2518825 native crash running ARMv5te JIT
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

14 years agoam fcd1cbd4: Merge "Include strings.h directly for its ffs prototype."
Carl Shapiro [Tue, 16 Mar 2010 18:37:47 +0000 (11:37 -0700)]
am fcd1cbd4: Merge "Include strings.h directly for its ffs prototype."

Merge commit 'fcd1cbd456809d2a2c58644efb71e1f42810d3ab' into dalvik-dev

* commit 'fcd1cbd456809d2a2c58644efb71e1f42810d3ab':
  Include strings.h directly for its ffs prototype.

14 years agoMerge "Include strings.h directly for its ffs prototype."
Carl Shapiro [Tue, 16 Mar 2010 18:33:09 +0000 (11:33 -0700)]
Merge "Include strings.h directly for its ffs prototype."

14 years agoMerge "Jit: Handle new VOLATILE Dalvik ops by not handling them." into dalvik-dev
Bill Buzbee [Tue, 16 Mar 2010 18:27:55 +0000 (11:27 -0700)]
Merge "Jit: Handle new VOLATILE Dalvik ops by not handling them." into dalvik-dev

14 years agoam 38b778b3: Fixing an @link issue that is upsetting DroidDoc.
Jesse Wilson [Tue, 16 Mar 2010 18:02:33 +0000 (11:02 -0700)]
am 38b778b3: Fixing an @link issue that is upsetting DroidDoc.

Merge commit '38b778b364061dc87899e7fe0e3efd2502a538fd' into dalvik-dev

* commit '38b778b364061dc87899e7fe0e3efd2502a538fd':
  Fixing an @link issue that is upsetting DroidDoc.

14 years agoFixing an @link issue that is upsetting DroidDoc.
Jesse Wilson [Tue, 16 Mar 2010 17:57:58 +0000 (10:57 -0700)]
Fixing an @link issue that is upsetting DroidDoc.

Change-Id: I9837cfd46684ac6d5b9ec4ac6809da3c3f61d57d

14 years agoMerge "make DalvikRunner ignore .#Foo.java files" into dalvik-dev
Brian Carlstrom [Tue, 16 Mar 2010 17:40:06 +0000 (10:40 -0700)]
Merge "make DalvikRunner ignore .#Foo.java files" into dalvik-dev

14 years agomake DalvikRunner ignore .#Foo.java files
Brian Carlstrom [Tue, 16 Mar 2010 16:46:48 +0000 (09:46 -0700)]
make DalvikRunner ignore .#Foo.java files

Emacs makes hidden bogus symlinks for open modified files such as
".#Foo.java -> user@host.pid:rand" which I'm guessing are to identify
the owning user/host/process. Unfortunately, DalvikRunner was picking
these up as source and trying to compile them.

This change makes NamingPatternCodeFinder ignore these. In order to
avoid duplicating this in all the subclasses, the subclasses now call
super.matches as a first pass. Now subclasses only apply any
additional filtering they want. MainFinder.matches was deleted since
it wasn't adding any new restrictions.

We arguably could add a better starting filter perhaps, but skipping
dot files seems a reasonable first stem.

Change-Id: Ic9f5ec0bb629d5e1bc25a5b80a6619a64285d2b0

14 years agoam 6abe2582: Merge "First half of JSON Javadocs."
Jesse Wilson [Tue, 16 Mar 2010 17:26:16 +0000 (10:26 -0700)]
am 6abe2582: Merge "First half of JSON Javadocs."

Merge commit '6abe2582f9dea9887b4cf6cdee200246b6e86117' into dalvik-dev

* commit '6abe2582f9dea9887b4cf6cdee200246b6e86117':
  First half of JSON Javadocs.

14 years agoMerge "First half of JSON Javadocs."
Jesse Wilson [Tue, 16 Mar 2010 17:21:21 +0000 (10:21 -0700)]
Merge "First half of JSON Javadocs."

14 years agoFirst half of JSON Javadocs.
Jesse Wilson [Tue, 16 Mar 2010 06:47:57 +0000 (23:47 -0700)]
First half of JSON Javadocs.

Change-Id: I277ec3b35a28802dd7b7f82c1f4bbadbd3cc4c65

14 years agoMerge "Remove dead fields, constants, and redundant pass-through methods." into dalvi...
Elliott Hughes [Tue, 16 Mar 2010 16:00:36 +0000 (09:00 -0700)]
Merge "Remove dead fields, constants, and redundant pass-through methods." into dalvik-dev

14 years agoam f8a44e85: Merge "Point debuggerd at the interesting thread."
Andy McFadden [Tue, 16 Mar 2010 15:53:15 +0000 (08:53 -0700)]
am f8a44e85: Merge "Point debuggerd at the interesting thread."

Merge commit 'f8a44e85b2beed31f0cb1688ac6bdc08bc37ece1' into dalvik-dev

* commit 'f8a44e85b2beed31f0cb1688ac6bdc08bc37ece1':
  Point debuggerd at the interesting thread.

14 years agoMerge "Point debuggerd at the interesting thread."
Andy McFadden [Tue, 16 Mar 2010 15:48:04 +0000 (08:48 -0700)]
Merge "Point debuggerd at the interesting thread."

14 years agoReplace free calls to the pthread mutex lock, unlock, and trylock
Carl Shapiro [Sun, 14 Mar 2010 06:34:01 +0000 (22:34 -0800)]
Replace free calls to the pthread mutex lock, unlock, and trylock
functions with calls to the error checked wrapper functions.  This
ensures that all mutex operations are checked in debug builds.

Change-Id: I4a5f181e025a2974f3325bcd9efa861eb6a92978

14 years agoInclude strings.h directly for its ffs prototype.
Carl Shapiro [Tue, 16 Mar 2010 07:21:41 +0000 (00:21 -0700)]
Include strings.h directly for its ffs prototype.

Change-Id: If957427bd0918b3b06e6b6177227f107a4b5a5c5

14 years agoam 27182541: Implementing Document.renameNode() and DOMImplementation.getFeature().
Jesse Wilson [Tue, 16 Mar 2010 05:05:59 +0000 (22:05 -0700)]
am 27182541: Implementing Document.renameNode() and DOMImplementation.getFeature().

Merge commit '271825415aa961bdd9f28a551575bcee6f27b4ab' into dalvik-dev

* commit '271825415aa961bdd9f28a551575bcee6f27b4ab':
  Implementing Document.renameNode() and DOMImplementation.getFeature().

14 years agoPoint debuggerd at the interesting thread.
Andy McFadden [Tue, 16 Mar 2010 00:24:55 +0000 (17:24 -0700)]
Point debuggerd at the interesting thread.

There are a couple of situations (spin-on-suspend, HeapWorker wedged)
where the current thread's native stack is much less interesting than one
of the others.  This change will cause a couple of signals to be thrown
at the "interesting" thread in an attempt to get more useful information
out of debuggerd in these cases.

For bug 2517042.

Change-Id: Ib8c0e0ef93f07b7114e5f4638a907a0f7802bdc0

14 years agoJit: Handle new VOLATILE Dalvik ops by not handling them.
Bill Buzbee [Tue, 16 Mar 2010 00:19:12 +0000 (17:19 -0700)]
Jit: Handle new VOLATILE Dalvik ops by not handling them.

See [Issue 1633591] Volatile long/double accesses should be atomic.
Because we believe this to be a rare case, the Jit will just punt
to the interpreter for these.

Change-Id: Idd05b5acae9aa5ffa60941cba8533534a89c0ff8

14 years agoMake wide-volatile loads and stores atomic.
Andy McFadden [Fri, 5 Mar 2010 23:58:31 +0000 (15:58 -0800)]
Make wide-volatile loads and stores atomic.

This implements the four wide-volatile instructions added in a previous
change, and modifies the verifier to substitute the opcodes into the
instruction stream when appropriate.

For mterp, the ARM wide get/put instructions now have conditional code
that replaces ldrd/strd with a call to the quasiatomic functions.  The
C version does essentially the same thing.  ARMv4T lacks ldrd/stdrd, and
uses separate implementations for the wide field accesses, so those were
updated as well.  x86 will just use stubs.

The JIT should punt these to the interpreter.

Change-Id: Ife88559ed1a698c3267d43c454896f6b12081c0f
Also:
 - We don't seem to be using the negative widths in the instruction
   table.  Not sure they're useful anymore.
 - Tabs -> spaces in x86-atom throw-verification-error impl.

14 years agoImplementing Document.renameNode() and DOMImplementation.getFeature().
Jesse Wilson [Mon, 15 Mar 2010 23:26:31 +0000 (16:26 -0700)]
Implementing Document.renameNode() and DOMImplementation.getFeature().

The rename code required moving some behaviour from ElementImpl
and AttrImpl up to their common superclass, NodeImpl.

Change-Id: I30910de146f525a5ecc837895ce5808928b858a0

14 years agoRemove dead fields, constants, and redundant pass-through methods.
Elliott Hughes [Mon, 15 Mar 2010 23:40:21 +0000 (16:40 -0700)]
Remove dead fields, constants, and redundant pass-through methods.

(This is just preliminary to what I really want to do, which is vastly
reduce the number of near-duplicate methods we have: all the send/recv
variants, for example.)

Change-Id: Ib03653820a18f55aea6c5b876c397afd281a98dc

14 years agoMerge "Eliminate unused heap bitmap functions. This is mostly the "list" code which...
Carl Shapiro [Mon, 15 Mar 2010 23:25:40 +0000 (16:25 -0700)]
Merge "Eliminate unused heap bitmap functions.  This is mostly the "list" code which is no longer needed." into dalvik-dev

14 years agoam 1639f705: Merge "Fix the JIT blocking mode to unblock itself."
Ben Cheng [Mon, 15 Mar 2010 22:51:29 +0000 (15:51 -0700)]
am 1639f705: Merge "Fix the JIT blocking mode to unblock itself."

Merge commit '1639f7054fd7056a089fabe57d02639973d7da10' into dalvik-dev

* commit '1639f7054fd7056a089fabe57d02639973d7da10':
  Fix the JIT blocking mode to unblock itself.

14 years agoMerge "Fix the JIT blocking mode to unblock itself."
Ben Cheng [Mon, 15 Mar 2010 22:48:06 +0000 (15:48 -0700)]
Merge "Fix the JIT blocking mode to unblock itself."

14 years agoFix the JIT blocking mode to unblock itself.
Ben Cheng [Mon, 15 Mar 2010 22:19:06 +0000 (15:19 -0700)]
Fix the JIT blocking mode to unblock itself.

Change-Id: Iaf1da9ee3ce337f2c5ad4985a6c776bc68472f8c

14 years agoam a58fc616: Merge "Try to show lock owner in MONITOR thread dump."
Andy McFadden [Mon, 15 Mar 2010 19:12:59 +0000 (12:12 -0700)]
am a58fc616: Merge "Try to show lock owner in MONITOR thread dump."

Merge commit 'a58fc61670d91cad6eab32b665742a7ce956aebb' into dalvik-dev

* commit 'a58fc61670d91cad6eab32b665742a7ce956aebb':
  Try to show lock owner in MONITOR thread dump.

14 years agoMerge "Try to show lock owner in MONITOR thread dump."
Andy McFadden [Mon, 15 Mar 2010 19:07:18 +0000 (12:07 -0700)]
Merge "Try to show lock owner in MONITOR thread dump."

14 years agoTry to show lock owner in MONITOR thread dump.
Andy McFadden [Fri, 12 Mar 2010 21:39:59 +0000 (13:39 -0800)]
Try to show lock owner in MONITOR thread dump.

A thread in the MONITOR state is blocked waiting on a monitor.  This
raises two interesting questions: (1) what lock is it waiting on, and
(2) who holds that lock?  The answer to (1) can be determined easily by
looking at the source code, but (2) is a bit harder.

This change extracts the target object from the instruction stream and
prints some information about it, e.g.:

- waiting to lock <0x40028c68> (a java.lang.Object) held by threadid=1 (main)

Also: fiddled with "must [not] be locked" on a recently-added function.

(cherry-picked from dalvik-dev)

Change-Id: Ic16695741760d50be70e70fb7470972cef28bb09

14 years agoam 62145b47: Merge "Jit: Minor cleanup - enum size fix, remove useless code, control...
Bill Buzbee [Mon, 15 Mar 2010 17:16:57 +0000 (10:16 -0700)]
am 62145b47: Merge "Jit: Minor cleanup - enum size fix, remove useless code, control consistency."

Merge commit '62145b47a29777d29ec0f8883f84f2336f5522df' into dalvik-dev

* commit '62145b47a29777d29ec0f8883f84f2336f5522df':
  Jit: Minor cleanup - enum size fix, remove useless code, control consistency.

14 years agoMerge "Jit: Minor cleanup - enum size fix, remove useless code, control consistency."
Bill Buzbee [Mon, 15 Mar 2010 17:13:58 +0000 (10:13 -0700)]
Merge "Jit: Minor cleanup - enum size fix, remove useless code, control consistency."

14 years agoam bcdd4b09: Increase the SHORT_DELAY amount in the JSR166 test.
Ben Cheng [Mon, 15 Mar 2010 17:07:13 +0000 (10:07 -0700)]
am bcdd4b09: Increase the SHORT_DELAY amount in the JSR166 test.

Merge commit 'bcdd4b09d018f24aaa61311f3e543636f7eb4095' into dalvik-dev

* commit 'bcdd4b09d018f24aaa61311f3e543636f7eb4095':
  Increase the SHORT_DELAY amount in the JSR166 test.

14 years agoJit: Minor cleanup - enum size fix, remove useless code, control consistency.
Bill Buzbee [Fri, 12 Mar 2010 23:15:35 +0000 (15:15 -0800)]
Jit: Minor cleanup - enum size fix, remove useless code, control consistency.

Change-Id: Id8c16303efd25683ad4b04a85e0d2a059b5ec3be

14 years agoTry to show lock owner in MONITOR thread dump.
Andy McFadden [Fri, 12 Mar 2010 21:39:59 +0000 (13:39 -0800)]
Try to show lock owner in MONITOR thread dump.

A thread in the MONITOR state is blocked waiting on a monitor.  This
raises two interesting questions: (1) what lock is it waiting on, and
(2) who holds that lock?  The answer to (1) can be determined easily by
looking at the source code, but (2) is a bit harder.

This change extracts the target object from the instruction stream and
prints some information about it, e.g.:

- waiting to lock <0x40028c68> (a java.lang.Object) held by threadid=1 (main)

Change-Id: Iad18fc6f2df4142368bdf1063b8cc71de2d66156
Also: fiddled with "must [not] be locked" on a recently-added function.

14 years agoIncrease the SHORT_DELAY amount in the JSR166 test.
Ben Cheng [Mon, 15 Mar 2010 06:04:49 +0000 (23:04 -0700)]
Increase the SHORT_DELAY amount in the JSR166 test.

Change-Id: I890621226c5ea412baee568f3e9b31833185849a

14 years agoMerge "Factor out lock inflation into a common subroutine." into dalvik-dev
Carl Shapiro [Sun, 14 Mar 2010 03:32:47 +0000 (19:32 -0800)]
Merge "Factor out lock inflation into a common subroutine." into dalvik-dev

14 years agoFactor out lock inflation into a common subroutine.
Carl Shapiro [Fri, 12 Mar 2010 23:25:37 +0000 (15:25 -0800)]
Factor out lock inflation into a common subroutine.

Change-Id: Iba789778dbaf34cf92f3ca2ebb96d57ec488c20f

14 years agoam fcfb5220: Adding an Apache-licensed implementation of org.json
Jesse Wilson [Sun, 14 Mar 2010 02:32:42 +0000 (18:32 -0800)]
am fcfb5220: Adding an Apache-licensed implementation of org.json

Merge commit 'fcfb52201103bf732a6233ea45daaa65e253543b' into dalvik-dev

* commit 'fcfb52201103bf732a6233ea45daaa65e253543b':
  Adding an Apache-licensed implementation of org.json

14 years agoam f662e543: Removing the non-free org.json implementation
Jesse Wilson [Sun, 14 Mar 2010 02:32:39 +0000 (18:32 -0800)]
am f662e543: Removing the non-free org.json implementation

Merge commit 'f662e543f4bf86ccc6d4375f664268da4208b61f' into dalvik-dev

* commit 'f662e543f4bf86ccc6d4375f664268da4208b61f':
  Removing the non-free org.json implementation

14 years agoam 37cfb2f4: Merge "A cleanroom implementation of the org.json API."
Jesse Wilson [Sun, 14 Mar 2010 02:32:35 +0000 (18:32 -0800)]
am 37cfb2f4: Merge "A cleanroom implementation of the org.json API."

Merge commit '37cfb2f4bbd39b494172aad059fbe89a45d18a00' into dalvik-dev

* commit '37cfb2f4bbd39b494172aad059fbe89a45d18a00':
  A cleanroom implementation of the org.json API.

14 years agoam 95cd9ac6: Stay in the dbg interpreter if the entry reason is to deal with exceptions.
Ben Cheng [Sun, 14 Mar 2010 02:32:32 +0000 (18:32 -0800)]
am 95cd9ac6: Stay in the dbg interpreter if the entry reason is to deal with exceptions.

Merge commit '95cd9ac6c308008b6bd48e6e516c118fce0e6a1f' into dalvik-dev

* commit '95cd9ac6c308008b6bd48e6e516c118fce0e6a1f':
  Stay in the dbg interpreter if the entry reason is to deal with exceptions.

14 years agoam 3ed90a94: Merge "Add a native method dalvik.system.VMDebug.infopoint(int id)."
Ben Cheng [Sun, 14 Mar 2010 02:32:28 +0000 (18:32 -0800)]
am 3ed90a94: Merge "Add a native method dalvik.system.VMDebug.infopoint(int id)."

Merge commit '3ed90a94fa2eea45a423471405df5df62b187b83' into dalvik-dev

* commit '3ed90a94fa2eea45a423471405df5df62b187b83':
  Add a native method dalvik.system.VMDebug.infopoint(int id).

14 years agoMerge "Remove dead obfuscatory code." into dalvik-dev
Elliott Hughes [Sat, 13 Mar 2010 03:38:22 +0000 (19:38 -0800)]
Merge "Remove dead obfuscatory code." into dalvik-dev

14 years agoAdding an Apache-licensed implementation of org.json
Jesse Wilson [Sat, 13 Mar 2010 02:37:43 +0000 (18:37 -0800)]
Adding an Apache-licensed implementation of org.json

Change-Id: I1b67bac70bd25220a619e6ebe61f7f1c6f316faa

14 years agoRemoving the non-free org.json implementation
Jesse Wilson [Sat, 13 Mar 2010 02:35:28 +0000 (18:35 -0800)]
Removing the non-free org.json implementation

Change-Id: Ife53082824f5916665f198d4b2fb863271841ce0

14 years agoMerge "A cleanroom implementation of the org.json API."
Jesse Wilson [Sat, 13 Mar 2010 02:32:45 +0000 (18:32 -0800)]
Merge "A cleanroom implementation of the org.json API."

14 years agoA cleanroom implementation of the org.json API.
Jesse Wilson [Fri, 12 Mar 2010 08:52:29 +0000 (00:52 -0800)]
A cleanroom implementation of the org.json API.

This implementation lacks documentation. I intend to write that after checking
it into the master branch. By not waiting we'll have more time to exercise the
code, if only in Google's own applications.

This passes all of my tests. I rewrote some of the tests to make Crockford's
implementation fail. The tests that fail on Crockford's implementation are:

  JSONArrayTest
  testEqualsAndHashCode equals() not consistent with hashCode()
  testTokenerConstructorParseFail StackOverflowError
  testStringConstructorParseFail StackOverflowError

  JSONObjectTest
  testOtherNumbers Object.put() accepted a NaN (via a custom Number class)
  testMapConstructorWithBogusEntries JSONObject constructor doesn't validate its input!

  JSONTokenerTest
  testNextNWithAllRemaining off-by-one error?
  testNext0 Returning an empty string should be valid
  testNextCleanCommentsTrailingSingleSlash nextClean doesn't consume a trailing slash
  assertNotClean The character line tabulation is not whitespace according to the JSON spec.
  testNextToDoesntStopOnNull nextTo() shouldn't stop after \0 characters
  testNextToConsumesNull nextTo shouldn't consume \0.
  testSkipToStopsOnNull skipTo shouldn't stop when it sees '\0'

  ParsingTest
  testParsingLargeHexValues For input "0x80000000" Hex values are parsed as Strings if their signed value is greater than Integer.MAX_VALUE.
  testSyntaxProblemUnterminatedArray Stack overflowed on input "["

Change-Id: I44c4a4a698a66bf043ed339d6bd804951e732cbf

14 years agoRemove dead obfuscatory code.
Elliott Hughes [Sat, 13 Mar 2010 01:21:40 +0000 (17:21 -0800)]
Remove dead obfuscatory code.

Bug: 2509206
Change-Id: I72a34e1f80fd6936d255b94daf5683cc2a0f2327

14 years agoStay in the dbg interpreter if the entry reason is to deal with exceptions.
Ben Cheng [Sat, 13 Mar 2010 00:58:24 +0000 (16:58 -0800)]
Stay in the dbg interpreter if the entry reason is to deal with exceptions.

Bug: 2487514
Change-Id: Id1eb91f347ff772714d9560370b9994f46d3c5cb