OSDN Git Service
Carl Shapiro [Thu, 2 Sep 2010 03:15:49 +0000 (20:15 -0700)]
am
3d891ca4: am
27fc78f6: am
ca2d17e5: Merge "Bitmap naming clean-up." into gingerbread
Merge commit '
3d891ca44fe66a2c8c00afded6c192c25296f9c4' into dalvik-dev
* commit '
3d891ca44fe66a2c8c00afded6c192c25296f9c4':
Bitmap naming clean-up.
Elliott Hughes [Thu, 2 Sep 2010 03:15:44 +0000 (20:15 -0700)]
am
3e2c191b: am
7453145e: am
a1227409: Intrinsics for float/int and double/long conversions.
Merge commit '
3e2c191bb01bd53cfc5cf4f8e777f442ecaae6e4' into dalvik-dev
* commit '
3e2c191bb01bd53cfc5cf4f8e777f442ecaae6e4':
Intrinsics for float/int and double/long conversions.
Carl Shapiro [Thu, 2 Sep 2010 02:00:15 +0000 (19:00 -0700)]
am
27fc78f6: am
ca2d17e5: Merge "Bitmap naming clean-up." into gingerbread
Merge commit '
27fc78f6b8d5a641024c2bd393cddaf5a9f818aa'
* commit '
27fc78f6b8d5a641024c2bd393cddaf5a9f818aa':
Bitmap naming clean-up.
Elliott Hughes [Thu, 2 Sep 2010 02:00:10 +0000 (19:00 -0700)]
am
7453145e: am
a1227409: Intrinsics for float/int and double/long conversions.
Merge commit '
7453145e658dfe5b93bf19a997df617b0f66b136'
* commit '
7453145e658dfe5b93bf19a997df617b0f66b136':
Intrinsics for float/int and double/long conversions.
Carl Shapiro [Thu, 2 Sep 2010 01:38:47 +0000 (18:38 -0700)]
am
ca2d17e5: Merge "Bitmap naming clean-up." into gingerbread
Merge commit '
ca2d17e55ae11434c83e395867d3258f9b9b8474' into gingerbread-plus-aosp
* commit '
ca2d17e55ae11434c83e395867d3258f9b9b8474':
Bitmap naming clean-up.
Elliott Hughes [Thu, 2 Sep 2010 01:38:33 +0000 (18:38 -0700)]
am
a1227409: Intrinsics for float/int and double/long conversions.
Merge commit '
a1227409084c4a675cc83ada128f364506528b9c' into gingerbread-plus-aosp
* commit '
a1227409084c4a675cc83ada128f364506528b9c':
Intrinsics for float/int and double/long conversions.
Carl Shapiro [Thu, 2 Sep 2010 01:22:58 +0000 (18:22 -0700)]
Merge "Bitmap naming clean-up." into gingerbread
Carl Shapiro [Thu, 19 Aug 2010 04:04:31 +0000 (21:04 -0700)]
Bitmap naming clean-up.
Disambiguate bitmaps based on their use by adding a "curr" or "prev"
prefix. Also, fix names in a prototype to match the definition.
Elliott Hughes [Sat, 21 Aug 2010 01:47:36 +0000 (18:47 -0700)]
Intrinsics for float/int and double/long conversions.
[cherry-picked
e22bd84c8c8a57ddd86c21a1f65137d549b07935 from dalvik-dev to gingerbread]
Bug:
2935622
Change-Id: Ib4de19033dc4a08f41bf0eb0f7a21dcde216aae3
Dan Bornstein [Thu, 2 Sep 2010 00:21:23 +0000 (17:21 -0700)]
am
826ff7b0: am
b685b591: am
4a2b20a1: Let <stdbool.h> (or its substitute) get picked up via the preexisting mechanism in vm/Common.h.
Merge commit '
826ff7b0cb9964701ae77fb0132757a37c5a8418' into dalvik-dev
* commit '
826ff7b0cb9964701ae77fb0132757a37c5a8418':
Let <stdbool.h> (or its substitute) get picked up via the preexisting
Dan Bornstein [Thu, 2 Sep 2010 00:19:29 +0000 (17:19 -0700)]
am
b685b591: am
4a2b20a1: Let <stdbool.h> (or its substitute) get picked up via the preexisting mechanism in vm/Common.h.
Merge commit '
b685b5911262329759e6f2c8ec8a4465a18b324d'
* commit '
b685b5911262329759e6f2c8ec8a4465a18b324d':
Let <stdbool.h> (or its substitute) get picked up via the preexisting
Brian Carlstrom [Thu, 2 Sep 2010 00:12:11 +0000 (17:12 -0700)]
am
eb9eaf73: am
b204391f: am
ba2f27fb: Merge "Removal of more sampling profiler bits" into gingerbread
Merge commit '
eb9eaf73ac38449f0be043f6eb033349fb6a33dc' into dalvik-dev
* commit '
eb9eaf73ac38449f0be043f6eb033349fb6a33dc':
Removal of more sampling profiler bits
Brian Carlstrom [Thu, 2 Sep 2010 00:01:14 +0000 (17:01 -0700)]
am
b204391f: am
ba2f27fb: Merge "Removal of more sampling profiler bits" into gingerbread
Merge commit '
b204391f6846801c3df9cd5265340e256fb86ee5'
* commit '
b204391f6846801c3df9cd5265340e256fb86ee5':
Removal of more sampling profiler bits
Dan Bornstein [Wed, 1 Sep 2010 23:58:01 +0000 (16:58 -0700)]
am
4a2b20a1: Let <stdbool.h> (or its substitute) get picked up via the preexisting mechanism in vm/Common.h.
Merge commit '
4a2b20a1128b13dbcda9e7d1114f4d60a02431ed' into gingerbread-plus-aosp
* commit '
4a2b20a1128b13dbcda9e7d1114f4d60a02431ed':
Let <stdbool.h> (or its substitute) get picked up via the preexisting
Dan Bornstein [Wed, 1 Sep 2010 23:44:23 +0000 (16:44 -0700)]
Let <stdbool.h> (or its substitute) get picked up via the preexisting
mechanism in vm/Common.h.
Change-Id: I6b79ee3d67b23d8077567a1bce0a58ae46ceb7f3
Brian Carlstrom [Wed, 1 Sep 2010 21:53:24 +0000 (14:53 -0700)]
am
ba2f27fb: Merge "Removal of more sampling profiler bits" into gingerbread
Merge commit '
ba2f27fb008942b17e603accc08ba07b1e3f1ddc' into gingerbread-plus-aosp
* commit '
ba2f27fb008942b17e603accc08ba07b1e3f1ddc':
Removal of more sampling profiler bits
Brian Carlstrom [Wed, 1 Sep 2010 21:24:13 +0000 (14:24 -0700)]
Merge "Removal of more sampling profiler bits" into gingerbread
Dan Bornstein [Wed, 1 Sep 2010 20:30:13 +0000 (13:30 -0700)]
am
ac452197: am
cc7b941f: am
f598f762: Merge "Split out the optimized dex file handling into its own file." into gingerbread
Merge commit '
ac452197d0c1e8b93e8af5b607ed544f33fb7161' into dalvik-dev
* commit '
ac452197d0c1e8b93e8af5b607ed544f33fb7161':
Split out the optimized dex file handling into its own file.
Dan Bornstein [Wed, 1 Sep 2010 20:21:10 +0000 (13:21 -0700)]
am
cc7b941f: am
f598f762: Merge "Split out the optimized dex file handling into its own file." into gingerbread
Merge commit '
cc7b941f9eaa92e2a4e7795a2c2c98d4bf15fc44'
* commit '
cc7b941f9eaa92e2a4e7795a2c2c98d4bf15fc44':
Split out the optimized dex file handling into its own file.
Brian Carlstrom [Wed, 1 Sep 2010 17:49:48 +0000 (10:49 -0700)]
Removal of more sampling profiler bits
dalvik/vm/native/SystemThread.[ch] was added for the old sampling
profiler, and can be removed as it's not needed for the new one.
Bug:
2967741
Change-Id: Ibd306b4ba579f9796facbf7a69719b3cb6640762
Dan Bornstein [Wed, 1 Sep 2010 18:55:49 +0000 (11:55 -0700)]
am
f598f762: Merge "Split out the optimized dex file handling into its own file." into gingerbread
Merge commit '
f598f7627b02cacfcb1da56a712d6a1d48ec46ed' into gingerbread-plus-aosp
* commit '
f598f7627b02cacfcb1da56a712d6a1d48ec46ed':
Split out the optimized dex file handling into its own file.
Dan Bornstein [Wed, 1 Sep 2010 18:54:08 +0000 (11:54 -0700)]
Merge "Split out the optimized dex file handling into its own file." into gingerbread
Brian Carlstrom [Wed, 1 Sep 2010 17:57:17 +0000 (10:57 -0700)]
am
15ffd8eb: am
7936472e: am
0f680873: New Java-based SamplingProfiler
Merge commit '
15ffd8eb5d9659d5f855cc19d504383be4ec89d5' into dalvik-dev
* commit '
15ffd8eb5d9659d5f855cc19d504383be4ec89d5':
New Java-based SamplingProfiler
Brian Carlstrom [Wed, 1 Sep 2010 17:47:20 +0000 (10:47 -0700)]
am
7936472e: am
0f680873: New Java-based SamplingProfiler
Merge commit '
7936472e2af62ec5e50c1463660a028e9ae21418'
* commit '
7936472e2af62ec5e50c1463660a028e9ae21418':
New Java-based SamplingProfiler
Brian Carlstrom [Wed, 1 Sep 2010 17:44:45 +0000 (10:44 -0700)]
am
0f680873: New Java-based SamplingProfiler
Merge commit '
0f68087322e3a43df3763d3500fc564d147793e7' into gingerbread-plus-aosp
* commit '
0f68087322e3a43df3763d3500fc564d147793e7':
New Java-based SamplingProfiler
Brian Carlstrom [Wed, 18 Aug 2010 21:27:25 +0000 (14:27 -0700)]
New Java-based SamplingProfiler
Summary:
- libcore: new Java based SamplingProfiler
- dalvik: remove old SamplingProfiler native bits
- frameworks/base: New placeholder SamplingProfilerIntegration
- vendor/google: remove old profiler snapshot parsing code
Details:
libcore
A new 100% Java SamplingProfiler. While it has more overhead that
the old native one, the new one can actually collect more than the
current PC and frame pointer, so you can get useful context of
where your app is spending time. It currently provides ASCII hprof
format output for use with tools like PerfAnal
dalvik/src/main/java/dalvik/system/SamplingProfiler.java
Unit test for the new SamplingProfiler
dalvik/src/test/java/dalvik/system/SamplingProfilerTest.java
Add core-tests-dalvik
JavaLibrary.mk
dalvik
Removing native code that supported the old SamplingProfiler
vm/Dvm.mk
vm/native/InternalNative.c
vm/native/dalvik_system_SamplingProfiler.c
frameworks/base
Placeholder SamplingProfilerIntegration. Later plans include
generating EventStackTrace protobufs.
New SamplingProfiler does not have a global instance, so
SamplingProfilerIntegration provides one in INSTANCE. Old binary
snapshot format is temporily replaced with ASCII hprof data.
core/java/com/android/internal/os/SamplingProfilerIntegration.java
Simplified interface for zygote profile snapshotting
core/java/com/android/internal/os/ZygoteInit.java
Current SamplingProfilerIntegration does not track event loop
explicitly, but hprof information does include thread information.
core/java/android/app/ActivityThread.java
vendor/google
Removing code for parsing old SamplingProfiler snapshot format
tools/samplingprofiler/Android.mk
tools/samplingprofiler/NOTICE
tools/samplingprofiler/profiler.iml
tools/samplingprofiler/profiler.ipr
tools/samplingprofiler/pull-snapshots.sh
tools/samplingprofiler/sorttable.js
tools/samplingprofiler/src/com/android/profiler/PrintHtml.java
Brian Carlstrom [Wed, 1 Sep 2010 16:57:35 +0000 (09:57 -0700)]
Merge "New Java-based SamplingProfiler" into dalvik-dev
Brian Carlstrom [Wed, 18 Aug 2010 21:27:25 +0000 (14:27 -0700)]
New Java-based SamplingProfiler
Summary:
- libcore: new Java based SamplingProfiler
- dalvik: remove old SamplingProfiler native bits
- frameworks/base: New placeholder SamplingProfilerIntegration
- vendor/google: remove old profiler snapshot parsing code
Details:
libcore
A new 100% Java SamplingProfiler. While it has more overhead that
the old native one, the new one can actually collect more than the
current PC and frame pointer, so you can get useful context of
where your app is spending time. It currently provides ASCII hprof
format output for use with tools like PerfAnal
dalvik/src/main/java/dalvik/system/SamplingProfiler.java
Unit test for the new SamplingProfiler
dalvik/src/test/java/dalvik/system/SamplingProfilerTest.java
Add core-tests-dalvik
JavaLibrary.mk
dalvik
Removing native code that supported the old SamplingProfiler
vm/Dvm.mk
vm/native/InternalNative.c
vm/native/dalvik_system_SamplingProfiler.c
frameworks/base
Placeholder SamplingProfilerIntegration. Later plans include
generating EventStackTrace protobufs.
New SamplingProfiler does not have a global instance, so
SamplingProfilerIntegration provides one in INSTANCE. Old binary
snapshot format is temporily replaced with ASCII hprof data.
core/java/com/android/internal/os/SamplingProfilerIntegration.java
Simplified interface for zygote profile snapshotting
core/java/com/android/internal/os/ZygoteInit.java
Current SamplingProfilerIntegration does not track event loop
explicitly, but hprof information does include thread information.
core/java/android/app/ActivityThread.java
vendor/google
Removing code for parsing old SamplingProfiler snapshot format
tools/samplingprofiler/Android.mk
tools/samplingprofiler/NOTICE
tools/samplingprofiler/profiler.iml
tools/samplingprofiler/profiler.ipr
tools/samplingprofiler/pull-snapshots.sh
tools/samplingprofiler/sorttable.js
tools/samplingprofiler/src/com/android/profiler/PrintHtml.java
Change-Id: Idb4defff0005ef203e577b5b5956506e3cd8dbf1
Carl Shapiro [Tue, 31 Aug 2010 23:55:32 +0000 (16:55 -0700)]
Merge "Move the finger computation out of the bitmap scanning callback." into dalvik-dev
Dan Bornstein [Tue, 31 Aug 2010 23:50:00 +0000 (16:50 -0700)]
Split out the optimized dex file handling into its own file.
Also, make the optimized dex data area be consistently referred to as
the "opt" section instead of sometimes the "aux" section.
Change-Id: Id5589c13ce4b53d713f8186314ea886cd884c865
Carl Shapiro [Tue, 31 Aug 2010 23:48:31 +0000 (16:48 -0700)]
Move the finger computation out of the bitmap scanning callback.
The finger computation depends on bitmap internals. This knowledge
should not be part of the bitmap interface, just its implementation.
This change adds a new walker that computes and passes a finger
argument to a callback. As part of this change, code to recompute the
end address during a walk has been removed from the ordinary bitmap
walker code. That check is needed by the scanning walk as its
callback may advance the max address when setting mark bits for
objects beyond the finger.
Change-Id: Id6aa2e4fb3af383f125965d4fe27c5ab6b36c5b5
Andy McFadden [Tue, 31 Aug 2010 21:32:27 +0000 (14:32 -0700)]
Merge "Show CPU# and utime/stime in the Dalvik thread dump." into dalvik-dev
Andy McFadden [Tue, 31 Aug 2010 20:50:08 +0000 (13:50 -0700)]
Show CPU# and utime/stime in the Dalvik thread dump.
This adds the "CPU number last executed on" from /proc/stat to
the Dalvik thread output. This may come in handy when looking at
thread dumps. While I was at it I added the utime/stime values,
which may not be all that useful since they represent lifetime usage
rather than recent usage.
Output appears on the schedstat line:
| schedstat=(
2930542006 9197204583 1284 ) ut=287 st=6 core=0
The routine that parses /proc/stat, previously only used for DDMS, has
been generalized. This also fixes a problem with parsing threads
whose name includes a space.
I also changed this and the /proc/schedstat code to use /proc/self
instead of /proc/%d + getpid().
Bug
2884342.
Change-Id: Iec85bc929005044427ebbb468bfa0c9693444bca
buzbee [Tue, 31 Aug 2010 17:16:35 +0000 (10:16 -0700)]
JIT: Add new compare-immed-and-branch primative & drop useless clrex
This allows better use of cbz/cbnz on Thumb2 targets. Also, removed
the clrex from the inline monitor enter code (not necessary).
Change-Id: I3bfa90bcdf34f6ef3e2447c9c6f1b49a98a89e58
Carl Shapiro [Mon, 30 Aug 2010 23:33:51 +0000 (16:33 -0700)]
Merge "Revert "Remove an unnecessary finger check when re-marking roots."" into dalvik-dev
Carl Shapiro [Mon, 30 Aug 2010 23:26:40 +0000 (16:26 -0700)]
Revert "Remove an unnecessary finger check when re-marking roots."
This reverts commit
6e02fef780c8a122a2ecd3d7afffe962d50d3838.
Nick Kralevich [Mon, 30 Aug 2010 21:38:19 +0000 (14:38 -0700)]
am
849a9053: am
55ad1118: am
f36b5723: If there\'s an error dropping privileges, abort.
Merge commit '
849a90539cb419bee2e08858979f3d6a1d08391a' into dalvik-dev
* commit '
849a90539cb419bee2e08858979f3d6a1d08391a':
If there's an error dropping privileges, abort.
Nick Kralevich [Mon, 30 Aug 2010 21:27:57 +0000 (14:27 -0700)]
am
55ad1118: am
f36b5723: If there\'s an error dropping privileges, abort.
Merge commit '
55ad111870f178513d3280b7a380875695710f9d'
* commit '
55ad111870f178513d3280b7a380875695710f9d':
If there's an error dropping privileges, abort.
Nick Kralevich [Mon, 30 Aug 2010 21:19:06 +0000 (14:19 -0700)]
am
f36b5723: If there\'s an error dropping privileges, abort.
Merge commit '
f36b57235b765c9eec3c001773b34c59cdefd87a' into gingerbread-plus-aosp
* commit '
f36b57235b765c9eec3c001773b34c59cdefd87a':
If there's an error dropping privileges, abort.
Nick Kralevich [Mon, 30 Aug 2010 19:49:33 +0000 (12:49 -0700)]
If there's an error dropping privileges, abort.
Change-Id: I85ce12e93cb8c297add756dc3b872b8346eda00b
Carl Shapiro [Mon, 30 Aug 2010 18:23:18 +0000 (11:23 -0700)]
Merge "Reduce the frequency of bitmap walk loop-bound computations." into dalvik-dev
Carl Shapiro [Mon, 30 Aug 2010 18:10:45 +0000 (11:10 -0700)]
Reduce the frequency of bitmap walk loop-bound computations.
Change-Id: I899b5ffe06a71f5c0b5de671edd6e8386a2688da
buzbee [Sat, 28 Aug 2010 01:16:57 +0000 (18:16 -0700)]
am
fd907bf5: am
ae59bcd7: am
1a509a4e: JIT: Add memory barriers on monitor enter/exit [issue
2951403]
Merge commit '
fd907bf54649d4334928a523656a638e6e9de32e' into dalvik-dev
* commit '
fd907bf54649d4334928a523656a638e6e9de32e':
JIT: Add memory barriers on monitor enter/exit [issue
2951403]
buzbee [Sat, 28 Aug 2010 01:10:44 +0000 (18:10 -0700)]
am
ae59bcd7: am
1a509a4e: JIT: Add memory barriers on monitor enter/exit [issue
2951403]
Merge commit '
ae59bcd792bf3c268581450e6070fbb38fddfb2b'
* commit '
ae59bcd792bf3c268581450e6070fbb38fddfb2b':
JIT: Add memory barriers on monitor enter/exit [issue
2951403]
Carl Shapiro [Fri, 27 Aug 2010 23:25:16 +0000 (16:25 -0700)]
Merge "Improve the heap verifier's failure report." into dalvik-dev
buzbee [Fri, 27 Aug 2010 23:18:02 +0000 (16:18 -0700)]
am
1a509a4e: JIT: Add memory barriers on monitor enter/exit [issue
2951403]
Merge commit '
1a509a4eb0fa468c5713553a7dec488a4e9d9a13' into gingerbread-plus-aosp
* commit '
1a509a4eb0fa468c5713553a7dec488a4e9d9a13':
JIT: Add memory barriers on monitor enter/exit [issue
2951403]
Ben Cheng [Fri, 27 Aug 2010 23:09:22 +0000 (16:09 -0700)]
am
dc972b51: am
d7f7cf4a: am
7eb3f7aa: Make JIT inliner work under single-stepping mode.
Merge commit '
dc972b51830ecee9cc5ad6f35cc72082710eeb6d' into dalvik-dev
* commit '
dc972b51830ecee9cc5ad6f35cc72082710eeb6d':
Make JIT inliner work under single-stepping mode.
Ben Cheng [Fri, 27 Aug 2010 23:09:19 +0000 (16:09 -0700)]
am
02721b99: am
d9b6dcdf: am
fc132a5e: Fix self-verification to handle loop traces with single-step instructions.
Merge commit '
02721b99f2bd79d720b30a1087dc36ae9842bc6a' into dalvik-dev
* commit '
02721b99f2bd79d720b30a1087dc36ae9842bc6a':
Fix self-verification to handle loop traces with single-step instructions.
buzbee [Thu, 26 Aug 2010 17:46:51 +0000 (10:46 -0700)]
JIT: Add memory barriers on monitor enter/exit [issue
2951403]
Possibly the cause of [
2950977 error in onDraw() method for stingray]
Change-Id: I3237c95a34daa75cd680b73d426dde11f3611a0e
Ben Cheng [Fri, 27 Aug 2010 22:53:42 +0000 (15:53 -0700)]
am
d7f7cf4a: am
7eb3f7aa: Make JIT inliner work under single-stepping mode.
Merge commit '
d7f7cf4ad493848b287b9d030bc7e9065e006b20'
* commit '
d7f7cf4ad493848b287b9d030bc7e9065e006b20':
Make JIT inliner work under single-stepping mode.
Ben Cheng [Fri, 27 Aug 2010 22:53:38 +0000 (15:53 -0700)]
am
d9b6dcdf: am
fc132a5e: Fix self-verification to handle loop traces with single-step instructions.
Merge commit '
d9b6dcdf3cf50c4f08c9851bbbef35f4dcc470a1'
* commit '
d9b6dcdf3cf50c4f08c9851bbbef35f4dcc470a1':
Fix self-verification to handle loop traces with single-step instructions.
Carl Shapiro [Fri, 27 Aug 2010 22:21:13 +0000 (15:21 -0700)]
Improve the heap verifier's failure report.
Previously, when a reference verify failed we would print the location
of the bad reference and abort. With this change, when a reference
fails to verify we try to print out more context. First, we dump the
object which contains the bad references and print each reference that
failed verification. Following that, we scan the roots and the heap
and print all of the objects which reference the bad object.
Change-Id: Iee50375d42c297a350a5256e0a8d983cf5d59229
Carl Shapiro [Fri, 27 Aug 2010 21:04:47 +0000 (14:04 -0700)]
Remove an unnecessary finger check when re-marking roots.
The finger check, a less than check, is meaningful only during the
initial root marking. After root marking, the finger is set to the
end of the virtual address space and the check always succeeds. As
such, this check is superfluous during all other phases of garbage
collection as it always suceeds.
Change-Id: Ie4e5bc1fb57b41e484cb6d1081c9a874fa6effbc
Carl Shapiro [Fri, 27 Aug 2010 20:55:30 +0000 (13:55 -0700)]
Merge "Simplify the bitmap walker subroutines." into dalvik-dev
Carl Shapiro [Fri, 27 Aug 2010 20:06:48 +0000 (13:06 -0700)]
Simplify the bitmap walker subroutines.
This change...
* Separates walking from sweeping. Walking had been implemented by a
sweeping with an empty mark bitmap argument.
* Localizes the finger machinations to scanBitmapCallback. There is
one use of the finger but all callbacks received the argument.
* Inlines a simplified bitmap walking routine operating a pointer at a
time. Only sweeping benefits from batching decoded addresses.
Change-Id: I87485ac58d3ecf07916f142534fe96f77e7ff227
Ben Cheng [Fri, 27 Aug 2010 06:16:36 +0000 (23:16 -0700)]
am
7eb3f7aa: Make JIT inliner work under single-stepping mode.
Merge commit '
7eb3f7aaf43f07caf0de05ba4ae59e8ea6add796' into gingerbread-plus-aosp
* commit '
7eb3f7aaf43f07caf0de05ba4ae59e8ea6add796':
Make JIT inliner work under single-stepping mode.
Ben Cheng [Fri, 27 Aug 2010 06:13:13 +0000 (23:13 -0700)]
am
fc132a5e: Fix self-verification to handle loop traces with single-step instructions.
Merge commit '
fc132a5e75842b516c4021b2bbfa02e134c46040' into gingerbread-plus-aosp
* commit '
fc132a5e75842b516c4021b2bbfa02e134c46040':
Fix self-verification to handle loop traces with single-step instructions.
Ben Cheng [Thu, 26 Aug 2010 21:56:31 +0000 (14:56 -0700)]
Make JIT inliner work under single-stepping mode.
Bug:
2936661
(cherry-picked from dalvik-dev)
Change-Id: I35a012bd4dba2a2f9541b96a2e787687bbc7cd19
Ben Cheng [Thu, 26 Aug 2010 19:28:56 +0000 (12:28 -0700)]
Fix self-verification to handle loop traces with single-step instructions.
(cherry-picked from dalvik-dev)
Change-Id: If1414d0e6767d36e33db8837e52dc91d11b4969b
Ben Cheng [Thu, 26 Aug 2010 21:56:31 +0000 (14:56 -0700)]
Make JIT inliner work under single-stepping mode.
Bug:
2936661
Change-Id: Id85530db5281e0ea28ffb31e8769f3bfec8be54a
Ben Cheng [Thu, 26 Aug 2010 20:24:00 +0000 (13:24 -0700)]
Merge "Fix self-verification to handle loop traces with single-step instructions." into dalvik-dev
Ben Cheng [Thu, 26 Aug 2010 19:28:56 +0000 (12:28 -0700)]
Fix self-verification to handle loop traces with single-step instructions.
Change-Id: I8b7acef5693db923e4c30fc523ca1a312f8cca9a
buzbee [Thu, 26 Aug 2010 18:28:49 +0000 (11:28 -0700)]
am
6ba7529b: JIT: Add memory barriers on monitor enter/exit [issue
2951403]
Merge commit '
6ba7529b233837a243cbdb4a6fd62520ab60a22f' into dalvik-dev
* commit '
6ba7529b233837a243cbdb4a6fd62520ab60a22f':
JIT: Add memory barriers on monitor enter/exit [issue
2951403]
buzbee [Thu, 26 Aug 2010 17:46:51 +0000 (10:46 -0700)]
JIT: Add memory barriers on monitor enter/exit [issue
2951403]
Possibly the cause of [
2950977 error in onDraw() method for stingray]
Change-Id: I84da4dcb04735ccbedc21fa84c11c3ee8c4aa4e9
Andy McFadden [Wed, 25 Aug 2010 22:30:09 +0000 (15:30 -0700)]
am
8ff39e40: am
19cbe64f: am
fe1d6d58: Add option for specifying wall-clock in method profiling.
Merge commit '
8ff39e40289655e7798c33d21e200dc51e071e51' into dalvik-dev
* commit '
8ff39e40289655e7798c33d21e200dc51e071e51':
Add option for specifying wall-clock in method profiling.
Andy McFadden [Wed, 25 Aug 2010 22:12:36 +0000 (15:12 -0700)]
am
19cbe64f: am
fe1d6d58: Add option for specifying wall-clock in method profiling.
Merge commit '
19cbe64f168aa783e6a9290c71c5715fc73e69fa'
* commit '
19cbe64f168aa783e6a9290c71c5715fc73e69fa':
Add option for specifying wall-clock in method profiling.
Andy McFadden [Wed, 25 Aug 2010 22:02:05 +0000 (15:02 -0700)]
am
fe1d6d58: Add option for specifying wall-clock in method profiling.
Merge commit '
fe1d6d586614fa51d82857e09128d6671be21d56' into gingerbread-plus-aosp
* commit '
fe1d6d586614fa51d82857e09128d6671be21d56':
Add option for specifying wall-clock in method profiling.
Andy McFadden [Wed, 25 Aug 2010 19:05:44 +0000 (12:05 -0700)]
Add option for specifying wall-clock in method profiling.
Normally you want to use the per-thread CPU clock rather than the wall
clock, because (a) it's more useful and (b) traceview goes a little nuts
if you don't. However, it's useful for some performance testing.
The command-line option allows you to switch modes like this:
% adb shell stop
% adb shell setprop dalvik.vm.extra-opts -Xprofile:wallclock
% adb shell start
This also changes the somewhat nebulous "clock=global" trace header line
to "clock=wall". Nothing looks at this anyway so I'm not worried
about breaking compatibility.
While I was in here, I fixed a couple of problems caused by failure to
initialize data structures that made dmtracedump crash (yay valgrind).
Bug
2943229.
(cherry-pick from dalvik-dev)
Change-Id: I2f6657f7abe02f2a17784588d922b88397639a47
Andy McFadden [Wed, 25 Aug 2010 21:54:04 +0000 (14:54 -0700)]
Merge "Add option for specifying wall-clock in method profiling." into dalvik-dev
Andy McFadden [Wed, 25 Aug 2010 19:05:44 +0000 (12:05 -0700)]
Add option for specifying wall-clock in method profiling.
Normally you want to use the per-thread CPU clock rather than the wall
clock, because (a) it's more useful and (b) traceview goes a little nuts
if you don't. However, it's useful for some performance testing.
The command-line option allows you to switch modes like this:
% adb shell stop
% adb shell setprop dalvik.vm.extra-opts -Xprofile:wallclock
% adb shell start
This also changes the somewhat nebulous "clock=global" trace header line
to "clock=wall". Nothing looks at this anyway so I'm not worried
about breaking compatibility.
While I was in here, I fixed a couple of problems caused by failure to
initialize data structures that made dmtracedump crash (yay valgrind).
Bug
2943229.
Change-Id: Ib8884027c0a7e93044a3284802b176ea991387b5
Ben Cheng [Wed, 25 Aug 2010 21:26:37 +0000 (14:26 -0700)]
am
e73e9bc2: am
aef5e78d: am
9e02e4b1: Revert "JIT: Disable inlining to work around sholes boot crash"
Merge commit '
e73e9bc2dbd89ae67a0b90d6e02c6e8dc24c4c50' into dalvik-dev
* commit '
e73e9bc2dbd89ae67a0b90d6e02c6e8dc24c4c50':
Revert "JIT: Disable inlining to work around sholes boot crash"
Ben Cheng [Wed, 25 Aug 2010 21:17:39 +0000 (14:17 -0700)]
am
aef5e78d: am
9e02e4b1: Revert "JIT: Disable inlining to work around sholes boot crash"
Merge commit '
aef5e78d045f12726a464fa3603ad70d15879b22'
* commit '
aef5e78d045f12726a464fa3603ad70d15879b22':
Revert "JIT: Disable inlining to work around sholes boot crash"
Ben Cheng [Wed, 25 Aug 2010 21:14:31 +0000 (14:14 -0700)]
am
9e02e4b1: Revert "JIT: Disable inlining to work around sholes boot crash"
Merge commit '
9e02e4b1fa08cebefa0f79cd407f4a88611cf473' into gingerbread-plus-aosp
* commit '
9e02e4b1fa08cebefa0f79cd407f4a88611cf473':
Revert "JIT: Disable inlining to work around sholes boot crash"
Ben Cheng [Wed, 25 Aug 2010 20:01:54 +0000 (13:01 -0700)]
Revert "JIT: Disable inlining to work around sholes boot crash"
This reverts commit
07ecdc0b5d92099364eebdaee9aec297c4bbad72.
Random crash is confirmed to be caused by a Cortex-A8 bug. Toolchain fix is
pending and the current ToT is not triggering the crash.
(cherry-picked from dalvik-dev)
Change-Id: I12732a1fc2aa894a678bbb71e871e97f655c6814
Ben Cheng [Wed, 25 Aug 2010 20:34:56 +0000 (13:34 -0700)]
Merge "Revert "JIT: Disable inlining to work around sholes boot crash"" into dalvik-dev
Ben Cheng [Wed, 25 Aug 2010 20:01:54 +0000 (13:01 -0700)]
Revert "JIT: Disable inlining to work around sholes boot crash"
This reverts commit
07ecdc0b5d92099364eebdaee9aec297c4bbad72.
Random crash is confirmed to be caused by a Cortex-A8 bug. Toolchain fix is
pending and the current ToT is not triggering the crash.
Andy McFadden [Wed, 25 Aug 2010 19:31:59 +0000 (12:31 -0700)]
am
b8ee7ac2: am
557763e8: am
3ef3f182: Merge "Change the way thread suspension works." into gingerbread
Merge commit '
b8ee7ac2b7ebf439a988586d20c8288f95692f7e' into dalvik-dev
* commit '
b8ee7ac2b7ebf439a988586d20c8288f95692f7e':
Change the way thread suspension works.
Andy McFadden [Wed, 25 Aug 2010 19:31:56 +0000 (12:31 -0700)]
am
a6dcf00e: am
61e646fa: am
3b6ee1a4: Fix a DDMS thread monitoring crash.
Merge commit '
a6dcf00e1a4a3b043559965f0d4fd0fbded72102' into dalvik-dev
* commit '
a6dcf00e1a4a3b043559965f0d4fd0fbded72102':
Fix a DDMS thread monitoring crash.
Andy McFadden [Wed, 25 Aug 2010 19:24:15 +0000 (12:24 -0700)]
am
557763e8: am
3ef3f182: Merge "Change the way thread suspension works." into gingerbread
Merge commit '
557763e8845b9a81105c8b7380ac24f4869ec5bc'
* commit '
557763e8845b9a81105c8b7380ac24f4869ec5bc':
Change the way thread suspension works.
Andy McFadden [Wed, 25 Aug 2010 19:24:12 +0000 (12:24 -0700)]
am
61e646fa: am
3b6ee1a4: Fix a DDMS thread monitoring crash.
Merge commit '
61e646fae271c8cff7c36dfa897a78430956ba53'
* commit '
61e646fae271c8cff7c36dfa897a78430956ba53':
Fix a DDMS thread monitoring crash.
Andy McFadden [Wed, 25 Aug 2010 19:21:49 +0000 (12:21 -0700)]
am
3ef3f182: Merge "Change the way thread suspension works." into gingerbread
Merge commit '
3ef3f182b126be36acc5e1132bfff4857b442213' into gingerbread-plus-aosp
* commit '
3ef3f182b126be36acc5e1132bfff4857b442213':
Change the way thread suspension works.
Andy McFadden [Wed, 25 Aug 2010 19:21:45 +0000 (12:21 -0700)]
am
3b6ee1a4: Fix a DDMS thread monitoring crash.
Merge commit '
3b6ee1a417a717c44e2a59ed73c930f4be8ea54b' into gingerbread-plus-aosp
* commit '
3b6ee1a417a717c44e2a59ed73c930f4be8ea54b':
Fix a DDMS thread monitoring crash.
Andy McFadden [Wed, 25 Aug 2010 19:20:21 +0000 (12:20 -0700)]
Merge "Change the way thread suspension works." into gingerbread
Andy McFadden [Mon, 23 Aug 2010 23:45:24 +0000 (16:45 -0700)]
Change the way thread suspension works.
There are at least three ways to handle detection of thread suspension
correctly: (1) hold a mutex, (2) pile all state into a single 32-bit
location and use atomic ops, and (3) order the operations carefully.
Of these, #3 has the least overhead on uniprocessors, so we're going
with that.
It does introduce one quirk, because we're now changing to "running"
mode before checking to see if we're allowed to run. This creates
a tiny window of opportunity for assertions and thread dumps to see
what appears to be a thread that's running when it shouldn't be.
This is correctable with additional work (e.g. transitioning through
a pre-running state) but probably not worth worrying about.
This eliminates the separate self->isSuspended flag in favor of the
new THREAD_SUSPENDED thread state.
Bug
2667016.
(cherry-pick from dalvik-dev)
Change-Id: Ibc77ebbb03a7993bc4057c1c375498172ca8ff1c
Andy McFadden [Tue, 24 Aug 2010 21:23:11 +0000 (14:23 -0700)]
Fix a DDMS thread monitoring crash.
We changed the order of events during thread attaches, which means
it's now possible to have Thread structs with null threadObj fields.
This bit of code didn't change with the times, which made it possible
for a process being watched by DDMS to crash if we grabbed the thread
state at just the wrong time.
(cherry-pick from dalvik-dev)
Change-Id: Icd7f523ee8327f00693e601c1c82d3a8defb247f
Andy McFadden [Wed, 25 Aug 2010 19:04:15 +0000 (12:04 -0700)]
Merge "Change the way thread suspension works." into dalvik-dev
Andy McFadden [Mon, 23 Aug 2010 23:45:24 +0000 (16:45 -0700)]
Change the way thread suspension works.
There are at least three ways to handle detection of thread suspension
correctly: (1) hold a mutex, (2) pile all state into a single 32-bit
location and use atomic ops, and (3) order the operations carefully.
Of these, #3 has the least overhead on uniprocessors, so we're going
with that.
It does introduce one quirk, because we're now changing to "running"
mode before checking to see if we're allowed to run. This creates
a tiny window of opportunity for assertions and thread dumps to see
what appears to be a thread that's running when it shouldn't be.
This is correctable with additional work (e.g. transitioning through
a pre-running state) but probably not worth worrying about.
This eliminates the separate self->isSuspended flag in favor of the
new THREAD_SUSPENDED thread state.
Bug
2667016.
Change-Id: I05c22ac5307fa3056fab854dfeed7aa1d76542f4
Andy McFadden [Tue, 24 Aug 2010 22:07:01 +0000 (15:07 -0700)]
Merge "Fix a DDMS thread monitoring crash." into dalvik-dev
Andy McFadden [Tue, 24 Aug 2010 21:23:11 +0000 (14:23 -0700)]
Fix a DDMS thread monitoring crash.
We changed the order of events during thread attaches, which means
it's now possible to have Thread structs with null threadObj fields.
This bit of code didn't change with the times, which made it possible
for a process being watched by DDMS to crash if we grabbed the thread
state at just the wrong time.
Change-Id: I3cd5501e99278d68897f8e50f316f8a37620ca0b
Andy McFadden [Tue, 24 Aug 2010 18:28:22 +0000 (11:28 -0700)]
am
6f95c275: am
ded830f7: resolved conflicts for merge of
aa63a6a6 to gingerbread-plus-aosp
Merge commit '
6f95c2751db9d029ea76491e4223919513cec370' into dalvik-dev
* commit '
6f95c2751db9d029ea76491e4223919513cec370':
Added new bytecodes for the x86-atom fast interpreter build.
Andy McFadden [Tue, 24 Aug 2010 18:28:19 +0000 (11:28 -0700)]
am
a8684380: am
0fb72477: am
f16cfefc: Properly handle volatile field accesses from JNI.
Merge commit '
a8684380356fd9a6c01b28675c5c6d37e640c688' into dalvik-dev
* commit '
a8684380356fd9a6c01b28675c5c6d37e640c688':
Properly handle volatile field accesses from JNI.
Andy McFadden [Tue, 24 Aug 2010 18:21:47 +0000 (11:21 -0700)]
am
ded830f7: resolved conflicts for merge of
aa63a6a6 to gingerbread-plus-aosp
Merge commit '
ded830f7d936821a4136fc8c08064b43beff9341'
* commit '
ded830f7d936821a4136fc8c08064b43beff9341':
Added new bytecodes for the x86-atom fast interpreter build.
Andy McFadden [Tue, 24 Aug 2010 18:19:58 +0000 (11:19 -0700)]
am
0fb72477: am
f16cfefc: Properly handle volatile field accesses from JNI.
Merge commit '
0fb72477bb2454a2ae5416f35376d3714abefc1f'
* commit '
0fb72477bb2454a2ae5416f35376d3714abefc1f':
Properly handle volatile field accesses from JNI.
Elliott Hughes [Tue, 24 Aug 2010 17:40:01 +0000 (10:40 -0700)]
Merge "Intrinsics for float/int and double/long conversions." into dalvik-dev
Brian Carlstrom [Tue, 24 Aug 2010 16:14:53 +0000 (09:14 -0700)]
am
042876de: am
39796a6a: am
30febfdf: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread
Merge commit '
042876deaa858c1087285366db0a4971917a431e' into dalvik-dev
* commit '
042876deaa858c1087285366db0a4971917a431e':
Brian Carlstrom [Tue, 24 Aug 2010 16:03:08 +0000 (09:03 -0700)]
am
39796a6a: am
30febfdf: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread
Merge commit '
39796a6aa79f687ac0b1254f6a8be048ad1243d8'
* commit '
39796a6aa79f687ac0b1254f6a8be048ad1243d8': (26 commits)
Remove an assertion that cannot be guaranteed.
Always support debugging and profiling.
Fix a critical space leak introduced by concurrent sweeping.
Add a little bit of paranoia to the odex data reader.
Nudge a couple of log messages.
Fix build breakage caused by the countInstancesOfClass change.
Add a method for counting the extant instances of a class.
Added fsync call to dexopt.
JIT: Fix for armv5te-VFP bug [Issue
2916682]
Cast to a byte pointer before performing arithmetic.
Limit scanning to cards within the committed region of the heap.
Remove a malfunctioning predicate used only in assertions.
Remove debugging code and stale comments from the sweep callback.
Fix build breakage caused by a bad merge from master.
JIT: Correct conversion of cb[n]z to cmp/cond_br pair
Print callee information in the JIT profile outout
JIT: Fix for lightweight assembler retry mechanism.
JIT: Fix for
2898397 assert in JIT (chain cell offset)
More SMP fixes.
Fix some potential SMP issues.
...
Elliott Hughes [Sat, 21 Aug 2010 01:47:36 +0000 (18:47 -0700)]
Intrinsics for float/int and double/long conversions.
Bug:
2935622
Change-Id: I0f9e564f1f94ccf6596a37a6f1c10253481d5062
Andy McFadden [Mon, 23 Aug 2010 21:06:47 +0000 (14:06 -0700)]
resolved conflicts for merge of
aa63a6a6 to gingerbread-plus-aosp
Change-Id: Ib2f8c4c71a74987d284eba4be96ff4d329c40a50
Jean-Baptiste Queru [Mon, 23 Aug 2010 20:31:40 +0000 (13:31 -0700)]
Merge "Added new bytecodes for the x86-atom fast interpreter build."
Brian Carlstrom [Mon, 23 Aug 2010 15:28:49 +0000 (08:28 -0700)]
am
a18a7965: libdl should not be included in the simulator build
Merge commit '
a18a79655d6742a7a21764c8d84013c84e012ced' into dalvik-dev
* commit '
a18a79655d6742a7a21764c8d84013c84e012ced':
libdl should not be included in the simulator build