Commit graph

13738 commits

Author SHA1 Message Date
Mark Salyzyn
4eef4398f6 am 27ceeb04: am d8ff56c9: am c3d40b86: Merge "logd: Add Pid statistics"
* commit '27ceeb04c5d8ce6f5ac96dc1315ace35b761de5c':
  logd: Add Pid statistics
2015-04-09 01:05:13 +00:00
Mark Salyzyn
27ceeb04c5 am d8ff56c9: am c3d40b86: Merge "logd: Add Pid statistics"
* commit 'd8ff56c9f1550bc2d25807b855d364ef19cd5d03':
  logd: Add Pid statistics
2015-04-09 00:31:53 +00:00
Mark Salyzyn
d8ff56c9f1 am c3d40b86: Merge "logd: Add Pid statistics"
* commit 'c3d40b86911867439fc01829d4f1011dae2a31be':
  logd: Add Pid statistics
2015-04-08 23:27:05 +00:00
Rom Lemarchand
28a5239464 Merge "mkbootimg: make ramdisk optional" 2015-04-08 22:26:43 +00:00
Mark Salyzyn
c3d40b8691 Merge "logd: Add Pid statistics" 2015-04-08 22:13:28 +00:00
Rom Lemarchand
13e93f7112 mkbootimg: make ramdisk optional
Change-Id: Iaa0d220a1fdc5e8652ab8eaf3314bbdcb0746732
2015-04-08 15:13:11 -07:00
Mohamad Ayyash
56b8a6a59f am 0009bacf: am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squashfs""
* commit '0009bacfda1f6b6a7421c3d1d7a07cc8c88c2090':
  Revert "fs_mgr_verity: Add support for squashfs"
2015-04-08 22:07:18 +00:00
Mohamad Ayyash
520431b0b8 am d411d14a: am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs"
* commit 'd411d14a07842563500cb8991f0f8a84fcb1cd8f':
  fs_mgr_verity: Add support for squashfs
2015-04-08 22:07:17 +00:00
Elliott Hughes
bcb8de3c3c am fb3273e1: am 6e73780b: am 74a18757: Merge "Lose getprop to toybox."
* commit 'fb3273e13d5aad0b283e9d68da7266b31b8c6dc2':
  Lose getprop to toybox.
2015-04-08 22:07:16 +00:00
Mark Salyzyn
720f6d1d55 logd: Add Pid statistics
- Optional class of statistics for PID
- Enhance pidToName
- Enhanced uidToName
- Enhance pidToUid
- template sort and iteration

Bug: 19608965
Change-Id: I04a1f02e9851b62987f9b176908134e455f22d1d
2015-04-08 14:37:32 -07:00
Mohamad Ayyash
0009bacfda am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squashfs""
* commit 'd71eca9e09dbe456bfb308f64a4e7945dadc3aad':
  Revert "fs_mgr_verity: Add support for squashfs"
2015-04-08 21:37:30 +00:00
Mohamad Ayyash
d411d14a07 am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs"
* commit '48bfdb859b88307541d5719c834e6884ce89e52e':
  fs_mgr_verity: Add support for squashfs
2015-04-08 21:37:29 +00:00
Elliott Hughes
fb3273e13d am 6e73780b: am 74a18757: Merge "Lose getprop to toybox."
* commit '6e73780b9e10c9658a50b34346051cb060ffe1a4':
  Lose getprop to toybox.
2015-04-08 21:37:13 +00:00
Mohamad Ayyash
d71eca9e09 am e322ae19: Merge "Revert "fs_mgr_verity: Add support for squashfs""
* commit 'e322ae1996fd52e1c4d8fdbe29f4631d4bd936a3':
  Revert "fs_mgr_verity: Add support for squashfs"
2015-04-08 19:40:44 +00:00
Mohamad Ayyash
e322ae1996 Merge "Revert "fs_mgr_verity: Add support for squashfs"" 2015-04-08 19:34:10 +00:00
Mohamad Ayyash
7b97c7a3fa Revert "fs_mgr_verity: Add support for squashfs"
This reverts commit 807f47004f.

Change-Id: I2d7972c0828c842b44747dd08fbe44668f2a55db
2015-04-08 19:31:00 +00:00
Mohamad Ayyash
48bfdb859b am 70f81cee: Merge "fs_mgr_verity: Add support for squashfs"
* commit '70f81ceeeb1c88a164b0e02e05110043ceef8885':
  fs_mgr_verity: Add support for squashfs
