Commit graph

1284 commits

Author SHA1 Message Date
Paul Lawrence
0705fcb2f4 Merge "Add flags to restorecon_recursive to traverse filesystems" am: 5fbd1cfd34 am: ffa3689107 am: a99490c813
am: e799e3317a

Change-Id: Icd4b867d450c7b84f86f9d91b39faf6792544cb1
2016-11-17 18:30:22 +00:00
Paul Lawrence
ffa3689107 Merge "Add flags to restorecon_recursive to traverse filesystems"
am: 5fbd1cfd34

Change-Id: I539d7e9d441c7bb3f5602b892408a85436b857e8
2016-11-17 17:55:06 +00:00
Treehugger Robot
5fbd1cfd34 Merge "Add flags to restorecon_recursive to traverse filesystems" 2016-11-17 17:39:53 +00:00
Mark Salyzyn
95dbf68245 Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed am: 809dee506e am: 26545e3c60
am: 124b7cb732

Change-Id: I575ef1a45746c14b5c01301d8336307f2575a4ba
2016-11-17 16:02:50 +00:00
Mark Salyzyn
809dee506e Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h"
am: 8c41e791ed

Change-Id: Ifbc00285da734859d590153a7c6cfc8e51c014f9
2016-11-17 15:33:02 +00:00
Mark Salyzyn
8c41e791ed Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" 2016-11-17 15:22:14 +00:00
Wei Wang
171a7d6d20 init: fix undefined behavior in ExecuteCommand am: d67a4abc64 am: 279f3d593f am: 737d0f5265
am: 86e7b8c3c8

Change-Id: I9c844355f3b35722abf62dd9d164af5eac815ea9
2016-11-17 04:26:46 +00:00
Wei Wang
e389b08ff1 Revert "Revert "init: warn slow action"" am: 8b1d526a72 am: 3567c7c9d9 am: 67396253f2
am: 68a66a3e31

Change-Id: Ife3b3cda44ab3031e8c2125700c31a9634f7075c
2016-11-17 04:26:36 +00:00
Wei Wang
279f3d593f init: fix undefined behavior in ExecuteCommand
am: d67a4abc64

Change-Id: I1ecbb1d083af62dd5e69b4cff19ec411016054f3
2016-11-17 03:54:57 +00:00
Wei Wang
3567c7c9d9 Revert "Revert "init: warn slow action""
am: 8b1d526a72

Change-Id: Ie067e37758ae28fece1732ab7697e2a1286594dc
2016-11-17 03:54:51 +00:00
Wei Wang
2369b1eb80 Merge changes from topic 'slow_log'
* changes:
  init: fix undefined behavior in ExecuteCommand
  Revert "Revert "init: warn slow action""
2016-11-17 03:46:44 +00:00
Mark Salyzyn
52bd37e633 libcutils: move cutils/files.h to cutils/android_get_control_file.h
files.[h|cpp] is bound to be abused with junk, replace with
android_get_control_file.[h|cpp]. Plus some sundry cleanup.

Test: gTest libcutils-tests, logd-unit-tests, liblog-unit-tests,
      logcat-unit-tests and init_tests
Bug: 32450474
Change-Id: Ibd4a7aa4624ea19a43d1f98a3c71ac37805d36b5
2016-11-16 15:56:56 -08:00
Wei Wang
d67a4abc64 init: fix undefined behavior in ExecuteCommand
ExecuteCommand may change command_ vector which leads undefined behavior
This bug is found when adding logs in ExecuteCommand printing our Command class fields

Bug: 32838381
Test: on emulator
Change-Id: I96468bd2192ca80013871a3a6ac4132149363fff
2016-11-16 15:46:19 -08:00
Paul Lawrence
a8d8434c42 Add flags to restorecon_recursive to traverse filesystems
Use to solve the problem of tracefs conditionally being mounted
under debugfs and needing restorecon'd without boot performance
penalty.

Also move skip-ce to a flag for consistency.

Test: Check that trace_mount has correct attributes after boot
Bug: 32849675
Change-Id: Ib6731f502b6afc393ea5ada96fa95b339f14da49
2016-11-16 22:27:45 +00:00
Jeff Sharkey
d1d3bdd16f Only restorecon CE storage after unlocked.
On FBE devices, the filenames inside credential-encrypted directories
are mangled until the key is installed.  This means the initial
restorecon at boot needs to skip these directories until the keys
are installed.

This CL changes the implementation of the "restorecon_recursive"
built-in command to use the new SKIPCE flag to avoid labeling files
in CE directories.  vold will request a restorecon when the keys
are actually installed.

(cherrypicked from commit 1635afe83d)

