OSDN Git Service

android-x86/dalvik.git
14 years agoam cc4c69bc: am 023a932a: Merge change 24788 into eclair
Jesse Wilson [Thu, 17 Sep 2009 01:01:52 +0000 (18:01 -0700)]
am cc4c69bc: am 023a932a: Merge change 24788 into eclair

Merge commit 'cc4c69bc91a8813e654095acf13e80a4d478eb24'

* commit 'cc4c69bc91a8813e654095acf13e80a4d478eb24':
  Fixing the delimiter for the HTTP "Accept" header to be well-formed.

14 years agoresolved conflicts for merge of 3eae287e to master
Bob Lee [Wed, 16 Sep 2009 17:23:01 +0000 (10:23 -0700)]
resolved conflicts for merge of 3eae287e to master

14 years agoMerge change 25222
Android (Google) Code Review [Wed, 16 Sep 2009 14:22:29 +0000 (10:22 -0400)]
Merge change 25222

* changes:
  Speling.

14 years agoMerge change 25156
Android (Google) Code Review [Wed, 16 Sep 2009 14:21:54 +0000 (10:21 -0400)]
Merge change 25156

* changes:
  Phantom fun.

14 years agoSpeling.
Andy McFadden [Wed, 16 Sep 2009 03:01:40 +0000 (20:01 -0700)]
Speling.

14 years agoMerge change 24794
Android (Google) Code Review [Tue, 15 Sep 2009 20:41:13 +0000 (16:41 -0400)]
Merge change 24794

* changes:
  Fix the final [mis]uses of iscopy.

14 years agoFix the final [mis]uses of iscopy.
Elliott Hughes [Fri, 11 Sep 2009 23:26:04 +0000 (16:26 -0700)]
Fix the final [mis]uses of iscopy.

I finally got round to going through all the dalvik/libcore/ calls to the
following routines, in cases where the final argument ("iscopy") is non-NULL:

 Get*ArrayElements
 GetStringChars
 GetStringUTFChars
 GetStringCritical
 Get*ArrayCritical

The calls in sqlite_jni.c were neither assuming that setting "iscopy" requests
a copy (a bug we've seen elsewhere), nor were they making use of the result.
I've changed these to pass NULL to make their lack of interest explicit. I've
also fixed a compiler warning (signed/unsigned comparison).

The ones in org_apache_harmony_luni_platform_OSFileSystem.cpp were genuine
errors. The author was under the misapprehension that iscopy == JNI_FALSE
implies that you do not need to call the corresponding "Release" function.
I've fixed those. (I haven't addressed the fact that readvImpl and writevImpl
differ by just one token, nor have I addressed the fact that -- in theory
though not with our current GC -- any of the GetIntArrayElements could fail.)

14 years agoam 7962ad6a: am 00c464ff: Merge change 24751 into eclair
Raphael [Tue, 15 Sep 2009 20:19:12 +0000 (13:19 -0700)]
am 7962ad6a: am 00c464ff: Merge change 24751 into eclair

Merge commit '7962ad6a3154d86026a17be952295bdec64f1118'

* commit '7962ad6a3154d86026a17be952295bdec64f1118':
  Windows SDK: add support for -J option to dx.bat

14 years agoam 60195db6: am 9ccfb95e: Merge change 24723 into eclair
Lorenzo Colitti [Tue, 15 Sep 2009 20:16:54 +0000 (13:16 -0700)]
am 60195db6: am 9ccfb95e: Merge change 24723 into eclair

Merge commit '60195db609e4f5125e39348651d7a06ff807cc96'

* commit '60195db609e4f5125e39348651d7a06ff807cc96':
  Remove code duplication in InetAddress.getByAddress.

14 years agoam 08211fc1: am 1e49340a: Merge change 24320 into eclair
Lorenzo Colitti [Tue, 15 Sep 2009 20:16:16 +0000 (13:16 -0700)]
am 08211fc1: am 1e49340a: Merge change 24320 into eclair

Merge commit '08211fc192db0bd48e78103678a902c32d67480d'

* commit '08211fc192db0bd48e78103678a902c32d67480d':
  Simplify networking code initialization using static structures instead of code.

14 years agoam 21d20097: am 173086a3: Merge change 24620 into eclair
Jesse Wilson [Tue, 15 Sep 2009 20:14:11 +0000 (13:14 -0700)]
am 21d20097: am 173086a3: Merge change 24620 into eclair

Merge commit '21d20097e7a2015ac8fb55ff38e0242899b43936'

* commit '21d20097e7a2015ac8fb55ff38e0242899b43936':
  Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.

14 years agoUpdate regex to Harmony r802921.
Jesse Wilson [Mon, 14 Sep 2009 22:30:14 +0000 (15:30 -0700)]
Update regex to Harmony r802921.

Notable changes:
 - Reordered methods to be consistent with Harmony. Although our
   implementations are significantly different, this will make
   it easier to track Javadoc and signature changes.
 - Some unchecked exceptions removed from method signatures
 - Changed StringBuffer use to StringBuilder
 - Changed PatternSyntaxException description field to 'desc' for
   serialization compatibility.

