Commit Graph

12244 Commits

Author SHA1 Message Date
Dmitriy Ivanov 3ea93da3c2 Remove some gotos
Change-Id: I0e162c8e0a700940f4302786b8523e5b2f5e5c27
2015-03-06 12:45:03 -08:00
Dmitriy Ivanov 8b1a94c07c Merge "Cleanup old-style-cast warnings" 2015-03-06 20:43:42 +00:00
Dmitriy Ivanov 4b8b148a8c Merge "Remove unnecessary allocation of FileMaps" 2015-03-06 20:43:20 +00:00
Dmitriy Ivanov f4cb8e2ac2 Cleanup old-style-cast warnings
Change-Id: I6e17fd993557cbf78ade787f112794358aee39c8
2015-03-06 10:50:56 -08:00
Dmitriy Ivanov 4b67f8339d Remove unnecessary allocation of FileMaps
Change-Id: I97bb72b9edeee5b3eff4ffd21a761a1af472a3b5
2015-03-06 10:22:34 -08:00
Mark Salyzyn e7c2a40197 am 88492ec4: Merge "liblog: build cleanup"
* commit '88492ec4e171a33b2d1ef42a0b7714cb2abedd0f':
  liblog: build cleanup
2015-03-05 19:30:20 +00:00
Mark Salyzyn 88492ec4e1 Merge "liblog: build cleanup" 2015-03-05 19:23:32 +00:00
Mark Salyzyn 1b79369877 liblog: build cleanup
- Drop CYGWIN build checking
- Hard code the "liblog" event tag
- Drop use of internal WITH_MINGW

Change-Id: I7b63bd7fa4471f340f356b477a0e5e25fe83a851
2015-03-05 11:10:00 -08:00
Mark Salyzyn b71d0eabf1 am b6c411cf: Merge "liblog: logprint use <endian.h> part three"
* commit 'b6c411cf07b6cfe0cb2df3bce80ab8097b5d0d97':
  liblog: logprint use <endian.h> part three
2015-03-05 02:46:38 +00:00
Mark Salyzyn b6c411cf07 Merge "liblog: logprint use <endian.h> part three" 2015-03-05 02:42:43 +00:00
Mark Salyzyn 31dd00fcf5 liblog: logprint use <endian.h> part three
Fix host/sdk builds:
- Drop logprint from list of host products
- Drop <endian.h> for FAKE_LOG_DEVICE

Change-Id: I8aa854413ff6d809f0b04987cf913eb228e4213c
2015-03-04 17:40:04 -08:00
Mark Salyzyn 92a2dab695 am 051222c2: Merge changes I12d6aa4e,I9e802113,I2b30e0fc,Iaf387b9e
* commit '051222c2436f3cb7fdbc87cc7bc28c5d3495eb28':
  logcat: remove dead label code
  logcat: do not stop on unexpected log ID
  Revert "logd: Add minimum time bucket statistics"
  liblog: Instrument logging of logd write drops
2015-03-05 01:17:19 +00:00
Mark Salyzyn 051222c243 Merge changes I12d6aa4e,I9e802113,I2b30e0fc,Iaf387b9e
* changes:
  logcat: remove dead label code
  logcat: do not stop on unexpected log ID
  Revert "logd: Add minimum time bucket statistics"
  liblog: Instrument logging of logd write drops
2015-03-05 01:12:06 +00:00
Sami Tolvanen 86cddf4074 Do not call libcutils property_set in init through libfs_mgr
Both init and libcutils define a property_set function. The init
version sets the property directly while libcutils simply calls
__system_property_set, which sends a message to init to set the
property.

Since libfs_mgr is statically linked to libcutils, any calls to
property_set end up sending a message to init and waiting for a
response. When libfs_mgr is further statically linked to init,
this leads to init sending a message to itself when property_set
is called in fs_mgr.

Because send_prop_msg in bionic only waits for a response for
250ms, this does not cause a deadlock. However, using libcutils
to set a property in the init process is hardly a good idea.

This change removes the property_set call from fs_mgr_verity.c.
If this property is required later, it should be set elsewhere.

Change-Id: I6a28cccb1ccce960841af20a4b20c32d424b5524
2015-03-05 00:44:12 +00:00
Mark Salyzyn 904240bb74 am e53d17c1: Merge "liblog: logprint use <endian.h> part deux"
* commit 'e53d17c15fd5b532f651fd6d6f5d2e9bd7c68a6d':
  liblog: logprint use <endian.h> part deux
2015-03-05 00:29:54 +00:00
Mark Salyzyn e53d17c15f Merge "liblog: logprint use <endian.h> part deux" 2015-03-05 00:23:21 +00:00
Mark Salyzyn f8d62a0107 liblog: logprint use <endian.h> part deux
Change-Id: I042194d0f5ec444dd192ee9da50d6b48d556f8ac
2015-03-04 16:20:50 -08:00
Andreas Gampe 8c2c089ae2 am 291ce5b8: Merge "Fs_mgr: Fix format code"
* commit '291ce5b82d8a504be69132f1827e20041833c488':
  Fs_mgr: Fix format code