Bug: 30126557
Test: Cherry-picked from master
Change-Id: I320584574a4d712c493b5bbd8a79b56c0c04aa58
2016-11-16 21:19:17 +00:00
Wei Wang
8b1d526a72 Revert "Revert "init: warn slow action""
This reverts commit 1802d11cc7.

Test: grep init log
Bug: 32712851
2016-11-15 23:58:55 -08:00
Ting-Yuan Huang
2f777bf732 Merge "init: fix memory leaks" am: a73ba879b1 am: 1700a162d5 am: fde3b5b95a
am: ec111ad6c1

Change-Id: I2b6d56ae8c3d0fb90444c4977d60fecbe78d048e
2016-11-16 03:54:43 +00:00
Ting-Yuan Huang
1700a162d5 Merge "init: fix memory leaks"
am: a73ba879b1

Change-Id: I3375372ddc23b7440edab0107ff1cbe34d550865
2016-11-16 03:32:40 +00:00
Treehugger Robot
a73ba879b1 Merge "init: fix memory leaks" 2016-11-16 03:25:34 +00:00
Ting-Yuan Huang
09bd41d097 init: fix memory leaks
It's possible that node is not freed before return.

Test: make WITH_TIDY=1 mmma system/core/init

Change-Id: I648eea9dda006d2b2239e169785190817ad31352
2016-11-15 16:55:50 -08:00
Elliott Hughes
e6f9b7c821 Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." am: f3e731b3c5 am: 3ee9807554 am: 74c997ffda
am: 06d14cd839

Change-Id: If941eaa9ac6326443b9282d157774f56b99f9970
2016-11-15 18:32:48 +00:00
Elliott Hughes
3ee9807554 Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for."
am: f3e731b3c5

Change-Id: I2028bb8835c5e55e1bf8c88c3395253ded9d66d3
2016-11-15 18:09:46 +00:00
Elliott Hughes
f3e731b3c5 Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." 2016-11-15 18:02:30 +00:00
Wei Wang
78331a6b2e Merge "init: fix BuildTriggersString for empty string" am: 9b1d5e15ef am: 4286801ccb am: 8256062afc
am: db738953f4

Change-Id: I5d1650bd19e86bc1cab9affb746d622445bc3ec3
2016-11-15 17:54:58 +00:00
Wei Wang
4286801ccb Merge "init: fix BuildTriggersString for empty string"
am: 9b1d5e15ef

Change-Id: Ia344bac744e767ab26d7811ceb2806cce5f28a60
2016-11-15 17:32:13 +00:00
Treehugger Robot
9b1d5e15ef Merge "init: fix BuildTriggersString for empty string" 2016-11-15 17:23:56 +00:00
Nick Desaulniers
146b1b2115 Merge "Revert "init: warn slow action"" am: 431c489568 am: ea516950fb am: 6133e64575
am: d7a92fd874

Change-Id: I3eda3dc7d6dc48466a953d731ea27d735f798c29
2016-11-15 07:28:12 +00:00
Nick Desaulniers
ea516950fb Merge "Revert "init: warn slow action""
am: 431c489568

Change-Id: I570911d0940fa6819de6f07e0d88cfadbfb6bdd1
2016-11-15 07:05:12 +00:00
Treehugger Robot
431c489568 Merge "Revert "init: warn slow action"" 2016-11-15 06:58:53 +00:00
Wei Wang
69b9b36c11 init: fix BuildTriggersString for empty string
behavior is undefined if pop_back() on empty std::string

Test: grep init log
Bug: 32712851
Bug: 32838381
Change-Id: I5bfac2fb275036abd0158b78df14019d2e82716d
2016-11-14 20:20:48 -08:00
Elliott Hughes
290a228fdc Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for.
Bug: http://b/32878766
Test: boots
Change-Id: Ie0ddfb7e60f2da5f6eefbb10c83a92e88c137ae3
2016-11-14 17:08:47 -08:00
Nick Desaulniers
1802d11cc7 Revert "init: warn slow action"
This reverts commit b1a309ac1f.

Bug: 32712851
Bug: 32838381
Change-Id: Ib4c47de5ea5b0bad765a43cbff9f73d9978729d4
2016-11-15 00:53:00 +00:00
Elliott Hughes
0666e42359 Merge "Switch ueventd to sendfile(2)." am: f77d8b0452 am: 85599ef5de am: fafae8e0cb
am: 8e86ebf904

Change-Id: I186f06e366d4999d97d03707ce77d4c14153d5fc
2016-11-14 22:10:42 +00:00
Elliott Hughes
afd0fbf691 Merge "init start time tracking." am: 601bf9e7c9 am: eefaa1f250 am: 3c03125f14
am: d366e92774