commit deba65caf92e9c5b77b29bcf9dcb26d637af90cb
Merge: b239d4a 457c6cc
Author: Jesse Wilson <jessewilson@google.com>
Date:   Wed Aug 12 09:23:58 2009 -0700

    Merge branch 'regex_802921' into regex_dalvik

    Conflicts:
     libcore/regex/.classpath
     libcore/regex/.settings/org.eclipse.jdt.core.prefs
     libcore/regex/build.xml
     libcore/regex/src/main/java/java/util/regex/AbstractCharClass.java
     libcore/regex/src/main/java/java/util/regex/AbstractSet.java
     libcore/regex/src/main/java/java/util/regex/CIDecomposedCharSet.java
     libcore/regex/src/main/java/java/util/regex/CharClass.java
     libcore/regex/src/main/java/java/util/regex/DecomposedCharSet.java
     libcore/regex/src/main/java/java/util/regex/IntArrHash.java
     libcore/regex/src/main/java/java/util/regex/JointSet.java
     libcore/regex/src/main/java/java/util/regex/Lexer.java
     libcore/regex/src/main/java/java/util/regex/MatchResult.java
     libcore/regex/src/main/java/java/util/regex/Matcher.java
     libcore/regex/src/main/java/java/util/regex/Pattern.java
     libcore/regex/src/main/java/java/util/regex/PatternSyntaxException.java
     libcore/regex/src/main/java/java/util/regex/SequenceSet.java
     libcore/regex/src/main/java/java/util/regex/UCIDecomposedCharSet.java
     libcore/regex/src/main/java/java/util/regex/UCISequenceSet.java
     libcore/regex/src/main/java/org/apache/harmony/regex/internal/nls/messages.properties
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ModeTest.java
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Pattern2Test.java
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternSyntaxExceptionTest.java
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ReplaceTest.java
     libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java

commit b239d4a17905f9e0b609eeaa12de9dfba433c44a
Author: Jesse Wilson <jessewilson@google.com>
Date:   Wed Aug 12 08:37:21 2009 -0700

    Dalvik Regex

commit 457c6cca0629f20b118cd128353439763e40fe9e
Author: Jesse Wilson <jessewilson@google.com>
Date:   Wed Aug 12 08:36:40 2009 -0700

    Regex 802921

commit 51f4e67d71a8f92d8efa073fab32c540f6015594
Author: Jesse Wilson <jessewilson@google.com>
Date:   Wed Aug 12 08:34:57 2009 -0700

    Regex 527399

14 years agoMerge change 24714
Android (Google) Code Review [Mon, 14 Sep 2009 20:23:36 +0000 (16:23 -0400)]
Merge change 24714

* changes:
  Remove duplicate copies of ICU error translation.

14 years agoam 023a932a: Merge change 24788 into eclair
Jesse Wilson [Mon, 14 Sep 2009 17:46:42 +0000 (10:46 -0700)]
am 023a932a: Merge change 24788 into eclair

Merge commit '023a932add8087c96d59ea74135b28bb5e1ac16d' into eclair-plus-aosp

* commit '023a932add8087c96d59ea74135b28bb5e1ac16d':
  Fixing the delimiter for the HTTP "Accept" header to be well-formed.

14 years agoMerge change 24788 into eclair
Android (Google) Code Review [Mon, 14 Sep 2009 17:39:08 +0000 (13:39 -0400)]
Merge change 24788 into eclair

* changes:
  Fixing the delimiter for the HTTP "Accept" header to be well-formed.

14 years agoam efa0dcd5: Merge change 24508 into eclair
Bob Lee [Sat, 12 Sep 2009 06:05:53 +0000 (23:05 -0700)]
am efa0dcd5: Merge change 24508 into eclair

Merge commit 'efa0dcd52c030d2ace844070902979dd09e2c881' into eclair-plus-aosp

* commit 'efa0dcd52c030d2ace844070902979dd09e2c881':
  Addressed reviewer comments.

14 years agoMerge change 24508 into eclair
Android (Google) Code Review [Sat, 12 Sep 2009 05:57:05 +0000 (01:57 -0400)]
Merge change 24508 into eclair

* changes:
  Addressed reviewer comments.

14 years agoRemove unused WITH_OBJECT_HEADERS code.
Carl Shapiro [Fri, 11 Sep 2009 23:30:01 +0000 (16:30 -0700)]
Remove unused WITH_OBJECT_HEADERS code.

14 years agoam 00c464ff: Merge change 24751 into eclair
Raphael [Fri, 11 Sep 2009 23:34:25 +0000 (16:34 -0700)]
am 00c464ff: Merge change 24751 into eclair

Merge commit '00c464ff62c27dc12ef70f3b2d97e8b356ad21e0' into eclair-plus-aosp

* commit '00c464ff62c27dc12ef70f3b2d97e8b356ad21e0':
  Windows SDK: add support for -J option to dx.bat

14 years agoMerge change 24751 into eclair
Android (Google) Code Review [Fri, 11 Sep 2009 23:24:46 +0000 (19:24 -0400)]
Merge change 24751 into eclair