2015-04-08 19:09:55 +00:00
Mohamad Ayyash
70f81ceeeb Merge "fs_mgr_verity: Add support for squashfs" 2015-04-08 19:02:11 +00:00
Elliott Hughes
6e73780b9e am 74a18757: Merge "Lose getprop to toybox."
* commit '74a1875766a0f41dd67cb8825ae671fd5b343f12':
  Lose getprop to toybox.
2015-04-08 18:11:29 +00:00
Elliott Hughes
74a1875766 Merge "Lose getprop to toybox." 2015-04-08 17:54:59 +00:00
Mark Salyzyn
6abe429588 am 4122304d: am 07e3ed46: am c19572fa: Merge "rootfs: init start logd in post-fs"
* commit '4122304de3990ca1fca2790468fb8e9ddcca11f2':
  rootfs: init start logd in post-fs
2015-04-08 16:56:04 +00:00
Mark Salyzyn
4122304de3 am 07e3ed46: am c19572fa: Merge "rootfs: init start logd in post-fs"
* commit '07e3ed462fd8033aa454f864180e8be2a04b2c21':
  rootfs: init start logd in post-fs
2015-04-08 16:44:56 +00:00
Mark Salyzyn
07e3ed462f am c19572fa: Merge "rootfs: init start logd in post-fs"
* commit 'c19572fa809c87623f1e720ea5596b01bca9f3ed':
  rootfs: init start logd in post-fs
2015-04-08 16:39:23 +00:00
Mark Salyzyn
c19572fa80 Merge "rootfs: init start logd in post-fs" 2015-04-08 16:32:39 +00:00
Mark Salyzyn
124ff15bca rootfs: init start logd in post-fs
The earliest point we can start logd is after /system is mounted.
Ideally on post-fs-system (does not exist), post-fs will do.
As insurance, we will also make sure logd is started if a
logd-reinit is requested. This results in logd starting at least
4 processes earlier than it does currently, with a tighter
grouping of threads which means we are taking advantage of a
lighter CPU load at the time, rather than taking cycles during
heavy activity during core startup.

Change-Id: If4f0bd3a53bb4c47500a54d741ca635d87c0c330
2015-04-08 09:18:50 -07:00
Elliott Hughes
5b50fc3d3a Lose getprop to toybox.
Change-Id: I5188dbcc7e248b2fabade2d8d137610b4adb3164
2015-04-07 22:32:49 -07:00
Elliott Hughes
ec56019c0f am 7584e990: am 6994d3fa: am bf403968: Merge "Lose setprop to toybox."
* commit '7584e9906308db18db924f0576e84707adf0cbf3':
  Lose setprop to toybox.
2015-04-08 04:00:23 +00:00
Elliott Hughes
7584e99063 am 6994d3fa: am bf403968: Merge "Lose setprop to toybox."
* commit '6994d3fa7a077ac429312af07da759be56670273':
  Lose setprop to toybox.
2015-04-08 03:43:03 +00:00
Elliott Hughes
6994d3fa7a am bf403968: Merge "Lose setprop to toybox."
* commit 'bf403968878fca07c6df98852e8958ddda365bab':
  Lose setprop to toybox.
2015-04-08 03:33:45 +00:00
Elliott Hughes
bf40396887 Merge "Lose setprop to toybox." 2015-04-08 03:27:20 +00:00
Nick Kralevich
bd3212fd92 am 5056cdcd: am 01190672: am de957955: Merge "Create /data/system/heapdump for system_server"
* commit '5056cdcdde4901fe667522cfebf3e1f9e1af3b3b':
  Create /data/system/heapdump for system_server
2015-04-08 01:06:59 +00:00
Nick Kralevich
5056cdcdde am 01190672: am de957955: Merge "Create /data/system/heapdump for system_server"
* commit '01190672d2194eefc24eade30c74b6d653578545':
  Create /data/system/heapdump for system_server
2015-04-08 00:43:30 +00:00
Nick Kralevich
01190672d2 am de957955: Merge "Create /data/system/heapdump for system_server"
* commit 'de957955522cdb433e3615abe2022afd180c4e49':
  Create /data/system/heapdump for system_server