2015-03-04 22:44:44 +00:00
Mark Salyzyn 90446bf5b8 am eff8c801: Merge "logd: use <endian.h>"
* commit 'eff8c801fd0d9016ee039ca15e295c5a8056cc96':
  logd: use <endian.h>
2015-03-04 22:44:42 +00:00
Mark Salyzyn e79201e4cb am 4487c605: Merge changes I0ec0fe3e,I9e5fccba
* commit '4487c605eaeea2b85c8511fe915a286c3aaf4da4':
  liblog: logprint use <endian.h>
  private: Add event payload structures to android_logger.h
2015-03-04 22:44:41 +00:00
Sami Tolvanen eb2ff9bb1b am 8ee42f9c: Merge "Add init support for dm-verity logging mode"
* commit '8ee42f9c50086830edb2cdf035ad5bedcf0fa6f1':
  Add init support for dm-verity logging mode
2015-03-04 22:44:38 +00:00
Sami Tolvanen 6904e0c263 am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"
* commit 'a88fb24ab43eec9710a0d4d15aedb6d4bc51a2ec':
  Add fs_mgr support for dm-verity modes
2015-03-04 22:44:37 +00:00
Andreas Gampe 291ce5b82d Merge "Fs_mgr: Fix format code" 2015-03-04 22:03:35 +00:00
Mark Salyzyn eff8c801fd Merge "logd: use <endian.h>" 2015-03-04 21:38:19 +00:00
Andreas Gampe eb69e85768 Fs_mgr: Fix format code
Suggested printing for off_t is to cast to intmax_t and print that.

Follow-up to https://android-review.googlesource.com/133111.

Change-Id: Icff6844044c3d0fa6372c3f399453a526fd89954
2015-03-04 13:29:12 -08:00
Mark Salyzyn 5f6738af48 logcat: remove dead label code
Change-Id: I12d6aa4ebf48f06faf9435b4ffedfd309629cf3b
2015-03-04 13:21:42 -08:00
Mark Salyzyn 9421b0c060 logcat: do not stop on unexpected log ID
We are changing the log read API to allow event notification
regarding logging system data loss. We would like these out
of band events to be reported.

Change-Id: I9e802113604d8cc0fc9adff0d1e014bbc40914fe
2015-03-04 13:21:42 -08:00
Mark Salyzyn 29eb57066c logd: use <endian.h>
Change-Id: Iba843c054ea4fbe1a26c7821b5613fdb5e8001a1
2015-03-04 13:21:41 -08:00
Mark Salyzyn 4ed16b4381 Revert "logd: Add minimum time bucket statistics"
This forward port reverts
    commit e457b74ce6

No longer as necessary once we add
    liblog: Instrument logging of logd write drops
Although this provided an indication of how close statistically we
were to overloading logd it is simpler to understand fails thus to
hunt and peck a corrected value for /proc/sys/net/unix/max_dgram_qlen

Change-Id: I2b30e0fc30625a48fd11a12c2d2cc6a41f26226f
2015-03-04 13:21:41 -08:00
Mark Salyzyn d45d36e011 liblog: Instrument logging of logd write drops
- If logger system is prostrated, send an event message with the
  liblog tag from the associated UID and PID with a count of
  dropped messages once logging is resumed.
- Added to the README a description of the error return values.
- Describe in the README the appropriate mitigations for dropped
  messages.
- If the caller sees this message, then
  /proc/sys/net/unix/max_dgram_qlen is likely too small

Change-Id: Iaf387b9e5e1b6aa93bebc7481f9e8353732e3229
2015-03-04 13:21:41 -08:00
Mark Salyzyn 4487c605ea Merge changes I0ec0fe3e,I9e5fccba
* changes:
  liblog: logprint use <endian.h>
  private: Add event payload structures to android_logger.h
2015-03-04 21:21:13 +00:00
Mark Salyzyn 66bfc5ccbd liblog: logprint use <endian.h>
Change-Id: I0ec0fe3e954f6f04964d58e57c817d28057b630b
2015-03-04 12:48:04 -08:00
Mark Salyzyn fa1c063feb private: Add event payload structures to android_logger.h
- common android_event_header_t
- android_event_int_t ANDROID_TYPE_INT payload
- android_log_event_int_t single ANDROID_TYPE_INT event
- android_event_long_t ANDROID_TYPE_LONG payload
- android_log_event_long_t single ANDROID_TYPE_LONG event
- android_event_string_t ANDROID_TYPE_STRING payload
- android_log_event_string_t single ANDROID_TYPE_STRING event