* changes:
  Windows SDK: add support for -J option to dx.bat

14 years agoFixing the delimiter for the HTTP "Accept" header to be well-formed.
Jesse Wilson [Fri, 11 Sep 2009 23:20:49 +0000 (16:20 -0700)]
Fixing the delimiter for the HTTP "Accept" header to be well-formed.

See bug 2107897.

14 years agoWindows SDK: add support for -J option to dx.bat
Raphael [Fri, 11 Sep 2009 20:33:59 +0000 (13:33 -0700)]
Windows SDK: add support for -J option to dx.bat

BUG 1999508

Change-Id: I0c481d2cc0a96d1ca83aaa56c46c73eae17c2246

14 years agoCorrect a typo in THUMB opcode name.
Ben Cheng [Fri, 11 Sep 2009 22:34:19 +0000 (15:34 -0700)]
Correct a typo in THUMB opcode name.

14 years agoMerge change 24758
Android (Google) Code Review [Fri, 11 Sep 2009 22:05:07 +0000 (18:05 -0400)]
Merge change 24758

* changes:
  Model resource usage for each Thumb/Thumb2 instrution.

14 years agoMerge change 24759
Android (Google) Code Review [Fri, 11 Sep 2009 21:52:22 +0000 (17:52 -0400)]
Merge change 24759

* changes:
  Comment out debugging output.

14 years agoModel resource usage for each Thumb/Thumb2 instrution.
Ben Cheng [Fri, 11 Sep 2009 20:42:05 +0000 (13:42 -0700)]
Model resource usage for each Thumb/Thumb2 instrution.

This is an mid-point checkin to avoid future merge nightmare for the register
allocator work.

14 years agoMerge change 24610
Android (Google) Code Review [Fri, 11 Sep 2009 21:13:51 +0000 (17:13 -0400)]
Merge change 24610

* changes:
  Several small native code fixes.

14 years agoComment out debugging output.
Elliott Hughes [Fri, 11 Sep 2009 21:10:07 +0000 (14:10 -0700)]
Comment out debugging output.

The other two copies of this code have this line commented out, and I assume
it's only active here by accident.

14 years agoAddressed reviewer comments.
Bob Lee [Wed, 9 Sep 2009 22:36:29 +0000 (00:36 +0200)]
Addressed reviewer comments.

14 years agoam 9ccfb95e: Merge change 24723 into eclair
Lorenzo Colitti [Fri, 11 Sep 2009 20:27:24 +0000 (13:27 -0700)]
am 9ccfb95e: Merge change 24723 into eclair

Merge commit '9ccfb95e597a93020f2731c734c2a65e743fb601' into eclair-plus-aosp

* commit '9ccfb95e597a93020f2731c734c2a65e743fb601':
  Remove code duplication in InetAddress.getByAddress.

14 years agoMerge change 24723 into eclair
Android (Google) Code Review [Fri, 11 Sep 2009 20:20:28 +0000 (16:20 -0400)]
Merge change 24723 into eclair

* changes:
  Remove code duplication in InetAddress.getByAddress.

14 years agoRemove code duplication in InetAddress.getByAddress.
Lorenzo Colitti [Fri, 11 Sep 2009 18:28:51 +0000 (11:28 -0700)]
Remove code duplication in InetAddress.getByAddress.

Change-Id: Id2d72572fbe5b26ff4be9a2c959c41a48b859ea0

14 years agoam 1e49340a: Merge change 24320 into eclair
Lorenzo Colitti [Fri, 11 Sep 2009 19:16:32 +0000 (12:16 -0700)]
am 1e49340a: Merge change 24320 into eclair

Merge commit '1e49340a8249b147a2bb4f12e242ac5aedbddece' into eclair-plus-aosp

* commit '1e49340a8249b147a2bb4f12e242ac5aedbddece':
  Simplify networking code initialization using static structures instead of code.

14 years agoMerge change 24320 into eclair
Android (Google) Code Review [Fri, 11 Sep 2009 19:06:47 +0000 (15:06 -0400)]
Merge change 24320 into eclair

* changes:
  Simplify networking code initialization using static structures instead of code. Fix an uninitialized variable.

14 years agoMerge change 24634
Android (Google) Code Review [Fri, 11 Sep 2009 17:59:40 +0000 (13:59 -0400)]
Merge change 24634

* changes:
  Remove NativeBN_bn2twosComp.

14 years agoam 173086a3: Merge change 24620 into eclair
Jesse Wilson [Fri, 11 Sep 2009 17:58:54 +0000 (10:58 -0700)]
am 173086a3: Merge change 24620 into eclair

Merge commit '173086a363fd54e9e905409d3db06b01dbd0ccbd' into eclair-plus-aosp

* commit '173086a363fd54e9e905409d3db06b01dbd0ccbd':
  Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.

14 years agoRemove duplicate copies of ICU error translation.
Elliott Hughes [Fri, 11 Sep 2009 17:58:44 +0000 (10:58 -0700)]
Remove duplicate copies of ICU error translation.

For want of an 'extern "C"', we seem to have grown several duplicates of
icu4jni_error.

