OSDN Git Service
Ben Cheng [Fri, 3 Sep 2010 17:00:59 +0000 (10:00 -0700)]
Merge "Collect method traces with the fast interpreter and the JIT'ed code." into dalvik-dev
buzbee [Fri, 3 Sep 2010 16:35:22 +0000 (09:35 -0700)]
am
8ef4d4f3: am
58a661c4: am
ddc7d29b: Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Merge commit '
8ef4d4f3d050b0130dbf723285990b045f04d5f3' into dalvik-dev
* commit '
8ef4d4f3d050b0130dbf723285990b045f04d5f3':
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
buzbee [Fri, 3 Sep 2010 16:27:53 +0000 (09:27 -0700)]
am
58a661c4: am
ddc7d29b: Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Merge commit '
58a661c4ec0c18473b6b9814a78896caa74d0c8c'
* commit '
58a661c4ec0c18473b6b9814a78896caa74d0c8c':
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
buzbee [Fri, 3 Sep 2010 16:22:41 +0000 (09:22 -0700)]
am
ddc7d29b: Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Merge commit '
ddc7d29baa92cb24b7bfa80395479f878109f3f8' into gingerbread-plus-aosp
* commit '
ddc7d29baa92cb24b7bfa80395479f878109f3f8':
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
buzbee [Fri, 3 Sep 2010 00:16:24 +0000 (17:16 -0700)]
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Fix for http://b/issue?id=
2971877, which was identified via
debug tracing on http://b/issue?id=
2971569. There were a couple
of problems: first, the volatile sget/sput byte codes had the
wrong format tag (22c instead of 21c). Second, the JIT was missing
a couple of case statments to handle these. As far as the JIT goes,
this would not have caused correctness problems, but would have
been slower than necessary.
Change-Id: I57a41c4e063642b0c19acba5bb0855dd8ce2d4ba
Ben Cheng [Tue, 31 Aug 2010 16:30:37 +0000 (09:30 -0700)]
Collect method traces with the fast interpreter and the JIT'ed code.
Insert inline code instead of switching to the debug interpreter in the hope
that the time stamps collected in traceview are more close to the real
world behavior with minimal profiling overhead.
Because the inline polling still introduces additional overhead (20% ~ 100%),
it is only enabled in the special VM build called "libdvm_traceview.so".
It won't work on the emulator because it is not implemented to collect the
detailed instruction traces.
Here are some performance numbers using the FibonacciSlow microbenchmark
(ie recursive workloads / the shorter the faster):
time: configuration
8,162,602: profiling off/libdvm.so/JIT off
2,801,829: profiling off/libdvm.so/JIT on
9,952,236: profiling off/libdvm_traceview.so/JIT off
4,465,701: profiling off/libdvm_traceview.so/JIT on
164,786,585: profiling on/libdvm.so/JIT off
164,664,634: profiling on/libdvm.so/JIT on
11,231,707: profiling on/libdvm_traceview.so/JIT off
8,427,846: profiling on/libdvm_traceview.so/JIT on
Comparing the 8,427,846 vs 164,664,634 numbers againt the true baseline
performance number of 2,801,829, the new libdvm_traceview.so improves the time
skew from 58x to 3x.
Change-Id: I48611a3a4ff9c4950059249e5503c26abd6b138e
Carl Shapiro [Fri, 3 Sep 2010 01:57:55 +0000 (18:57 -0700)]
am
1311c9e5: am
3d1485b1: am
d7400e0e: Normalize the declaration style.
Merge commit '
1311c9e54386741f846d80c36c8474c0f5b77f6c' into dalvik-dev
* commit '
1311c9e54386741f846d80c36c8474c0f5b77f6c':
Normalize the declaration style.
Carl Shapiro [Fri, 3 Sep 2010 01:53:35 +0000 (18:53 -0700)]
am
3d1485b1: am
d7400e0e: Normalize the declaration style.
Merge commit '
3d1485b15d83dd920ffb1a826d42ae65f3b31a93'
* commit '
3d1485b15d83dd920ffb1a826d42ae65f3b31a93':
Normalize the declaration style.
Carl Shapiro [Fri, 3 Sep 2010 01:44:15 +0000 (18:44 -0700)]
am
d7400e0e: Normalize the declaration style.
Merge commit '
d7400e0ec701dd481489ad421d55c7cd903f77ee' into gingerbread-plus-aosp
* commit '
d7400e0ec701dd481489ad421d55c7cd903f77ee':
Normalize the declaration style.
Carl Shapiro [Fri, 3 Sep 2010 01:38:59 +0000 (18:38 -0700)]
am
b45efe57: am
23cdb738: am
3ba10c99: Use an acquiring CAS for lock acquisition.
Merge commit '
b45efe5722476fb6ad9e66b4b6fba0486f6fc221' into dalvik-dev
* commit '
b45efe5722476fb6ad9e66b4b6fba0486f6fc221':
Use an acquiring CAS for lock acquisition.
Carl Shapiro [Fri, 3 Sep 2010 01:24:29 +0000 (18:24 -0700)]
Normalize the declaration style.
Change-Id: I204dec4a80672ea10286cefcff7884b15ebaae51
Carl Shapiro [Fri, 3 Sep 2010 01:00:39 +0000 (18:00 -0700)]
am
23cdb738: am
3ba10c99: Use an acquiring CAS for lock acquisition.
Merge commit '
23cdb738c525ade350c441cf4b5edca4526aef07'
* commit '
23cdb738c525ade350c441cf4b5edca4526aef07':
Use an acquiring CAS for lock acquisition.
Carl Shapiro [Fri, 3 Sep 2010 00:45:25 +0000 (17:45 -0700)]
am
3ba10c99: Use an acquiring CAS for lock acquisition.
Merge commit '
3ba10c9932db4c7c9546081ea070c73d5001c168' into gingerbread-plus-aosp
* commit '
3ba10c9932db4c7c9546081ea070c73d5001c168':
Use an acquiring CAS for lock acquisition.
Carl Shapiro [Thu, 2 Sep 2010 23:43:16 +0000 (16:43 -0700)]
Use an acquiring CAS for lock acquisition.
Change-Id: Idca782aedc8f2071cdfde2fe3dcba0503fa6c9f0
Elliott Hughes [Thu, 2 Sep 2010 21:11:09 +0000 (14:11 -0700)]
Update the GetDirectBufferAddress implementation.
This change is the dalvik change corresponding to the following libcore change:
https://android-git.corp.google.com/g/64326
Bug:
2935622
Change-Id: If3687e3efcc322e651c685885f6701726b5d9efc
Carl Shapiro [Thu, 2 Sep 2010 18:44:45 +0000 (11:44 -0700)]
am
e07c0f48: am
f14d72d8: am
7d12781a: Merge "Add additional context to the contention event logging." into gingerbread
Merge commit '
e07c0f48a6aa2cb2d6301930e6b4290488cd7b46' into dalvik-dev
* commit '
e07c0f48a6aa2cb2d6301930e6b4290488cd7b46':
Add additional context to the contention event logging.
Carl Shapiro [Thu, 2 Sep 2010 18:41:30 +0000 (11:41 -0700)]
am
f14d72d8: am
7d12781a: Merge "Add additional context to the contention event logging." into gingerbread
Merge commit '
f14d72d8d8ec023021d94bbf91fddf9f292225dd'
* commit '
f14d72d8d8ec023021d94bbf91fddf9f292225dd':
Add additional context to the contention event logging.
Carl Shapiro [Thu, 2 Sep 2010 18:35:31 +0000 (11:35 -0700)]
am
7d12781a: Merge "Add additional context to the contention event logging." into gingerbread
Merge commit '
7d12781a1d2d4d4b2e3a6c78a375cb15ea2d96ae' into gingerbread-plus-aosp
* commit '
7d12781a1d2d4d4b2e3a6c78a375cb15ea2d96ae':
Add additional context to the contention event logging.
Piotr Gurgul [Thu, 2 Sep 2010 18:35:13 +0000 (11:35 -0700)]
am
0bc2d449: Merge "Add dexgen project dir"
Merge commit '
0bc2d449637b3de623b10b6db6cc3f097bf43a5b' into dalvik-dev
* commit '
0bc2d449637b3de623b10b6db6cc3f097bf43a5b':
Add dexgen project dir
Piotr Gurgul [Thu, 2 Sep 2010 18:31:37 +0000 (11:31 -0700)]
Merge "Add dexgen project dir"
Carl Shapiro [Thu, 2 Sep 2010 18:28:32 +0000 (11:28 -0700)]
Merge "Add additional context to the contention event logging." into gingerbread
Carl Shapiro [Thu, 2 Sep 2010 03:30:57 +0000 (20:30 -0700)]
am
c3288051: am
26122f7b: am
38d710b5: Move the finger computation out of the bitmap scanning callback.
Merge commit '
c3288051029805ace18d943e26db84e5fb4c5272' into dalvik-dev
* commit '
c3288051029805ace18d943e26db84e5fb4c5272':
Move the finger computation out of the bitmap scanning callback.
Carl Shapiro [Thu, 2 Sep 2010 03:30:54 +0000 (20:30 -0700)]
am
b492c326: (-s ours) am
75233705: am
a634c852: Reduce the frequency of bitmap walk loop-bound computations.
Merge commit '
b492c326009cc179ad9eb79857d0f7d23901860e' into dalvik-dev
* commit '
b492c326009cc179ad9eb79857d0f7d23901860e':
Reduce the frequency of bitmap walk loop-bound computations.
Carl Shapiro [Thu, 2 Sep 2010 03:28:59 +0000 (20:28 -0700)]
am
30e64a29: am
81fc9917: am
c44bca65: Improve the heap verifier\'s failure report.
Merge commit '
30e64a291ae9d7f616e074afc9b6f12760a1d3d0' into dalvik-dev
* commit '
30e64a291ae9d7f616e074afc9b6f12760a1d3d0':
Improve the heap verifier's failure report.
Carl Shapiro [Thu, 2 Sep 2010 03:28:57 +0000 (20:28 -0700)]
am
23bc9b8c: (-s ours) am
8f96d635: am
57ee270b: Simplify the bitmap walker subroutines.
Merge commit '
23bc9b8c90dfadb30e8f6c18be24ff3847fc923f' into dalvik-dev
* commit '
23bc9b8c90dfadb30e8f6c18be24ff3847fc923f':
Simplify the bitmap walker subroutines.
Carl Shapiro [Thu, 2 Sep 2010 03:16:05 +0000 (20:16 -0700)]
am
c6ffb2c5: am
16b6646f: am
b2e78d39: Consistently refer to the mark context as ctx.
Merge commit '
c6ffb2c5378cc53b31461a164e22bc4f8f24e10c' into dalvik-dev
* commit '
c6ffb2c5378cc53b31461a164e22bc4f8f24e10c':
Consistently refer to the mark context as ctx.
Carl Shapiro [Thu, 2 Sep 2010 03:16:01 +0000 (20:16 -0700)]
am
4e195382: am
73479900: am
5d81aa32: Collapse a variable declaration and initialization.
Merge commit '
4e195382d571ba049a94085bc98c3a3ac267498e' into dalvik-dev
* commit '
4e195382d571ba049a94085bc98c3a3ac267498e':
Collapse a variable declaration and initialization.
Carl Shapiro [Thu, 2 Sep 2010 03:15:56 +0000 (20:15 -0700)]
am
adc1e19d: am
fa4ae67c: am
7511ae1e: Combine a typedef with a struct declaration.
Merge commit '
adc1e19dc6dfaff19355c02f5420a0cc8965a2ea' into dalvik-dev
* commit '
adc1e19dc6dfaff19355c02f5420a0cc8965a2ea':
Combine a typedef with a struct declaration.
Carl Shapiro [Thu, 2 Sep 2010 03:15:53 +0000 (20:15 -0700)]
am
20e165ca: am
03dce8ca: am
eff16fb8: Use symbolic constants when computing bits-per-word.
Merge commit '
20e165ca67d05e82c21b553324b003c434ba4246' into dalvik-dev
* commit '
20e165ca67d05e82c21b553324b003c434ba4246':
Use symbolic constants when computing bits-per-word.
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:43 +0000 (19:00 -0700)]
am
26122f7b: am
38d710b5: Move the finger computation out of the bitmap scanning callback.
Merge commit '
26122f7b5411d120d6d9d7f967abdd4f8c323414'
* commit '
26122f7b5411d120d6d9d7f967abdd4f8c323414':
Move the finger computation out of the bitmap scanning callback.
Carl Shapiro [Thu, 2 Sep 2010 02:00:41 +0000 (19:00 -0700)]
am
75233705: am
a634c852: Reduce the frequency of bitmap walk loop-bound computations.
Merge commit '
7523370510bb3eb61360dd3eb95ae537a6ffb412'
* commit '
7523370510bb3eb61360dd3eb95ae537a6ffb412':
Reduce the frequency of bitmap walk loop-bound computations.
Carl Shapiro [Thu, 2 Sep 2010 02:00:39 +0000 (19:00 -0700)]
am
81fc9917: am
c44bca65: Improve the heap verifier\'s failure report.
Merge commit '
81fc991785ff3dc160942a88bbd713b677e63450'
* commit '
81fc991785ff3dc160942a88bbd713b677e63450':
Improve the heap verifier's failure report.
Carl Shapiro [Thu, 2 Sep 2010 02:00:36 +0000 (19:00 -0700)]
am
8f96d635: am
57ee270b: Simplify the bitmap walker subroutines.
Merge commit '
8f96d635aace5ec6cb30fd84e95fab4091ed6479'
* commit '
8f96d635aace5ec6cb30fd84e95fab4091ed6479':
Simplify the bitmap walker subroutines.
Carl Shapiro [Thu, 2 Sep 2010 02:00:29 +0000 (19:00 -0700)]
am
16b6646f: am
b2e78d39: Consistently refer to the mark context as ctx.
Merge commit '
16b6646fcbc187b280dcc64f7bd1c1dabe8b37f0'
* commit '
16b6646fcbc187b280dcc64f7bd1c1dabe8b37f0':
Consistently refer to the mark context as ctx.
Carl Shapiro [Thu, 2 Sep 2010 02:00:26 +0000 (19:00 -0700)]
am
73479900: am
5d81aa32: Collapse a variable declaration and initialization.
Merge commit '
73479900d36fdcb6a9cf3edae66335158860c043'
* commit '
73479900d36fdcb6a9cf3edae66335158860c043':
Collapse a variable declaration and initialization.
Carl Shapiro [Thu, 2 Sep 2010 02:00:23 +0000 (19:00 -0700)]
am
fa4ae67c: am
7511ae1e: Combine a typedef with a struct declaration.
Merge commit '
fa4ae67c6a5bca3c0fccbe7775292f61be2935d5'
* commit '
fa4ae67c6a5bca3c0fccbe7775292f61be2935d5':
Combine a typedef with a struct declaration.
Carl Shapiro [Thu, 2 Sep 2010 02:00:19 +0000 (19:00 -0700)]
am
03dce8ca: am
eff16fb8: Use symbolic constants when computing bits-per-word.
Merge commit '
03dce8ca75c05f0588ceb5db4b236746e8f445e7'
* commit '
03dce8ca75c05f0588ceb5db4b236746e8f445e7':
Use symbolic constants when computing bits-per-word.
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:53:47 +0000 (18:53 -0700)]
am
38d710b5: Move the finger computation out of the bitmap scanning callback.
Merge commit '
38d710b524f2d9888e89b4ea0209f0b57025dab4' into gingerbread-plus-aosp
* commit '
38d710b524f2d9888e89b4ea0209f0b57025dab4':
Move the finger computation out of the bitmap scanning callback.
Carl Shapiro [Thu, 2 Sep 2010 01:50:11 +0000 (18:50 -0700)]
am
a634c852: Reduce the frequency of bitmap walk loop-bound computations.
Merge commit '
a634c852e985dcacf621c428c0597674bc5bfd77' into gingerbread-plus-aosp
* commit '
a634c852e985dcacf621c428c0597674bc5bfd77':
Reduce the frequency of bitmap walk loop-bound computations.
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.
Carl Shapiro [Thu, 2 Sep 2010 01:45:12 +0000 (18:45 -0700)]
am
c44bca65: Improve the heap verifier\'s failure report.
Merge commit '
c44bca6530787454ee794cf2f83c1c6671a93aa8' into gingerbread-plus-aosp
* commit '
c44bca6530787454ee794cf2f83c1c6671a93aa8':
Improve the heap verifier's failure report.
Carl Shapiro [Mon, 30 Aug 2010 18:10:45 +0000 (11:10 -0700)]
Reduce the frequency of bitmap walk loop-bound computations.
Carl Shapiro [Thu, 2 Sep 2010 01:41:16 +0000 (18:41 -0700)]
am
57ee270b: Simplify the bitmap walker subroutines.
Merge commit '
57ee270b755271166b2349321e5b8b5457731dd7' into gingerbread-plus-aosp
* commit '
57ee270b755271166b2349321e5b8b5457731dd7':
Simplify the bitmap walker subroutines.
Carl Shapiro [Thu, 2 Sep 2010 01:39:20 +0000 (18:39 -0700)]
am
b2e78d39: Consistently refer to the mark context as ctx.
Merge commit '
b2e78d39f6df19a6222b3cd4c7010864fb8cb55f' into gingerbread-plus-aosp
* commit '
b2e78d39f6df19a6222b3cd4c7010864fb8cb55f':
Consistently refer to the mark context as ctx.
Carl Shapiro [Thu, 2 Sep 2010 01:39:17 +0000 (18:39 -0700)]
am
5d81aa32: Collapse a variable declaration and initialization.
Merge commit '
5d81aa327a11f6e929c2396d34c343923268bdc3' into gingerbread-plus-aosp
* commit '
5d81aa327a11f6e929c2396d34c343923268bdc3':
Collapse a variable declaration and initialization.
Carl Shapiro [Thu, 2 Sep 2010 01:39:14 +0000 (18:39 -0700)]
am
7511ae1e: Combine a typedef with a struct declaration.
Merge commit '
7511ae1ed686ccdf6cfefeabeede0cedb0c36b77' into gingerbread-plus-aosp
* commit '
7511ae1ed686ccdf6cfefeabeede0cedb0c36b77':
Combine a typedef with a struct declaration.
Carl Shapiro [Thu, 2 Sep 2010 01:39:07 +0000 (18:39 -0700)]
am
eff16fb8: Use symbolic constants when computing bits-per-word.
Merge commit '
eff16fb843ec191508d2e8306b6dfd8209ede501' into gingerbread-plus-aosp
* commit '
eff16fb843ec191508d2e8306b6dfd8209ede501':
Use symbolic constants when computing bits-per-word.
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 [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.
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.
Carl Shapiro [Fri, 20 Aug 2010 18:34:18 +0000 (11:34 -0700)]
Consistently refer to the mark context as ctx.
Carl Shapiro [Fri, 20 Aug 2010 18:04:25 +0000 (11:04 -0700)]
Collapse a variable declaration and initialization.
Carl Shapiro [Thu, 19 Aug 2010 23:54:01 +0000 (16:54 -0700)]
Combine a typedef with a struct declaration.
Carl Shapiro [Thu, 19 Aug 2010 21:29:41 +0000 (14:29 -0700)]
Use symbolic constants when computing bits-per-word.
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
Piotr Gurgul [Wed, 1 Sep 2010 23:53:13 +0000 (16:53 -0700)]
Add dexgen project dir
Adds a home directory and description for the dexgen project which aims to
provide API for runtime dex classes generation which is necessary e.g for class
mocking. It is mostly based on dx tool classes.
Change-Id: I92b02e38f305b94ad088ec8a8a8899b1d600268d
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
Carl Shapiro [Tue, 31 Aug 2010 22:11:46 +0000 (15:11 -0700)]
Add additional context to the contention event logging.
Previously it only included the victim of lock contention. With this
change, it also includes the location of the person holding the lock
at the time the victim failed to acquire it.
Bug:
2964633
Change-Id: I888d9c3e7d7611ef5869870c7f8abfb19d236231
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