Iliyan Malchev
355bd1fd98
am b33118ac: am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev
...
* commit 'b33118ac7603b459d690f524e0c64161f8ab5c0d':
fs_mgr: allow for zramsize to be specified as percentage of total memory
2015-05-13 17:29:05 +00:00
Mark Salyzyn
79128a8c23
am e97b11bc: liblog: gtest open("/dev/pmsg0", "a")
...
* commit 'e97b11bc42eb300d140ae43f1d4a2f025d57ac1c':
liblog: gtest open("/dev/pmsg0", "a")
2015-05-13 17:29:04 +00:00
Mark Salyzyn
5226cb99f6
am 654904f0: logd: Add TID statistics
...
* commit '654904f0f9c42458cae2b1931265f97f8fb6cb95':
logd: Add TID statistics
2015-05-13 17:15:31 +00:00
Mark Salyzyn
2ddb51c854
am 66091f11: logd: Cleanup
...
* commit '66091f11f427587bf810d89b0f64be556e1cd168':
logd: Cleanup
2015-05-13 17:15:30 +00:00
Mark Salyzyn
812a15f659
am 79c3815c: logcat: liblog: Add "usec" format argument
...
* commit '79c3815ca191033bd97e7d4458970b606f661a18':
logcat: liblog: Add "usec" format argument
2015-05-13 17:15:29 +00:00
Mark Salyzyn
617dc19b22
am 2a3e5be6: am 10c18d64: Merge "liblog: gtest open("/dev/pmsg0", "a")"
...
* commit '2a3e5be6c46b794ad8052dabd99575e31d27366d':
liblog: gtest open("/dev/pmsg0", "a")
2015-05-13 17:13:42 +00:00
Mark Salyzyn
bb50775b6d
resolved conflicts for merge of a1aacb71 to mnc-dev-plus-aosp
...
Change-Id: I44f02fbb65e7834f0fe20ab8f20aefe3f3b1e725
2015-05-13 10:10:38 -07:00
Iliyan Malchev
b33118ac76
am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev
...
* commit '2557cd21f0af31d6dafee24d649f83314d2896d4':
fs_mgr: allow for zramsize to be specified as percentage of total memory
2015-05-13 17:07:53 +00:00
Mark Salyzyn
2a3e5be6c4
am 10c18d64: Merge "liblog: gtest open("/dev/pmsg0", "a")"
...
* commit '10c18d64c6d414ec9e2ecfe524a1e51cc2ac128c':
liblog: gtest open("/dev/pmsg0", "a")
2015-05-13 17:04:49 +00:00
Mark Salyzyn
99d5fb3aae
am 9e750a42: liblog: Add kernel log id
...
* commit '9e750a42b002f48622b54b247bb1ddd7abfa3fd1':
liblog: Add kernel log id
2015-05-13 17:02:03 +00:00
Mark Salyzyn
e97b11bc42
liblog: gtest open("/dev/pmsg0", "a")
...
(cherry pick from commit df0257d344 )
Change-Id: I918025a8ac28204076ce4831ce277b04091619f6
2015-05-13 10:00:02 -07:00
Mark Salyzyn
e9d125237e
am 1389791c: am d1371a8b: Merge "logd: Add TID statistics"
...
* commit '1389791c65d983222280c1f02ed2c55e3e3eceda':
logd: Add TID statistics
2015-05-13 16:49:00 +00:00
Mark Salyzyn
5689c8b86f
am 1fad20cf: am 0c6c4150: Merge changes I2cda9dd7,Ifb560850,I8d4c7c5a
...
* commit '1fad20cf4943cbc231fe8541fb507b67f71fa9b1':
logd: Cleanup
logcat: liblog: Add "usec" format argument
logd: Add klogd
2015-05-13 16:48:59 +00:00
Mark Salyzyn
10c18d64c6
Merge "liblog: gtest open("/dev/pmsg0", "a")"
2015-05-13 16:30:59 +00:00
Kenny Root
7587cb6e5c
resolved conflicts for merge of b942d6fb to mnc-dev-plus-aosp
...
Change-Id: I6d337d3491b7338173128a1c5cac00dea82bafb3
2015-05-13 09:25:30 -07:00
Mark Salyzyn
654904f0f9
logd: Add TID statistics
...
(cherry pick from commit 17ed6797df )
Bug: 19608965
Change-Id: Ifbf0b00c48ef12b5970b9f9f217bd1dd8f587f2c
2015-05-13 09:23:01 -07:00
Mark Salyzyn
66091f11f4
logd: Cleanup
...
(cherry pick from commit 7718778793 )
- Android Coding Standard for Constructors
- Side effects NONE
Change-Id: I2cda9dd73f3ac3ab58f394015cb810820093d47b
2015-05-13 09:22:56 -07:00
Mark Salyzyn
79c3815ca1
logcat: liblog: Add "usec" format argument
...
(cherry pick from commit e1f2004ecc )
- Add additional 3 digits of time precision for time output
adding in the reporting of usec
- Remove trailing space in header file
Change-Id: Ifb560850b8e01080e126fbaeab640db71cce3eea
2015-05-13 09:22:51 -07:00
Mark Salyzyn
a1aacb71f3
logd: Add klogd
...
(cherry pick from commit ae4d928d81 )
- Add a klogd to collect the kernel logs and place them into a
new kernel log buffer
- Parse priority, tag and message from the kernel log messages.
- Turn off pruning for worst UID for the kernel log buffer
- Sniff for 'PM: suspend exit', 'PM: suspend enter' and
'Suspended for' messages and correct the internal definition
time correction against monotonic dynamically.
- Discern if we have monotonic or real time (delineation 1980) in
audit messages.
- perform appropriate math to correct the timestamp to be real time
- filter out any external sources of kernel logging
Change-Id: I8d4c7c5ac19f1f3218079ee3a05a50e2ca55f60d
2015-05-13 09:22:45 -07:00
Mark Salyzyn
9e750a42b0
liblog: Add kernel log id
...
(cherry pick from commit 440e109d64 )
Change-Id: I53002f05a8bdf8d67e1d761c56c8761d3b534a76
2015-05-13 09:22:41 -07:00
Mark Salyzyn
1389791c65
am d1371a8b: Merge "logd: Add TID statistics"
...
* commit 'd1371a8b8b55352e19332ba87f4b3ece6db58e1f':
logd: Add TID statistics
2015-05-13 16:21:38 +00:00
Mark Salyzyn
1fad20cf49
am 0c6c4150: Merge changes I2cda9dd7,Ifb560850,I8d4c7c5a
...
* commit '0c6c41502acdd73ddcefd2f52489d94e3ca70241':
logd: Cleanup
logcat: liblog: Add "usec" format argument
logd: Add klogd
2015-05-13 16:21:37 +00:00
Mark Salyzyn
d1371a8b8b
Merge "logd: Add TID statistics"
2015-05-13 16:17:37 +00:00
Mark Salyzyn
6f5bb5e456
am 052bb261: am 88462ba7: Merge "logd: Add Tag statistics"
...
* commit '052bb261514282b4ee41fba378890a9431a8576b':
logd: Add Tag statistics
2015-05-13 16:16:20 +00:00
Mark Salyzyn
0c6c41502a
Merge changes I2cda9dd7,Ifb560850,I8d4c7c5a
...
* changes:
logd: Cleanup
logcat: liblog: Add "usec" format argument
logd: Add klogd
2015-05-13 16:14:25 +00:00
Elliott Hughes
7042b8c7ee
am 3d0bf350: am 6f9db165: Merge "Fix insmod module size"
...
* commit '3d0bf350f7f098d58487d7b851874d136e5ef609':
Fix insmod module size
2015-05-13 15:52:32 +00:00
Mark Salyzyn
53d050709f
am 672c990e: am 7297278a: Merge "logd: pidToName deficiency"
...
* commit '672c990ef0db61b0a5929ebf0dd5e2772bb79f17':
logd: pidToName deficiency
2015-05-13 15:52:26 +00:00
Elliott Hughes
b9bf906120
am 6b92181a: am bc014afb: Merge "Switch arch-arm/memset32.S to unified syntax."
...
* commit '6b92181a3d64416363e5cc0516d6b25ea11d35a9':
Switch arch-arm/memset32.S to unified syntax.
2015-05-13 15:21:47 +00:00
Elliott Hughes
cf96dc867d
am 5848c458: am f69624a1: Merge "Remove dead files."
...
* commit '5848c4589a256bef0ecfda2df3ce53c3e980309b':
Remove dead files.
2015-05-13 15:21:45 +00:00
Narayan Kamath
b284a003d6
am 241bcf05: Fix file descriptor leak when opening invalid archives.
...
* commit '241bcf05e0e394bbf2681f359f52646dd6c707f6':
Fix file descriptor leak when opening invalid archives.
2015-05-13 09:46:11 +00:00
Narayan Kamath
241bcf05e0
Fix file descriptor leak when opening invalid archives.
...
Also add -Wunreachable-code to the set of compiler flags, otherwise
noreturn becomes considerably less useful.
bug: https://code.google.com/p/android/issues/detail?id=171099
Change-Id: I9a95d45633c731c7046d4e4a39844d9cebfd1718
2015-05-13 09:20:44 +00:00
Terry Heo
e4c6666ea9
am 55431d97: Merge "rootdir: add permission for /dev/dvb*" into mnc-dev
...
* commit '55431d97459210f0f4ac66538ca6cbf8cf3511e9':
rootdir: add permission for /dev/dvb*
2015-05-13 06:06:37 +00:00
Terry Heo
55431d9745
Merge "rootdir: add permission for /dev/dvb*" into mnc-dev
2015-05-13 05:46:53 +00:00
Elliott Hughes
2550355ceb
resolved conflicts for merge of d410a9b3 to mnc-dev-plus-aosp
...
Change-Id: I2e8e6c9a2024e0a753d3912111ccd1c2bfbfef10
2015-05-12 20:16:40 -07:00
Elliott Hughes
d410a9b323
Merge changes Ie9d9a7ad,If7479bdc into mnc-dev
...
* changes:
Fix insmod module size
Enable property expansion for insmod
2015-05-13 02:45:59 +00:00
Tom Cherry
cce7e93b28
Fix insmod module size
...
read_file() used to append a new line character to the end of the buffer it
returns, because parse_config() isn't able to cope with input that's not
'\n'-terminated. Fix read_file() to be less insane, and push the workarounds
into the parse_config() callers.
Longer term we should rewrite parse_config().
Bug: http://b/21079470
Change-Id: Ie9d9a7adcd33b66621726aef20c4b8cc51c08be7
(cherry picked from commit eaa3b4ec6f )
2015-05-12 19:42:38 -07:00
Iliyan Malchev
2557cd21f0
am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev
...
* commit '8b4486294053ea96ac50d8c07d4fc23729ef7c52':
fs_mgr: allow for zramsize to be specified as percentage of total memory
2015-05-12 23:55:40 +00:00
Iliyan Malchev
8b44862940
am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev
...
* commit '16092b7a48e8426515f67206be2f0aee92fd6006':
fs_mgr: allow for zramsize to be specified as percentage of total memory
2015-05-12 23:41:37 +00:00
Iliyan Malchev
16092b7a48
Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev
2015-05-12 23:25:51 +00:00
Mark Salyzyn
867ea48a8a
am ff32f3c7: logd: Add Tag statistics
...
* commit 'ff32f3c77439b9791e58c225a8b7ca82dfc2c3da':
logd: Add Tag statistics
2015-05-12 22:59:56 +00:00
Mark Salyzyn
7718778793
logd: Cleanup
...
- Android Coding Standard for Constructors
- Side effects NONE
Change-Id: I2cda9dd73f3ac3ab58f394015cb810820093d47b
2015-05-12 15:51:46 -07:00
Mark Salyzyn
e1f2004ecc
logcat: liblog: Add "usec" format argument
...
- Add additional 3 digits of time precision for time output
adding in the reporting of usec
- Remove trailing space in header file
Change-Id: Ifb560850b8e01080e126fbaeab640db71cce3eea
2015-05-12 15:51:46 -07:00
Mark Salyzyn
ae4d928d81
logd: Add klogd
...
- Add a klogd to collect the kernel logs and place them into a
new kernel log buffer
- Parse priority, tag and message from the kernel log messages.
- Turn off pruning for worst UID for the kernel log buffer
- Sniff for 'PM: suspend exit', 'PM: suspend enter' and
'Suspended for' messages and correct the internal definition
time correction against monotonic dynamically.
- Discern if we have monotonic or real time (delineation 1980) in
audit messages.
- perform appropriate math to correct the timestamp to be real time
- filter out any external sources of kernel logging
Change-Id: I8d4c7c5ac19f1f3218079ee3a05a50e2ca55f60d
2015-05-12 15:51:46 -07:00
Eric Laurent
b942d6fbb6
am 74f0a578: Merge "audio: Fix false positives in audio_is_remote_submix_device()"
...
* commit '74f0a578a8ee0957b849e811af5fc30c74be55f0':
audio: Fix false positives in audio_is_remote_submix_device()
2015-05-12 22:47:08 +00:00
Mark Salyzyn
052bb26151
am 88462ba7: Merge "logd: Add Tag statistics"
...
* commit '88462ba7fcde3dc9a07b484bd3d526836e000b4b':
logd: Add Tag statistics
2015-05-12 22:40:44 +00:00
Eric Laurent
74f0a578a8
Merge "audio: Fix false positives in audio_is_remote_submix_device()"
2015-05-12 22:40:01 +00:00
Mark Salyzyn
ff32f3c774
logd: Add Tag statistics
...
(cherry pick from commit 344bff4391 )
- Optional class of statistics for events Tags
- export tagToName from LogBuffer (located in main.cp to address
https://android-review.googlesource.com/#/c/110204 )
- Can not handle dropped because getTag() can not work,
will need to be fixed if we start filtering.
Bug: 19608965
Change-Id: I7b90607ca588bf37bab71f19b1570a290e772776
2015-05-12 15:34:56 -07:00
Mark Salyzyn
88462ba7fc
Merge "logd: Add Tag statistics"
2015-05-12 22:31:46 +00:00
Emmanuel Berthier
30cc3d7249
Enable property expansion for insmod
...
Useful for dynamic kernel module location.
This permits to use init rule like:
insmod ${persist.modules.location}/<module_name>
Change-Id: If7479bdcb4e69ea7666f52a0075c785be025c2e9
Signed-off-by: Emmanuel Berthier <emmanuel.berthier@intel.com>
(cherry picked from commit ac41230cbc )
2015-05-12 15:01:02 -07:00
Elliott Hughes
3d0bf350f7
am 6f9db165: Merge "Fix insmod module size"
...
* commit '6f9db165a49e6763fb2101d6da057a223cee21c8':
Fix insmod module size
2015-05-12 21:45:01 +00:00