14 years agoMerge change 24620 into eclair
Android (Google) Code Review [Fri, 11 Sep 2009 17:51:13 +0000 (13:51 -0400)]
Merge change 24620 into eclair

* changes:
  Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.

14 years agoRemove NativeBN_bn2twosComp.
Elliott Hughes [Fri, 11 Sep 2009 01:24:33 +0000 (18:24 -0700)]
Remove NativeBN_bn2twosComp.

NativeBN_bn2twosComp doesn't do what it claims to: it's an exact copy of
NativeBN_BN_bn2bin (observe which OpenSSL BN_ function it calls!), and -- from
the OpenSSL documentation -- that function "converts the absolute value of [its
argument] into big-endian form".

OpenSSL doesn't actually sport any appropriate function to call here, but
luckily this code isn't called anywhere, and so can be removed.

(BigInteger.toByteArray -- the most likely caller of this code -- seems to
do the right thing, using Java code to make a big-endian two's-complement
byte[]. Likewise, the conversion from a big-endian two's-complement byte[]
for the corresponding BigInteger constructor looks right too, using native
code to twiddle the bits itself.)

14 years agoFix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.
Jesse Wilson [Fri, 11 Sep 2009 00:15:47 +0000 (17:15 -0700)]
Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.

14 years agoSimplify networking code initialization using static structures instead of code.
Lorenzo Colitti [Wed, 9 Sep 2009 01:30:56 +0000 (18:30 -0700)]
Simplify networking code initialization using static structures instead of code.
Fix an uninitialized variable.

Change-Id: Id9064a185525bfe072b244ea3d2acb56e5e185cd

14 years agoMerge change 24595
Android (Google) Code Review [Thu, 10 Sep 2009 23:31:30 +0000 (19:31 -0400)]
Merge change 24595

* changes:
  Display additional information on stack overflow.

14 years agoam 060ed889: am 20677ed1: dalvik: Use common SchedPolicy type and fix getpid() vs...
San Mehat [Thu, 10 Sep 2009 23:21:48 +0000 (16:21 -0700)]
am 060ed889: am 20677ed1: dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug

Merge commit '060ed88949321e193e95976c41e647cb46b9778b'

* commit '060ed88949321e193e95976c41e647cb46b9778b':
  dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug

14 years agoam 20677ed1: dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
San Mehat [Thu, 10 Sep 2009 23:12:09 +0000 (16:12 -0700)]
am 20677ed1: dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug

Merge commit '20677ed1a7114a2aa51086d5097f6328cd4fb94d' into eclair-plus-aosp

* commit '20677ed1a7114a2aa51086d5097f6328cd4fb94d':
  dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug

14 years agoSeveral small native code fixes.
Elliott Hughes [Thu, 10 Sep 2009 23:09:29 +0000 (16:09 -0700)]
Several small native code fixes.

* Don't throw OutOfMemoryError manually in Adler32/CRC32: the VM does that for
us if GetPrimitiveArrayCritical needs, but fails, to allocate memory.

* Don't use anything but NULL for the "iscopy" argument to Get*ArrayElements.
The other users of this argument (removed earlier this week) were under the
mistaken impression that it's an "in" parameter rather than an "out" parameter,
and since these remaining callers aren't actually using the result, let's
remove the cruft.

* Move the null check in harmony_io_openImpl for "path" to come *before* the
first dereference.

* Make harmony_io_ttyReadImpl just delegate to harmony_io_readImpl since,
apart from the zero-length read check, they were identical.

* Remove the dead function throwIOExceptionStr from the OpenSSLSessionImpl
native code.

Tested on sapphire-eng.

14 years agodalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
San Mehat [Thu, 10 Sep 2009 16:30:03 +0000 (09:30 -0700)]
dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug

Signed-off-by: San Mehat <san@google.com>
14 years agoDisplay additional information on stack overflow.
Andy McFadden [Thu, 10 Sep 2009 22:34:19 +0000 (15:34 -0700)]
Display additional information on stack overflow.

This required passing an additional argument into dvmHandleStackOverflow,
which is called directly from mterp.  Fortunately the method being
called is sitting in a register for both ARM and x86, so this is a
fairly simple change.

For internal bug 2110533.

14 years agoMerge change 24439
Android (Google) Code Review [Thu, 10 Sep 2009 20:40:01 +0000 (16:40 -0400)]
Merge change 24439

* changes:
  Fix unnecessary GetPrimitiveArrayCritical users.

14 years agoMerge change 24470
Android (Google) Code Review [Thu, 10 Sep 2009 20:33:23 +0000 (16:33 -0400)]
Merge change 24470

* changes:
  Use GetStringRegion/GetStringUTFRegion where appropriate.

14 years agoMerge change 24537
Android (Google) Code Review [Thu, 10 Sep 2009 17:34:00 +0000 (13:34 -0400)]
Merge change 24537

* changes:
  Add support for profiling when loop optimizations are active

14 years agoUse GetStringRegion/GetStringUTFRegion where appropriate.
Elliott Hughes [Thu, 10 Sep 2009 01:15:23 +0000 (18:15 -0700)]
Use GetStringRegion/GetStringUTFRegion where appropriate.

