OSDN Git Service
Ken Sumrall [Fri, 16 Aug 2013 02:31:40 +0000 (02:31 +0000)]
Merge "Avoid underflow on an unsigned int when computering bg overrun"
Ken Sumrall [Fri, 16 Aug 2013 02:06:29 +0000 (19:06 -0700)]
Avoid underflow on an unsigned int when computering bg overrun
A computation for when a block group overruns the end of an image
was consistently storing a negative number in an unsigned var,
and then checking for >0, which is always true for negative numbers.
So first check if the number will be positive before computing it.
Change-Id: Ic8cff8f9ab9f4ea8c5a4dc42143c2430fa87ba12
Christopher Ferris [Wed, 31 Jul 2013 22:14:07 +0000 (22:14 +0000)]
Merge "Add cold versions of benchmarks."
Christopher Ferris [Wed, 24 Jul 2013 22:34:13 +0000 (15:34 -0700)]
Add cold versions of benchmarks.
- Created macros for one and two buffer benchmarks to simplify
addition of new benchmarks.
- Created cold versions of all benchmarks that work on buffer benchmarks.
This means that the benchmark is given buffers that are not in the cache.
- Verified the cold versions are working as intended by
changing it so that the same buffer is written in each loop
instead of the strided buffer. Using this method, the cold and
normal benchmark run at the same speed.
Merge from internal master.
(cherry-picked from
991bcd464d67c3cff76477140331619ff138aafc)
Change-Id: I4b1b55510d90cc9a941fd68244971cb08cfba553
Christopher Ferris [Tue, 16 Jul 2013 23:31:51 +0000 (16:31 -0700)]
am
23062f99: Merge "Add a static version of the test."
* commit '
23062f994c2181d5de4f6f5b764c83d613465bba':
Add a static version of the test.
Christopher Ferris [Tue, 16 Jul 2013 23:30:05 +0000 (23:30 +0000)]
Merge "Add a static version of the test."
Christopher Ferris [Mon, 15 Jul 2013 19:50:30 +0000 (12:50 -0700)]
Add a static version of the test.
Merge from internal master.
(cherry-picked from
4052fe181a499f52729b7178f11ae91212823682)
Change-Id: I90d1320e8d8032d82909a2a7435fda9ee3ec1fdb
Christopher Ferris [Mon, 15 Jul 2013 22:23:03 +0000 (15:23 -0700)]
am
f23b47e9: am
d8f4bfc7: (-s ours) Merge "Add tests for strcpy and strcat."
* commit '
f23b47e914b94faaa562306a37109125b7b90901':
Add tests for strcpy and strcat.
Christopher Ferris [Mon, 15 Jul 2013 22:20:34 +0000 (15:20 -0700)]
am
d8f4bfc7: (-s ours) Merge "Add tests for strcpy and strcat."
* commit '
d8f4bfc728c95bcd4df4f0ea35d43246d2d26af0':
Add tests for strcpy and strcat.
Christopher Ferris [Mon, 15 Jul 2013 21:47:29 +0000 (21:47 +0000)]
Merge "Add tests for strcpy and strcat."
Christopher Ferris [Thu, 11 Jul 2013 22:14:42 +0000 (15:14 -0700)]
Add tests for strcpy and strcat.
Also convert all of the different string length defines to a single
string length macro.
Move the string alignment loop to the top and make all alignment structures
const.
Merge from internal master.
(cherry-picked from
1c33ae7ce88efc23b627f5fdb74afc461fc8e4f5)
Change-Id: I973795cfff55975574dd1b17cc9b25d9f6932873
Christopher Ferris [Mon, 15 Jul 2013 21:39:43 +0000 (14:39 -0700)]
am
1868728e: am
ecd2c8f2: Merge "Adding strlen, strcat, strcpy benchmarks."
* commit '
1868728e5968e3106fe6ebb0e173b9f0fc9235a9':
Adding strlen, strcat, strcpy benchmarks.
Christopher Ferris [Mon, 15 Jul 2013 21:38:49 +0000 (14:38 -0700)]
am
ecd2c8f2: Merge "Adding strlen, strcat, strcpy benchmarks."
* commit '
ecd2c8f2fdebcfcbbfda1727c09d221d76de1ce7':
Adding strlen, strcat, strcpy benchmarks.
Christopher Ferris [Mon, 15 Jul 2013 21:36:59 +0000 (21:36 +0000)]
Merge "Adding strlen, strcat, strcpy benchmarks."
Christopher Ferris [Mon, 15 Jul 2013 20:13:27 +0000 (13:13 -0700)]
am
38273ce3: (-s ours) am
ac2518d1: (-s ours) Merge "Add strlen tests. DO NOT MERGE"
* commit '
38273ce3a20537c366dadac6047c77914c498364':
Add strlen tests. DO NOT MERGE
Christopher Ferris [Mon, 15 Jul 2013 20:11:16 +0000 (13:11 -0700)]
am
ac2518d1: (-s ours) Merge "Add strlen tests. DO NOT MERGE"
* commit '
ac2518d13b67d682a59bb070f9971549dcca7249':
Add strlen tests. DO NOT MERGE
Christopher Ferris [Thu, 11 Jul 2013 01:55:57 +0000 (18:55 -0700)]
Adding strlen, strcat, strcpy benchmarks.
Merge from internal master.
(cherry-picked from
7401bc1263d9b9d9f7605a3c5bdaaf3171c7e9c0)
Change-Id: I7139a96022540c3604dd38f7f7836c8823e540dc
Christopher Ferris [Mon, 15 Jul 2013 20:08:13 +0000 (20:08 +0000)]
Merge "Add strlen tests. DO NOT MERGE"
Christopher Ferris [Thu, 11 Jul 2013 00:07:51 +0000 (17:07 -0700)]
Add strlen tests. DO NOT MERGE
Merge from internal master.
(cherry-picked from from commit
a63c049f23c49b6345bf2c845a415109c5471ebe)
Change-Id: I443a866a4b146a8043dd84cf6b7c090ecd529519
Christopher Ferris [Wed, 3 Jul 2013 01:14:16 +0000 (18:14 -0700)]
am
a8f6f321: Merge "Add vldr vstr type benchmarking."
* commit '
a8f6f3218aabdd5a691679d06034dbb9a7812854':
Add vldr vstr type benchmarking.
Christopher Ferris [Wed, 3 Jul 2013 01:12:23 +0000 (01:12 +0000)]
Merge "Add vldr vstr type benchmarking."
Christopher Ferris [Tue, 2 Jul 2013 23:38:45 +0000 (16:38 -0700)]
Add vldr vstr type benchmarking.
Merge from internal master.
(cherry-picked from commit
65d2c7894a93f66ea41d55f843285e7e7bdbf488)
Change-Id: I854b5f310fa44efcaf93af14b84ffe5673cc46c0
Christopher Ferris [Wed, 26 Jun 2013 23:44:52 +0000 (16:44 -0700)]
am
faec68b0: Merge "Add a benchmark of strcpy."
* commit '
faec68b05e13ce31566feabd01fc23960a93aff1':
Add a benchmark of strcpy.
Christopher Ferris [Wed, 26 Jun 2013 23:42:26 +0000 (23:42 +0000)]
Merge "Add a benchmark of strcpy."
Christopher Ferris [Wed, 26 Jun 2013 20:42:18 +0000 (13:42 -0700)]
Add a benchmark of strcpy.
List of all changes:
- Add a strcpy benchmark.
- Create a macro that is used to create all of the code for the main
loop of the benchmark.
- Fix the strcmp benchmark to use two buffers. The single buffer was
an experiment that should not have been committed. It also crashes
when a large alignment is used because it hard-coded an extra 2048
allocation regardless of the alignment chosen.
- Modify the libc benchmarks to take the function to bench as a
parameter. This will allow us to benchmark new potential libc
optimizations by adding a single line to the function table list.
Merge from internal master.
(cherry-picked from commit
014cf9dc226a775e27b2e6ace2461c510d9c6c19)
Change-Id: I8848e309fa1b323fe98f4525eb0f27a889fd0a7f
Colin Cross [Mon, 24 Jun 2013 22:58:37 +0000 (15:58 -0700)]
am
111659ee: Merge changes I707570ad,I900b673d,I62310b2c,I6b030d9d,I8f5a55de,I51a12fb8,I857143a5,I95025d52,I6367555d,I7d80e2b4,If4a4a2bb,I884eedea,Ibd0b26e4,Ia145018d,I2706e6fb,Ib1467329
* commit '
111659ee89ecb6fc0a70c92cca81c0ee7de6c656':
procrank: add support for only showing cached, noncached, or KSM pages
libpagemap: add pm_process_usage_flags
librank: add flag to show only KSM pages
libpagemap: fix new kernel flag names to start with PM_PAGE_
librank: show swapped pages per library
procrank: show swapped pages per process
libpagemap: count swapped pages
librank: add command line argument for cached or non-cached pages
libpagemap: add pm_map_usage_flags
librank: add command line argument to show all mappings
libpagemap: add page flags for new kernels
librank: add permissions command line argument
libpagemap: add definition for mask of permission flags
librank: convert argument parsing to getopt_long
libpagemap: fix vss calculation
libpagemap: fix reusing previous name for mappings with no name
Colin Cross [Mon, 24 Jun 2013 22:57:08 +0000 (22:57 +0000)]
Merge changes I707570ad,I900b673d,I62310b2c,I6b030d9d,I8f5a55de,I51a12fb8,I857143a5,I95025d52,I6367555d,I7d80e2b4,If4a4a2bb,I884eedea,Ibd0b26e4,Ia145018d,I2706e6fb,Ib1467329
* changes:
procrank: add support for only showing cached, noncached, or KSM pages
libpagemap: add pm_process_usage_flags
librank: add flag to show only KSM pages
libpagemap: fix new kernel flag names to start with PM_PAGE_
librank: show swapped pages per library
procrank: show swapped pages per process
libpagemap: count swapped pages
librank: add command line argument for cached or non-cached pages
libpagemap: add pm_map_usage_flags
librank: add command line argument to show all mappings
libpagemap: add page flags for new kernels
librank: add permissions command line argument
libpagemap: add definition for mask of permission flags
librank: convert argument parsing to getopt_long
libpagemap: fix vss calculation
libpagemap: fix reusing previous name for mappings with no name
Colin Cross [Sat, 22 Jun 2013 00:02:05 +0000 (17:02 -0700)]
procrank: add support for only showing cached, noncached, or KSM pages
Add the -c, -C, and -k arguments to only show pages that are
cached (backed by storage), non-cached (backed by ram or swap),
or have been collapsed by KSM respectively.
Change-Id: I707570ad406106b0aca230d18f9945901d193aca
Colin Cross [Sat, 22 Jun 2013 00:01:06 +0000 (17:01 -0700)]
libpagemap: add pm_process_usage_flags
Add pm_process_usage flags to get memory usage by a process, only
counting pages with specified flags set.
Change-Id: I900b673ddbb5ae92312773a8670dd59769617268
Colin Cross [Fri, 21 Jun 2013 23:53:03 +0000 (16:53 -0700)]
librank: add flag to show only KSM pages
Passing -k will cause librank to only show KSM pages. The RSS
column will approximate the memory used before KSM, and PSS will
show the memory used after KSM.
Change-Id: I62310b2cda97316b835cf7ebe51b5155872c37dc
Colin Cross [Fri, 21 Jun 2013 23:52:08 +0000 (16:52 -0700)]
libpagemap: fix new kernel flag names to start with PM_PAGE_
Change-Id: I6b030d9d0356d63b3ddb853de304407bc70b38c4
Colin Cross [Fri, 21 Jun 2013 19:55:56 +0000 (12:55 -0700)]
librank: show swapped pages per library
Add a column showing swapped pages per library, but only show it
if swapped pages exist in at least one library.
Change-Id: I8f5a55dee7ed8d1f02ed7c947f6a22f7a5771eb8
Colin Cross [Fri, 21 Jun 2013 19:54:13 +0000 (12:54 -0700)]
procrank: show swapped pages per process
Add a column showing swapped pages per process, but only show it
if swapped pages exist in at least one process.
Change-Id: I51a12fb8999c2a73418277fd575e7109478667d5
Colin Cross [Fri, 21 Jun 2013 19:53:51 +0000 (12:53 -0700)]
libpagemap: count swapped pages
Add a new memusage field for swapped pages.
Change-Id: I857143a5fdd294315dd89e834b1217a219f10479
Colin Cross [Thu, 23 May 2013 19:57:36 +0000 (12:57 -0700)]
librank: add command line argument for cached or non-cached pages
Add -c and -C command line arguments to only count pages that are
cached (backed by storage) or non-cached (backed by ram or swap)
respectively. Non-cached pages include all anonymous pages, as
well as file backed pages that are mapped private and then modified.
Change-Id: I95025d52f1c876b9c41fcbddaef5e95e32ebf307
Colin Cross [Thu, 23 May 2013 19:53:14 +0000 (12:53 -0700)]
libpagemap: add pm_map_usage_flags
Add pm_map_usage_flags, which is the same as pm_map_usage but only
counts pages with the specified flags set. This can be used to
only count "swapbacked" pages, which are pages that cannot be
flushed back to disk without using swap.
Change-Id: I6367555d9385502c797935849bb4221a8354e251
Colin Cross [Thu, 23 May 2013 19:38:54 +0000 (12:38 -0700)]
librank: add command line argument to show all mappings
Add -a command line argument to show all mappings, including
anonymous, stack, and heap mappings.
Change-Id: I7d80e2b4f5d880d434f57e1e7a37678917cd7407
Colin Cross [Wed, 22 May 2013 02:48:18 +0000 (19:48 -0700)]
libpagemap: add page flags for new kernels
Change-Id: If4a4a2bbe9b1a68c5dce1151cf8b7c60cae1a3fa
Colin Cross [Wed, 22 May 2013 22:03:52 +0000 (15:03 -0700)]
librank: add permissions command line argument
Add a command line argument to only list pages with the given
permissions.
Change-Id: I884eedea607b250ac721e7fdac555992c435441f
Colin Cross [Wed, 22 May 2013 22:02:09 +0000 (15:02 -0700)]
libpagemap: add definition for mask of permission flags
Change-Id: Ibd0b26e4f5245592152d2c8ef00e7da1ad5f3fdf
Colin Cross [Wed, 22 May 2013 21:49:19 +0000 (14:49 -0700)]
librank: convert argument parsing to getopt_long
Change-Id: Ia145018d9096a550febe465c9f5b5f00d36c444d
Colin Cross [Wed, 22 May 2013 23:33:03 +0000 (16:33 -0700)]
libpagemap: fix vss calculation
pm_map_usage was not incrementing vss for pages that were in the
process's map but not occupying a physical page. Move the
vss increment above the check for present mappings.
Change-Id: I2706e6fbcbfe7d70f10950333a486d690bc84d6c
Colin Cross [Thu, 16 May 2013 01:31:05 +0000 (18:31 -0700)]
libpagemap: fix reusing previous name for mappings with no name
Mappings that are not from a file do not have a name. The sscanf
will read all of the fields up to the name, and then leave name
untouched. This causes the previous name to be reused. Reset
name to an empty string before each call to sscanf.
Change-Id: Ib146732983eb074d0d4773be094efa0b672f5ed2
Elliott Hughes [Tue, 14 May 2013 22:02:31 +0000 (15:02 -0700)]
am
69294b5b: Merge "Add guards around neon code."
* commit '
69294b5bf79dd0f0909ed8831fbac0f3ab5bf1e5':
Add guards around neon code.
Elliott Hughes [Tue, 14 May 2013 21:36:46 +0000 (21:36 +0000)]
Merge "Add guards around neon code."
Christopher Ferris [Tue, 14 May 2013 20:15:11 +0000 (13:15 -0700)]
Add guards around neon code.
Missed the neon code in the copy bandwidths. Added guards and the
functionality to indicate that these are neon based benchmarks.
(cherry-pick of
a67e53c2345eac337d24e4decaf4733c5314aff8.)
Change-Id: If0fae051c47979eb243681a3c994222cefaae826
Christopher Ferris [Fri, 3 May 2013 21:32:35 +0000 (14:32 -0700)]
am
10057e4d: Merge "Fix a few incorrect return codes."
* commit '
10057e4dbeae5bc7ed495dc9f2342a6596c82c79':
Fix a few incorrect return codes.
Christopher Ferris [Fri, 3 May 2013 20:34:46 +0000 (20:34 +0000)]
Merge "Fix a few incorrect return codes."
Christopher Ferris [Fri, 3 May 2013 20:23:21 +0000 (13:23 -0700)]
am
ed6a3afa: Merge "Add read bandwidth and small refactor."
* commit '
ed6a3afac9f3d34fc2ce2f23baec05f7a43e58cf':
Add read bandwidth and small refactor.
Christopher Ferris [Fri, 3 May 2013 19:51:45 +0000 (12:51 -0700)]
Fix a few incorrect return codes.
Merge from internal master.
(cherry-picked from
f90ab5f4ab00ddfbcf313be9001837aaefd64ba2)
Change-Id: I87379bac089107a95301015d849433c9e304a988
Christopher Ferris [Fri, 3 May 2013 19:49:53 +0000 (19:49 +0000)]
Merge "Add read bandwidth and small refactor."
Christopher Ferris [Thu, 2 May 2013 22:12:11 +0000 (15:12 -0700)]
Add read bandwidth and small refactor.
- Addition of read bandwidth test.
- Move the allocation of all buffers used for testing into the
setSize() function.
- Add a canRun function to indicate whether a test is able to
run on this platform. Currently, this only disables neon bandwidth
tests on platforms that don't support neon.
- Refactor the thread testing functions to use one common routine.
Merge from internal master.
(cherry-picked from
1a3794a84074d7f22b8ddaba840aedd758a14cdd)
Change-Id: Ie0f29ec7e484a376471d121333b1982be8f41393
Christopher Ferris [Thu, 2 May 2013 23:27:47 +0000 (16:27 -0700)]
am
54e6afd9: Merge "Fix hard-coded fencepost value."
* commit '
54e6afd9d67dbb52a30aba3349f9a133d484f753':
Fix hard-coded fencepost value.
Christopher Ferris [Thu, 2 May 2013 22:41:15 +0000 (22:41 +0000)]
Merge "Fix hard-coded fencepost value."
Christopher Ferris [Thu, 2 May 2013 21:08:31 +0000 (14:08 -0700)]
Fix hard-coded fencepost value.
Merge from internal master.
(cherry-picked from commit
1685d00d0a6b905a820a76c9686b6b4b077dfe4a)
Change-Id: Ie9d64844c28ea720091acfefc21f888827fecb4b
Colin Cross [Wed, 1 May 2013 04:12:27 +0000 (21:12 -0700)]
am
d519cfaa: Merge "procmem: fix procmem crash issue"
* commit '
d519cfaa64b4cbefaa8735abcaa20fae11adf941':
procmem: fix procmem crash issue
Colin Cross [Wed, 1 May 2013 03:43:32 +0000 (03:43 +0000)]
Merge "procmem: fix procmem crash issue"
Christopher Ferris [Thu, 25 Apr 2013 00:39:28 +0000 (17:39 -0700)]
am
c3004a7b: Merge "Add defines around neon code."
* commit '
c3004a7b5c1bc83440d45d6f56627708517d8711':
Add defines around neon code.
Christopher Ferris [Thu, 25 Apr 2013 00:39:27 +0000 (17:39 -0700)]
am
fd17d874: Merge "Update the libc_test."
* commit '
fd17d874d61021db7e7580b19b8b17b6e1da2ab8':
Update the libc_test.
Christopher Ferris [Wed, 24 Apr 2013 23:53:10 +0000 (23:53 +0000)]
Merge "Add defines around neon code."
Christopher Ferris [Wed, 24 Apr 2013 23:52:42 +0000 (23:52 +0000)]
Merge "Update the libc_test."
Christopher Ferris [Wed, 24 Apr 2013 23:44:14 +0000 (16:44 -0700)]
Add defines around neon code.
Merge from internal master.
(cherry-picked from commit
e5282ae49814c9ed0b9bdec920a20e6978349327)
Change-Id: I00bf68545987ef360fe489b14df8e11fdd7b687b
Christopher Ferris [Wed, 24 Apr 2013 19:57:05 +0000 (12:57 -0700)]
Update the libc_test.
- Refactored the fencepost testing code, include adding a fencepost
before the buffer (when not using the value returned by malloc).
- Add a verbose option to display more information as the test runs.
- Change the test to stop on the first fail rather than keep going.
Merge change from internal master.
(cherry-picked from commit
f0b2c68c83e6ced8f988f014bc235393ca231958)
Change-Id: I846c7a01be64a0bcea49084fe2f75df4af00e699
Christopher Ferris [Wed, 24 Apr 2013 22:27:25 +0000 (15:27 -0700)]
am
822f0058: Merge "Adding a few bandwidth tests."
* commit '
822f00581198c2faf4f78b8dd3106e3306bb8249':
Adding a few bandwidth tests.
Christopher Ferris [Wed, 24 Apr 2013 21:19:04 +0000 (21:19 +0000)]
Merge "Adding a few bandwidth tests."
Christopher Ferris [Fri, 12 Apr 2013 00:50:18 +0000 (17:50 -0700)]
Adding a few bandwidth tests.
New tests being added:
- copy_bandwidth: Gathers the copy bandwidth using four different
hand-coded assembler routines and using memcpy.
- write_bandwidth: Gathers the write bandwidth using four different
hand-coded assembler routines and using memset.
- per_core_bandwidth: Launches a thread of any one of the write/copy
bandwidth tests locked to every available core on the machine.
- multithread_bandwidth: Launches a user specified number of threads running
any one of the write/copy bandwidth tests.
Each of the tests can be modified as to the size of the data to manipulate
and the number of loops to run.
Deleted tests:
- memcpy (a better memcpy benchmark can be found in system/extras/micro_bench)
- memset (a better memset benchmark can be found in system/extras/micro_bench)
- memcmp (no real replacement, but I plan to add this to micro_bench)
- strlen (no real replacement, but I plan to add this to micro_bench)
- cpufreq (this doesn't work any more)
All verification tests have been mostly shifted to system/extras/libc_test.
Merge from internal master.
(cherry-picked from commit
1348ce27ee9bb8e50a3294879c1523fa4b4d8f8b)
Change-Id: I96e9f26357e4bac1d7bb8736176d80cc41d0b36b
Ying Wang [Wed, 10 Apr 2013 05:29:00 +0000 (22:29 -0700)]
Ying Wang [Wed, 10 Apr 2013 05:04:08 +0000 (22:04 -0700)]
Add liblog
Bug:
8580410
Change-Id: I9be769e7365b579dcfd94ac86e305044fcb515ee
Christopher Ferris [Tue, 9 Apr 2013 19:29:56 +0000 (12:29 -0700)]
am
dd31e3fa: Merge "Add a test for memset."
* commit '
dd31e3fadbfab9502a117078eda019e115c24e5e':
Add a test for memset.
Christopher Ferris [Tue, 9 Apr 2013 18:34:10 +0000 (18:34 +0000)]
Merge "Add a test for memset."
Christopher Ferris [Tue, 9 Apr 2013 18:26:07 +0000 (11:26 -0700)]
Add a test for memset.
Change-Id: Id6bebd267c609b3a42412ec8d4ffa88597afd54f
Christopher Ferris [Tue, 9 Apr 2013 01:09:31 +0000 (18:09 -0700)]
am
ed1d0432: Merge "Add framework for libc testing."
* commit '
ed1d0432389fef75563d9c659bf88c50185ef654':
Add framework for libc testing.
Christopher Ferris [Tue, 9 Apr 2013 00:42:34 +0000 (00:42 +0000)]
Merge "Add framework for libc testing."
Christopher Ferris [Thu, 4 Apr 2013 02:16:44 +0000 (19:16 -0700)]
Add framework for libc testing.
In order to test the strcmp and memcpy libc changes, I created this
framework and these extensive tests.
Change-Id: I8400f786f467f20afe0330c23bd7c50704f8376d
Christopher Ferris [Thu, 4 Apr 2013 00:34:39 +0000 (17:34 -0700)]
am
409e8950: Merge "Add strcmp benchmarking."
* commit '
409e8950ee2fc9802c4382cd7d2fb10f5e0b9d74':
Add strcmp benchmarking.
Christopher Ferris [Thu, 4 Apr 2013 00:24:57 +0000 (00:24 +0000)]
Merge "Add strcmp benchmarking."
Christopher Ferris [Tue, 2 Apr 2013 20:28:16 +0000 (13:28 -0700)]
Add strcmp benchmarking.
NOTE: After this change memcpy results will be significantly lower
for larger sized copies.
Changes:
- Addition of strcmp benchmarking.
- Fix memcpy to initialize memory before copy. If this is not done, the
results of memcpy are artificially higher.
- Add a min and max when printing averages.
- Add two new options --dst_or_mask and --src_or_mask to allow more
flexibility when testing different alignments.
Change-Id: Ia2859d5569ab5ffa35e5ac0f6d5d1f248fef6533
Hong-Mei Li [Mon, 1 Apr 2013 03:28:47 +0000 (11:28 +0800)]
procmem: fix procmem crash issue
For the case pm_map_pagemap return error(e.g, maps[i]->start==maps[i]->end==0),
the main loop continue without set mis[i] fields, and then mis[i]==0. So that
the corresponding mi item is 0 for this case.
Skip dumping this item to avoid crash.
Change-Id: I7e1bea1abdccfd7594b9d904938b3462dc182a76
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
Jeff Sharkey [Sat, 9 Mar 2013 00:13:03 +0000 (16:13 -0800)]
Remove bugsender; now using dumpstate directly.
Bug:
8334369
Change-Id: I3a293c731bb9b02cc21e1df2863e2b0bc7a8f554
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:24 +0000 (13:44 -0700)]
am
9bc71158: am
f9ad69f4: am
803b245e: (-s ours) am
469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9bc711585e0711a57b4e043c0ecbc892ce1e17ee':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:29 +0000 (13:13 -0700)]
am
f9ad69f4: am
803b245e: (-s ours) am
469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f9ad69f467c2207e6e8ec995c2b73dde0f6a787f':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:47:15 +0000 (12:47 -0700)]
am
803b245e: (-s ours) am
469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
803b245ef485f16245234a42b8885a2ec50c5e5a':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:28:05 +0000 (12:28 -0700)]
am
469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
469dbc0aec2b85c3ac9947f1d1572c27bd5ce99e':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:31 +0000 (12:23 -0700)]
Reconcile with jb-mr1-release - do not merge
Nick Kralevich [Fri, 1 Mar 2013 22:14:53 +0000 (22:14 +0000)]
am
26ebd81c: Merge "ext4_utils: use android_filesystem_capability.h"
* commit '
26ebd81c1d73d7ce77e1c0cb5ac67c6d2ba4f004':
ext4_utils: use android_filesystem_capability.h
Nick Kralevich [Fri, 1 Mar 2013 21:42:50 +0000 (21:42 +0000)]
Merge "ext4_utils: use android_filesystem_capability.h"
Nick Kralevich [Fri, 1 Mar 2013 21:24:44 +0000 (13:24 -0800)]
ext4_utils: use android_filesystem_capability.h
Change-Id: I47cb6ec2f1fcba0d076081b76335638b9c2d1789
Ben Murdoch [Wed, 27 Feb 2013 14:40:15 +0000 (14:40 +0000)]
Fix build.
Change-Id: I8027e9cb455ac396189b2b8e58588aa1959bb8c0
Ben Cheng [Wed, 27 Feb 2013 02:46:29 +0000 (02:46 +0000)]
am
cf9a4f67: Merge "Update micro_bench."
* commit '
cf9a4f670144efdb2d335f1e6ed36795136b7716':
Update micro_bench.
Ben Cheng [Wed, 27 Feb 2013 01:42:04 +0000 (01:42 +0000)]
Merge "Update micro_bench."
Colin Cross [Mon, 25 Feb 2013 14:50:56 +0000 (14:50 +0000)]
am
cdfa5ece: Merge "ext4_utils: fix build error without FILE_CONTEXTS"
* commit '
cdfa5ece8d507f458384d6ca1b86d6c897b83cfc':
ext4_utils: fix build error without FILE_CONTEXTS
Colin Cross [Mon, 25 Feb 2013 07:20:30 +0000 (07:20 +0000)]
Merge "ext4_utils: fix build error without FILE_CONTEXTS"
Sungmin Choi [Mon, 25 Feb 2013 06:37:51 +0000 (15:37 +0900)]
ext4_utils: fix build error without FILE_CONTEXTS
After commit
4df62f342dbbe2f5cca831ce789dc0426d32ec03,
occurs segmentation fault if mkuserimg.sh runs without FILE_CONTEXTS options.
It's due to strlen() for null value. To fix it, return 0 for null.
Change-Id: Icf99706e51b9053a24e23b9d081a258962877c30
Nick Kralevich [Sat, 23 Feb 2013 04:40:45 +0000 (20:40 -0800)]
am
3130a32f: Merge "Fix win_sdk build."
* commit '
3130a32fd910f424a9d6b811ed23d9a552004c81':
Fix win_sdk build.
Nick Kralevich [Sat, 23 Feb 2013 03:40:52 +0000 (03:40 +0000)]
Merge "Fix win_sdk build."
Nick Kralevich [Sat, 23 Feb 2013 03:39:21 +0000 (19:39 -0800)]
Fix win_sdk build.
Change-Id: I1d1e722a533e0db99492e7fdf308f102dc4c3661
Nick Kralevich [Sat, 23 Feb 2013 02:31:44 +0000 (18:31 -0800)]
am
554ed4fa: Merge "ext4_utils: add filesystem capabilities support."
* commit '
554ed4fae98783a3c01880aed00ad415a0976029':
ext4_utils: add filesystem capabilities support.
Nick Kralevich [Sat, 23 Feb 2013 02:03:53 +0000 (02:03 +0000)]
Merge "ext4_utils: add filesystem capabilities support."
Nick Kralevich [Thu, 7 Feb 2013 22:21:34 +0000 (14:21 -0800)]
ext4_utils: add filesystem capabilities support.
Add support for specifying filesystem capabilities when
creating a new filesystem.
The combination of SELinux extended attributes plus
filesystem capability extended attributes is too big
to fit inside one inode entry. Because of this, I added
support to ext4_utils to create an xattr block and link
the inode to that block. We continue to try to fit
everything inside the inode if possible, but fall over to
creating a block if the extended attribute is too big.
Change-Id: I40ebb63975b15ecd8c565486e171b4d50cd4dfaa
Nick Kralevich [Wed, 20 Feb 2013 20:42:47 +0000 (12:42 -0800)]
am
f070d346: Merge "ext4_utils: clean up some warnings."
* commit '
f070d34601fa2f13e74897253be3a2b3681e4014':
ext4_utils: clean up some warnings.