Change-Id: I9a0171ea555316ad3c9094b8373638d314f68f44
2016-11-14 21:58:05 +00:00
Elliott Hughes
85599ef5de Merge "Switch ueventd to sendfile(2)."
am: f77d8b0452

Change-Id: Iaf6d923bdf6f19e6c23fa6c4a80817fca59e6813
2016-11-14 21:48:38 +00:00
Elliott Hughes
f77d8b0452 Merge "Switch ueventd to sendfile(2)." 2016-11-14 21:39:25 +00:00
Elliott Hughes
eefaa1f250 Merge "init start time tracking."
am: 601bf9e7c9

Change-Id: Idd707d4694a4339e26884fe72b8f0c08c4100daf
2016-11-14 21:34:24 +00:00
Elliott Hughes
601bf9e7c9 Merge "init start time tracking." 2016-11-14 21:21:00 +00:00
Elliott Hughes
632e99a0d4 Switch ueventd to sendfile(2).
Bug: http://b/32826495
Test: booted and checked dmesg
Change-Id: Idfd813dfe6f512fdbc05b1411c7960e950e2f59b
2016-11-14 11:40:06 -08:00
Keun-young Park
baf45acfc0 Merge "fix swapped min / max in priority parsing" am: 557359863c am: ec2d5d8f04 am: ca2714b02a
am: 18c26bcc1d

Change-Id: I4796f2eba128fa44f24d90958a1bcc3d9253cda1
2016-11-13 05:14:01 +00:00
Keun-young Park
ec2d5d8f04 Merge "fix swapped min / max in priority parsing"
am: 557359863c

Change-Id: Ie8bbb5add66b56ff8641f26a081fe185204b7cc1
2016-11-13 04:52:29 +00:00
Elliott Hughes
9605a945f7 init start time tracking.
With this change, init sets a property "init.start" to show the
CLOCK_BOOTTIME time at which init itself started, and for each service
an "init.svc.<name>.start" property to show the CLOCK_BOOTTIME time at
which that service was most recently started.

These times can be used by tools like bootstat to track boot time.

As part of this change, move init over to std::chrono. Also, rather than
make the command-line argument handling more complex, I've switched to
using an environment variable for communication between first- and
second-stage init, and added another environment variable to pass the
start time of the first stage through to the second stage.

Bug: http://b/32780225
Test: manual
Change-Id: Ia65a623e1866ea688b9a5433d6507926ce301dfe
2016-11-12 11:17:40 -08:00
Keun-young Park
dd34ca45ea fix swapped min / max in priority parsing
- This error led into not handling highest priority,
  which made zygote's priority boost no-op

bug: 32718256
Test: check init log during bootup

Change-Id: I959eb94912a9c1d95bfdb98ee675fdd12cf85699
2016-11-11 18:32:13 -08:00
Elliott Hughes
79f2b33594 Fix include order.
Test: builds
Change-Id: I865044c8c54591582e7bb1b7a055cf7ba2f17464
2016-11-10 19:22:18 -08:00
Vineela Tummalapalli
29c42c6707 Merge "Implement Reboot bootloader via bootloader_message" am: e759c83bde am: d1b560c6f9 am: 5cd910acfc
am: 98a2556d01

Change-Id: Iba7ad15a8d6626dbc453e96751433da750fbc796
2016-11-10 03:10:55 +00:00
Vineela Tummalapalli
d1b560c6f9 Merge "Implement Reboot bootloader via bootloader_message"
am: e759c83bde

Change-Id: Id0a0e9e9c10f3df206138f297d2acafa87dc4ebf
2016-11-10 02:52:23 +00:00
Treehugger Robot
e759c83bde Merge "Implement Reboot bootloader via bootloader_message" 2016-11-10 02:43:08 +00:00
Wei Wang
89af3b4d93 Merge "init: warn slow action" am: 5782f72711 am: d26107d939 am: 0d946cb931
am: e38cbb53ad

Change-Id: I23db26451de52d0ea9778517b96254a01c6fdcc7
2016-11-10 01:19:37 +00:00
Wei Wang
d26107d939 Merge "init: warn slow action"
am: 5782f72711

Change-Id: Ia9c2f08e990d70f9afbe17efbb2646717e8d58f7
2016-11-10 01:01:14 +00:00
Wei Wang
b1a309ac1f init: warn slow action
Slow action that takes longer than 50ms will be warned to user

Test: grep init log
Bug: 32712851
Change-Id: I3a6a881a8dee1807270343b511a47c76dd230392
2016-11-09 15:19:11 -08:00