Note that the changes to DecimalFormatInterface.cpp and RBNFInterface.cpp
are just minor tidy-ups, fixing an issue where the early error exit wouldn't
call ReleaseStringChars to undo the earlier call to GetStringChars. Also
remove a dead function and fix a comment in ExpatParser.cpp.

Tested on sapphire-eng.

Bug: 1639287

14 years agoAdd support for profiling when loop optimizations are active
Bill Buzbee [Thu, 10 Sep 2009 17:10:38 +0000 (10:10 -0700)]
Add support for profiling when loop optimizations are active

14 years agoam 95934be3: am 03c7547c: Merge change 24425 into eclair
San Mehat [Thu, 10 Sep 2009 16:24:13 +0000 (09:24 -0700)]
am 95934be3: am 03c7547c: Merge change 24425 into eclair

Merge commit '95934be333d74ac48c19ae40a8207361a913516a'

* commit '95934be333d74ac48c19ae40a8207361a913516a':
  vm: Add support for using scheduler policies instead of cgroups

14 years agoam 03c7547c: Merge change 24425 into eclair
San Mehat [Thu, 10 Sep 2009 15:29:58 +0000 (08:29 -0700)]
am 03c7547c: Merge change 24425 into eclair

Merge commit '03c7547c40e6fc5b29b929b64f114e2dd3894e8e' into eclair-plus-aosp

* commit '03c7547c40e6fc5b29b929b64f114e2dd3894e8e':
  vm: Add support for using scheduler policies instead of cgroups

14 years agoMerge change 24425 into eclair
Android (Google) Code Review [Thu, 10 Sep 2009 15:24:16 +0000 (11:24 -0400)]
Merge change 24425 into eclair

* changes:
  vm: Add support for using scheduler policies instead of cgroups

14 years agoPhantom fun.
Andy McFadden [Fri, 4 Sep 2009 22:39:54 +0000 (15:39 -0700)]
Phantom fun.

Mark PhantomReference fields as volatile, since the GC can alter them.

Added a simple phantom reference exerciser.

14 years agovm: Add support for using scheduler policies instead of cgroups
San Mehat [Wed, 9 Sep 2009 03:29:15 +0000 (20:29 -0700)]
vm: Add support for using scheduler policies instead of cgroups

Signed-off-by: San Mehat <san@google.com>
14 years agoam 2e7b31f3: (-s ours) am 500464de: DO NOT MERGE: Do not enable JIT_TUNING and assert...
Ben Cheng [Wed, 9 Sep 2009 23:31:37 +0000 (16:31 -0700)]
am 2e7b31f3: (-s ours) am 500464de: DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

Merge commit '2e7b31f368be01437da025f2e12dc4dcbff46f5d'

* commit '2e7b31f368be01437da025f2e12dc4dcbff46f5d':
  DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

14 years agoam 500464de: DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with...
Ben Cheng [Wed, 9 Sep 2009 22:47:09 +0000 (15:47 -0700)]
am 500464de: DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

Merge commit '500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7' into eclair-plus-aosp

* commit '500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7':
  DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

14 years agoFix unnecessary GetPrimitiveArrayCritical users.
Elliott Hughes [Wed, 9 Sep 2009 22:16:59 +0000 (15:16 -0700)]
Fix unnecessary GetPrimitiveArrayCritical users.

Tested on sapphire-eng.

Bug: 1639287

14 years agoDO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.
Ben Cheng [Wed, 9 Sep 2009 21:14:28 +0000 (14:14 -0700)]
DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

14 years agoMerge change 24402
Android (Google) Code Review [Wed, 9 Sep 2009 20:54:08 +0000 (16:54 -0400)]
Merge change 24402

* changes:
  Use GetByteArrayRegion instead of GetByteArrayElements.

14 years agoMerge change 24309
Android (Google) Code Review [Wed, 9 Sep 2009 20:50:54 +0000 (16:50 -0400)]
Merge change 24309

* changes:
  Use Get*ArrayRegion/Set*ArrayRegion instead of Get*ArrayElements.

14 years agoUse Get*ArrayRegion/Set*ArrayRegion instead of Get*ArrayElements.
Elliott Hughes [Wed, 9 Sep 2009 02:44:54 +0000 (19:44 -0700)]
Use Get*ArrayRegion/Set*ArrayRegion instead of Get*ArrayElements.

This fixes all instances in the networking code, but doesn't address similar
patterns, nor non-networking code. This seemed like a reasonably-sized
meaningful chunk. Tested on sapphire-eng.

Bug: 1639287

14 years agoUse GetByteArrayRegion instead of GetByteArrayElements.
Elliott Hughes [Wed, 9 Sep 2009 19:02:08 +0000 (12:02 -0700)]
Use GetByteArrayRegion instead of GetByteArrayElements.