Change-Id: I9e5fccba38e3f230c2c4ec7dec51ed110c460f95
2015-03-04 12:48:04 -08:00
Sami Tolvanen 8ee42f9c50 Merge "Add init support for dm-verity logging mode" 2015-03-04 20:42:09 +00:00
Sami Tolvanen a88fb24ab4 Merge "Add fs_mgr support for dm-verity modes" 2015-03-04 20:41:49 +00:00
Sami Tolvanen 8ff0190835 Add init support for dm-verity logging mode
Add a built-in command for loading verity state. If dm-verity
will be started in logging mode, trigger verity-logging.

Needs changes from
  Ibb82953594d234f81ad21c40f524190b88e4ac8f

Change-Id: I5af4918f2f14fdd4d07f51c55837e08111fd3748
2015-03-04 03:07:47 +00:00
Sami Tolvanen 51bf11ad95 Add fs_mgr support for dm-verity modes
Add support for dm-verity modes and storing persistent state in
a location specified by the following properties:

  ro.verity.state.location
  ro.verity.state.offset

If these properties do not exist, dm-verity is always loaded in
EIO mode. If the properties do exist, but the location does not
have valid state data, dm-verity is loaded in RESTART mode. The
mode is updated to LOGGING if a dm-verity triggered restart has
occurred.

Change-Id: Ibb82953594d234f81ad21c40f524190b88e4ac8f
2015-03-04 03:07:35 +00:00
SungHyun Kwon abb80e0f95 Fix memory leak on jdwp_process_free()
if many jdwp connection are created(), the memory will be leaked.

When it deletes heap memory on jdwp_process_free(),
the proc->fde just set to null.

so it need to free() in fdevent_destory().
2015-03-03 17:56:18 +09:00
Sami Tolvanen 622d44d864 am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"
* commit 'fbb3f8ca499b04c82437155f87c8666cad607c6b':
  Set underlying block device RO when enabling verity
2015-02-28 00:43:58 +00:00
Sami Tolvanen fbb3f8ca49 Merge "Set underlying block device RO when enabling verity" 2015-02-28 00:40:11 +00:00
Nick Kralevich 5e14f416af am 6864e673: Merge "More SOCK_CLOEXEC"
* commit '6864e6739027adf725ced33777d3e21f80a95479':
  More SOCK_CLOEXEC
2015-02-27 23:19:11 +00:00
Nick Kralevich 6864e67390 Merge "More SOCK_CLOEXEC" 2015-02-27 21:44:36 +00:00
Mark Salyzyn 1dd71ae12e am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
* commit 'f33c3bc9602e4a369c4cc5d28357b8f73a3eed6c':
  init: drop dontpanic & apanic initialization
2015-02-27 19:34:33 +00:00
Mark Salyzyn f33c3bc960 Merge "init: drop dontpanic & apanic initialization" 2015-02-27 19:28:52 +00:00
Mark Salyzyn 1eaba37aae init: drop dontpanic & apanic initialization
Bug: 19050686
Bug: 19525200
Change-Id: Id81abe3b44283b439390b42db7a9da23748dee0a
2015-02-27 07:03:01 -08:00
Sami Tolvanen 214f33b8c0 Set underlying block device RO when enabling verity
Currently, when verity is set up on a block device, the underlying
device is still accessible directly. Change the existing function
fs_set_blk_ro visible to other fs_mgr modules, change the behavior
to match the comment above the function definition, and call it to
disable write access to the block device when setting up verity.

Bug: 18609347
Change-Id: I7884175df15f9161174788d74d20a08e4cd472ca
2015-02-27 11:28:34 +00:00
daisuke niwa c855bddc67 Improving the time to wait for assigning IP address
Framework always spends 600msec for getting IP address.
DhcpStateMachine.runDhcp calls NetworkUtils.stopDhcp.
After that, it calls NetworkUtils.runDhcp.
In this case, wait_for_property of dhcp_utils.c calls three times.
At least three times, usleep is called.
So move usleep statement after property_get statement.

Change-Id: I77ffb9a5a64875b47bb528b494bb60b68c1acb5a
2015-02-27 09:50:01 +01:00
Nick Kralevich 6d3cddb2e2 More SOCK_CLOEXEC
Change-Id: I3e18f34d08a6443aaf55d7c91c27867840ac1773
2015-02-26 13:32:52 -08:00
Mark Salyzyn b8d1af618d am be971215: Merge "logcat: add pstore read"
* commit 'be9712156bdcf8cff774a78a3afdb0c562998c73':
  logcat: add pstore read
2015-02-26 17:29:06 +00:00
Mark Salyzyn d851c80f0d am ae19b631: Merge "liblog: add pstore read"
* commit 'ae19b63168d1b958898180979156e2a4169ee4c2':
  liblog: add pstore read
2015-02-26 17:29:05 +00:00