2015-04-08 00:33:47 +00:00
Nick Kralevich
de95795552 Merge "Create /data/system/heapdump for system_server" 2015-04-08 00:07:20 +00:00
Nick Kralevich
9c0437fba7 Create /data/system/heapdump for system_server
Bug: 20073185
Change-Id: I6fd83d33da33d048fdd6b07fa1f675ecb4f4eb2c
2015-04-07 16:44:43 -07:00
Elliott Hughes
136a790a3a am 1fb919a3: am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox."
* commit '1fb919a358436905133f3d4819f8ee5f38395cc7':
  Lose restorecon to toybox.
2015-04-07 23:18:47 +00:00
Elliott Hughes
1fb919a358 am 55f49af6: am 5ae7b1e5: Merge "Lose restorecon to toybox."
* commit '55f49af66d73f8c6b25b8bd9bca73972449a48be':
  Lose restorecon to toybox.
2015-04-07 23:03:19 +00:00
Elliott Hughes
3da8e5ea97 Lose setprop to toybox.
Change-Id: Ic0fd9cfb70e117067f4ebc5e120dea4b5fe1d883
2015-04-07 15:59:07 -07:00
Elliott Hughes
55f49af66d am 5ae7b1e5: Merge "Lose restorecon to toybox."
* commit '5ae7b1e5dfc1b3612fb3a894b9e01aed4624a602':
  Lose restorecon to toybox.
2015-04-07 22:52:38 +00:00
Elliott Hughes
5ae7b1e5df Merge "Lose restorecon to toybox." 2015-04-07 22:42:20 +00:00
Elliott Hughes
877dfc2896 Lose restorecon to toybox.
Change-Id: I5460f46700011b7733a1d87a9049e828531627be
2015-04-07 14:45:07 -07:00
Nick Kralevich
1268f227ee am f09bfa3c: am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct"
* commit 'f09bfa3c14c8b5a920a98c1327c0d42f9ef9e2ca':
  logd: Don't embed a flexible array member within another struct
2015-04-07 18:44:07 +00:00
Nick Kralevich
f09bfa3c14 am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct"
* commit '25482963840feae9f82e553fb69508aa8698b6bb':
  logd: Don't embed a flexible array member within another struct
2015-04-07 18:07:24 +00:00
Nick Kralevich
2548296384 am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct"
* commit '5fc47aae333520787d4373bc615a8ddcf58955ae':
  logd: Don't embed a flexible array member within another struct
2015-04-07 17:56:42 +00:00
Nick Kralevich
5fc47aae33 Merge "logd: Don't embed a flexible array member within another struct" 2015-04-07 17:46:23 +00:00
Nick Kralevich
58ba58a97c logd: Don't embed a flexible array member within another struct
C (but not C++) has a concept of a flexible array member, which
is documented at https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html .
Using a flexible array member indicates that the structure is
really a header for a variable length object.

In logd's case, the variable length structure android_event_string_t
was embedded within another structure called
android_log_event_string_t. This makes gcc's __builtin_object_size()
function really confused. When compiling with C++,
__builtin_object_size(android_log_event_string_t.payload.data, 1)
would return 0, whereas if you compiled the code with C, the same
call would (properly) return -1.

Code which does automatic bounds checking, such as the proposed
patch at https://android-review.googlesource.com/145411 , will
cause problems for logd if this syntax is used.

Don't try to embed a variable length structure within another
structure. This doesn't appear to be valid C nor C++, and
while it's worked, it seems problematic.

Instead, inline the structure so it's one big happy structure.

Change-Id: I8ac02b7142a4f6560f5f80df2effcf720f9896fc
2015-04-07 10:12:20 -07:00
Sami Tolvanen
a90dd16565 am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"
* commit '13e8af053b425b66199dc12b89c02236b517fac9':
  Restore verity state when verified partition is reflashed
2015-04-07 10:02:27 +00:00
Sami Tolvanen
856006047b am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified property value"
* commit '93c4b6c85ac4350029e1a78c16663f61c777ac14':
  Set verity mode as the verified property value
2015-04-07 10:02:26 +00:00
Sami Tolvanen
13e8af053b am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"
* commit 'b6b66f8fde39ce004fa9db5d9f88f21a2b7bedd0':
  Restore verity state when verified partition is reflashed
2015-04-07 09:42:32 +00:00
Sami Tolvanen
93c4b6c85a am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified property value"
* commit 'ddaebb24f34a83adfc812bf196c5c633633993fa':
  Set verity mode as the verified property value
2015-04-07 09:42:30 +00:00