I've also cleaned up the two calls to free(3) in ubidi_close; the former had
an unnecessary NULL check, and the latter was indented as if it belonged to the
if (but didn't).

Tested on sapphire-eng.

14 years agoMerge change 24308
Android (Google) Code Review [Wed, 9 Sep 2009 18:20:17 +0000 (14:20 -0400)]
Merge change 24308

* changes:
  Remove @KnownFailure from a working test.

14 years agoam ad8efa12: am 7f5e6aa1: Merge change 23896 into eclair
Urs Grob [Wed, 9 Sep 2009 17:55:56 +0000 (10:55 -0700)]
am ad8efa12: am 7f5e6aa1: Merge change 23896 into eclair

Merge commit 'ad8efa123b7133895b9c198a84a32020869eba18'

* commit 'ad8efa123b7133895b9c198a84a32020869eba18':
  InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary

14 years agoresolved conflicts for merge of 9b5264c8 to master
Android Git Automerger [Wed, 9 Sep 2009 17:48:47 +0000 (10:48 -0700)]
resolved conflicts for merge of 9b5264c8 to master

14 years agoRemove @KnownFailure from a working test.
Elliott Hughes [Wed, 9 Sep 2009 02:50:08 +0000 (19:50 -0700)]
Remove @KnownFailure from a working test.

The bug causing this test's known failure was fixed 2009-07-16.

Bug: 1481226

14 years agoam 7f5e6aa1: Merge change 23896 into eclair
Urs Grob [Tue, 8 Sep 2009 20:38:03 +0000 (13:38 -0700)]
am 7f5e6aa1: Merge change 23896 into eclair

Merge commit '7f5e6aa1503d13300c277225bf4eea9e5a11495a' into eclair-plus-aosp

* commit '7f5e6aa1503d13300c277225bf4eea9e5a11495a':
  InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary

14 years agoam 9dc72a3c: Modified Thread.c to allow sampling profiler thread in zygote. Added...
Bob Lee [Tue, 8 Sep 2009 20:38:00 +0000 (13:38 -0700)]
am 9dc72a3c: Modified Thread.c to allow sampling profiler thread in zygote. Added a function that queries the native thread status. Modified the profiler to sample every thread at a fixed interval instead of adjusting the delay based on the number of threads. This wil

Merge commit '9dc72a3c54af7201b6b85d96dba23a5f85309d9b' into eclair-plus-aosp

* commit '9dc72a3c54af7201b6b85d96dba23a5f85309d9b':
  Modified Thread.c to allow sampling profiler thread in zygote. Added a function that

14 years agoAdd missing calls to ReleaseByteArrayElements.
Elliott Hughes [Tue, 8 Sep 2009 20:19:16 +0000 (13:19 -0700)]
Add missing calls to ReleaseByteArrayElements.

Without this fix, the two new tests cause the VM to abort like this:

W/dalvikvm(  386): ReferenceTable overflow (max=1024)
W/dalvikvm(  386): Last 10 entries in JNI pinned array reference table:
W/dalvikvm(  386):  1014: 0x4038e018 cls=[B (1044 bytes)
W/dalvikvm(  386):  1015: 0x4038e430 cls=[B (1044 bytes)
W/dalvikvm(  386):  1016: 0x4038e848 cls=[B (1044 bytes)
W/dalvikvm(  386):  1017: 0x4038ec60 cls=[B (1044 bytes)
W/dalvikvm(  386):  1018: 0x4038f078 cls=[B (1044 bytes)
W/dalvikvm(  386):  1019: 0x4038f490 cls=[B (1044 bytes)
W/dalvikvm(  386):  1020: 0x4038f8a8 cls=[B (1044 bytes)
W/dalvikvm(  386):  1021: 0x4038fcc0 cls=[B (1044 bytes)
W/dalvikvm(  386):  1022: 0x403900d8 cls=[B (1044 bytes)
W/dalvikvm(  386):  1023: 0x403904f0 cls=[B (1044 bytes)
W/dalvikvm(  386): JNI pinned array reference table summary (1024 entries):
W/dalvikvm(  386):  1024 of [B 1044B (1024 unique)
W/dalvikvm(  386): Memory held directly by native code is 1069056 bytes
E/dalvikvm(  386): Failed adding to JNI pinned array ref table (1024 entries)
I/dalvikvm(  386): "main" prio=5 tid=3 RUNNABLE
I/dalvikvm(  386):   | group="main" sCount=0 dsCount=0 s=N obj=0x4001e2b8 self=0xb488
I/dalvikvm(  386):   | sysTid=386 nice=0 sched=0/0 cgrp=default handle=-1344005452
I/dalvikvm(  386):   at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.nativeinit(Native Method)
I/dalvikvm(  386):   at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.init(OpenSSLSocketImpl.java:126)
I/dalvikvm(  386):   at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.<init>(OpenSSLSocketImpl.java:158)
I/dalvikvm(  386):   at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketFactoryImpl.createSocket(OpenSSLSocketFactoryImpl.java:61)
I/dalvikvm(  386):   at tests.api.javax.net.ssl.SSLSocketTest.test_creationStressTest(SSLSocketTest.java:359)
...

Tested on sapphire-eng.

No bug; found by inspection when investigating bug 1639287.

14 years agoMerge change 24055
Android (Google) Code Review [Tue, 8 Sep 2009 17:33:34 +0000 (10:33 -0700)]
Merge change 24055

* changes:
  Fix Package.isCompatibleWith.

14 years agoMerge change 23734
Android (Google) Code Review [Tue, 8 Sep 2009 17:29:53 +0000 (10:29 -0700)]
Merge change 23734

* changes:
  Updated expected outputs in dalvik benchmarks. Improved debugging output and added spin loop on detection of divergence in self verification tool.

14 years agoMerge change 24036
Android (Google) Code Review [Tue, 8 Sep 2009 17:06:03 +0000 (10:06 -0700)]
Merge change 24036

* changes:
  Reduce a log message, stifle a gcc warning.

14 years agoMerge change 23896 into eclair
Android (Google) Code Review [Mon, 7 Sep 2009 07:52:55 +0000 (00:52 -0700)]
Merge change 23896 into eclair

* changes:
  InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary

14 years agoModified Thread.c to allow sampling profiler thread in zygote. Added a function that
Bob Lee [Sat, 5 Sep 2009 01:28:16 +0000 (18:28 -0700)]
Modified Thread.c to allow sampling profiler thread in zygote. Added a function that
queries the native thread status. Modified the profiler to sample every thread at
a fixed interval instead of adjusting the delay based on the number of threads. This
will make it easier to compare results across apps. Added ability to shut down
the profiler thread. Added code to track whether the method was a leaf or a
caller.

14 years agoFix Package.isCompatibleWith.
Elliott Hughes [Sat, 5 Sep 2009 01:14:24 +0000 (18:14 -0700)]
Fix Package.isCompatibleWith.

Note that this doesn't help us because to Dalvik, all packages have
version "0.0".

Bug: 2099697

14 years agoReduce a log message, stifle a gcc warning.
Andy McFadden [Fri, 4 Sep 2009 22:38:13 +0000 (15:38 -0700)]
Reduce a log message, stifle a gcc warning.

14 years agoUpdated expected outputs in dalvik benchmarks. Improved debugging output and added...
Ben Cheng [Fri, 21 Aug 2009 23:18:46 +0000 (16:18 -0700)]
Updated expected outputs in dalvik benchmarks. Improved debugging output and added spin loop on detection of divergence in self verification tool.

14 years agoMerge change 23992
Android (Google) Code Review [Fri, 4 Sep 2009 20:54:47 +0000 (13:54 -0700)]
Merge change 23992

* changes:
  Inline Sqrt bug fix; add support for fp/gen register copies

14 years agoam ed216806: am f2f6f8b8: Document that createSocketFileDescriptor throws an exceptio...
Lorenzo Colitti [Fri, 4 Sep 2009 20:52:28 +0000 (13:52 -0700)]
am ed216806: am f2f6f8b8: Document that createSocketFileDescriptor throws an exception on failure.

Merge commit 'ed21680602783711c7dac9675ae65ad329a050c1'

* commit 'ed21680602783711c7dac9675ae65ad329a050c1':
  Document that createSocketFileDescriptor throws an exception on failure.

14 years agoam f2f6f8b8: Document that createSocketFileDescriptor throws an exception on failure.
Lorenzo Colitti [Fri, 4 Sep 2009 20:50:33 +0000 (13:50 -0700)]
am f2f6f8b8: Document that createSocketFileDescriptor throws an exception on failure.

Merge commit 'f2f6f8b8d47733be0f291612730690b5ce379257' into eclair-plus-aosp

* commit 'f2f6f8b8d47733be0f291612730690b5ce379257':
  Document that createSocketFileDescriptor throws an exception on failure.

14 years agoDocument that createSocketFileDescriptor throws an exception on failure.
Lorenzo Colitti [Fri, 4 Sep 2009 20:35:10 +0000 (13:35 -0700)]
Document that createSocketFileDescriptor throws an exception on failure.

Change-Id: Ic002b4dc8c40d798316afbab7a14bd81593e2541

14 years agoInline Sqrt bug fix; add support for fp/gen register copies
Bill Buzbee [Mon, 31 Aug 2009 17:25:55 +0000 (10:25 -0700)]
Inline Sqrt bug fix; add support for fp/gen register copies

14 years agoam f751aeb1: am 3a4e4249: Merge change 23983 into eclair
Lorenzo Colitti [Fri, 4 Sep 2009 19:11:27 +0000 (12:11 -0700)]
am f751aeb1: am 3a4e4249: Merge change 23983 into eclair

Merge commit 'f751aeb179cd531df610689217f36e760bd25639'

* commit 'f751aeb179cd531df610689217f36e760bd25639':
  If an error occurs when creating a socket, don't call any more JNI methods

14 years agoam 3a4e4249: Merge change 23983 into eclair
Lorenzo Colitti [Fri, 4 Sep 2009 19:09:40 +0000 (12:09 -0700)]
am 3a4e4249: Merge change 23983 into eclair

Merge commit '3a4e4249032009b175ba6a3d0bcc682f97e5e650' into eclair-plus-aosp

* commit '3a4e4249032009b175ba6a3d0bcc682f97e5e650':
  If an error occurs when creating a socket, don't call any more JNI methods

14 years agoMerge change 23983 into eclair
Android (Google) Code Review [Fri, 4 Sep 2009 19:08:18 +0000 (12:08 -0700)]
Merge change 23983 into eclair

* changes:
  If an error occurs when creating a socket, don't call any more JNI methods (thus causing a segfault) but return immediately.

14 years agoIf an error occurs when creating a socket, don't call any more JNI methods
Lorenzo Colitti [Fri, 4 Sep 2009 18:59:12 +0000 (11:59 -0700)]
If an error occurs when creating a socket, don't call any more JNI methods
(thus causing a segfault) but return immediately.

Change-Id: I7d05997e38e631200542f85eba16b854d488d584

14 years agoam 4fa89f9d: am 09302d63: Merge change 23572 into eclair
Lorenzo Colitti [Fri, 4 Sep 2009 18:07:25 +0000 (11:07 -0700)]
am 4fa89f9d: am 09302d63: Merge change 23572 into eclair

Merge commit '4fa89f9d9af93f9d3b9125430160818f456aed5a'

* commit '4fa89f9d9af93f9d3b9125430160818f456aed5a':
  Do not check hash codes against golden values. Instead, spot check that they

14 years agoam 614eb57f: merge from open-source master
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:05:46 +0000 (11:05 -0700)]
am 614eb57f: merge from open-source master

Merge commit '614eb57fffcc5abe5c933452d297fdaa4ae98176'

* commit '614eb57fffcc5abe5c933452d297fdaa4ae98176':

14 years agoam d312ee58: am 02e04f8b: Merge change 22871 into eclair
Lorenzo Colitti [Fri, 4 Sep 2009 18:04:56 +0000 (11:04 -0700)]
am d312ee58: am 02e04f8b: Merge change 22871 into eclair

Merge commit 'd312ee58231aeb808cbed1083801413ba080ceac'

* commit 'd312ee58231aeb808cbed1083801413ba080ceac':
  More InetAddress fixes.

14 years agoam 5765fb64: (-s ours) am 365f9fbb: Merge change 23918 into eclair
Jesse Wilson [Fri, 4 Sep 2009 18:04:47 +0000 (11:04 -0700)]
am 5765fb64: (-s ours) am 365f9fbb: Merge change 23918 into eclair

Merge commit '5765fb64620d955a0bcadd14cb35f9a95df69072'

* commit '5765fb64620d955a0bcadd14cb35f9a95df69072':
  do not merge: Josh's optimized HashMap and Hashtable

14 years agoam 09302d63: Merge change 23572 into eclair
Lorenzo Colitti [Fri, 4 Sep 2009 17:51:19 +0000 (10:51 -0700)]
am 09302d63: Merge change 23572 into eclair

Merge commit '09302d631adbdc36edd3ec961149b8f0fe1931f1' into eclair-plus-aosp

* commit '09302d631adbdc36edd3ec961149b8f0fe1931f1':
  Do not check hash codes against golden values. Instead, spot check that they

14 years agoMerge change 23572 into eclair
Android (Google) Code Review [Fri, 4 Sep 2009 17:48:43 +0000 (10:48 -0700)]
Merge change 23572 into eclair

* changes:
  Do not check hash codes against golden values. Instead, spot check that they differ for different addresses and obvious values (e.g., 0 or 1) that might be returned by buggy implementations.

14 years agomerge from open-source master
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:50:42 +0000 (07:50 -0700)]
merge from open-source master

14 years agoInputStreamReader forgets to convert incomplete multibyte characters at the buffer...
Urs Grob [Wed, 2 Sep 2009 14:27:56 +0000 (16:27 +0200)]
InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary

BUG=2033986

14 years agoam 02e04f8b: Merge change 22871 into eclair
Lorenzo Colitti [Fri, 4 Sep 2009 01:46:01 +0000 (18:46 -0700)]
am 02e04f8b: Merge change 22871 into eclair

Merge commit '02e04f8b1e41ce341fd765a4f9086f4b2360cfd0' into eclair-plus-aosp

* commit '02e04f8b1e41ce341fd765a4f9086f4b2360cfd0':
  More InetAddress fixes.

14 years agoMerge change 22871 into eclair
Android (Google) Code Review [Fri, 4 Sep 2009 01:43:08 +0000 (18:43 -0700)]
Merge change 22871 into eclair

* changes:
  More InetAddress fixes.

14 years agoMore InetAddress fixes.
Lorenzo Colitti [Thu, 27 Aug 2009 01:41:06 +0000 (18:41 -0700)]
More InetAddress fixes.

1. Make sure getHostByAddrImpl actually throws UnknownHostException: set
   NI_NAMEREQD when calling getnameinfo to ensure it will fail if the IP
   address looked up does not have a name associated with it, and pass this
   exception back to the Java code. That way, the UnknownHostException passed
   back to the Java code has information on what went wrong.
2. Remove superfluous logging on reverse lookups in the C code.

Change-Id: Ie195ce1f12e7b43fbf75f494002804f9db68fd8c