Commit Graph

15244 Commits

Author SHA1 Message Date
Nick Kralevich 7015b3be53 Merge "TypeHelpers.h: Don't underflow unsigned int" 2015-06-15 17:30:38 +00:00
Mark Salyzyn 71079be559 am bd1ef904: logd: filter on __android_log_is_loggable
* commit 'bd1ef90448c32e2beec4c66f08fe613bcc632cc8':
  logd: filter on __android_log_is_loggable
2015-06-15 15:07:03 +00:00
Mark Salyzyn 5302182ff0 am 4a3380f1: am c36c63c6: Merge "logd: filter on __android_log_is_loggable"
* commit '4a3380f1510d87a0900feb50eed35544ca3e1726':
  logd: filter on __android_log_is_loggable
2015-06-15 14:55:00 +00:00
Mark Salyzyn b631a9a5a3 am e9c9106f: liblog: __android_log_is_loggable support global properties
* commit 'e9c9106fbb876864c06bb94e95737fc776e9b3ce':
  liblog: __android_log_is_loggable support global properties
2015-06-15 14:54:16 +00:00
Mark Salyzyn 7bc60e383b am e89360dd: am 87e16036: Merge "liblog: __android_log_is_loggable support global properties"
* commit 'e89360ddce048ef48d8b09a6d517cb39ad655b7b':
  liblog: __android_log_is_loggable support global properties
2015-06-15 14:47:29 +00:00
Ben Cheng c35fcddabe am 87678797: am 83be2fd7: Merge "Compare two bootcharts and list timestamps for selected processes."
* commit '87678797aabf182278bffb56e6af721371b126d4':
  Compare two bootcharts and list timestamps for selected processes.
2015-06-15 14:47:28 +00:00
Mark Salyzyn 4a3380f151 am c36c63c6: Merge "logd: filter on __android_log_is_loggable"
* commit 'c36c63c64556ced42597f255def5e8989868642b':
  logd: filter on __android_log_is_loggable
2015-06-15 14:47:26 +00:00
Mark Salyzyn bd1ef90448 logd: filter on __android_log_is_loggable
(cherry pick from commit e59c469fa8)

- Default level when not specified is ANDROID_LOG_VERBOSE
  which is inert.

Bug: 20416721
Bug: 19544788
Bug: 17760225
Change-Id: Icc098e53dc47ceaaeb24ec42eb6f61d6430ec2f6
2015-06-15 07:41:03 -07:00
Mark Salyzyn c36c63c645 Merge "logd: filter on __android_log_is_loggable" 2015-06-15 14:38:06 +00:00
Mark Salyzyn e89360ddce am 87e16036: Merge "liblog: __android_log_is_loggable support global properties"
* commit '87e16036ec0521d20081ebec906d637c3b524f23':
  liblog: __android_log_is_loggable support global properties
2015-06-15 14:35:51 +00:00
Ben Cheng 87678797aa am 83be2fd7: Merge "Compare two bootcharts and list timestamps for selected processes."
* commit '83be2fd7b65734e410583506f4bd19981966577b':
  Compare two bootcharts and list timestamps for selected processes.
2015-06-15 14:35:50 +00:00
Mark Salyzyn e9c9106fbb liblog: __android_log_is_loggable support global properties
(cherry pick from commit c158456f50)

- Add support for "log.tag" and "persist.log.tag" global
  logging properties, effectively a runtime default minimum
  logging level.
- Add a thread-safe single level cache plus selective logic for the
  four properties being checked to help speed up logging decision
  on subsequent identical calls.
- Using new __system_property_area_serial() to make for
  efficient (<100ns) handling of cache misses. Despite adding
  two new properties, we are 8 times faster on subsequent calls
  even if the properties do not exist.
- A NULL or blank tag is no longer directed to return default,
  it will check the pair of global logging properties first.
- Add liblog.is_loggable gTest
- Fixup liblog.android_logger_get_, allow no content in crash buffer
- Fixup liblog.max_payload, lowered logd priority increases latency

Bug: 19544788
Bug: 21696721
Change-Id: Ideb887755aa3f1fd14a2603bda1fe23cba49642c
2015-06-15 07:34:07 -07:00
Mark Salyzyn 87e16036ec Merge "liblog: __android_log_is_loggable support global properties" 2015-06-15 14:32:20 +00:00
Ben Cheng 83be2fd7b6 Merge "Compare two bootcharts and list timestamps for selected processes." 2015-06-15 14:27:01 +00:00
Ben Cheng 50bbde0e60 Compare two bootcharts and list timestamps for selected processes.
Usage: system/core/init/compare-bootcharts.py base_bootchart_dir
       exp_bootchart_dir

For example, here is the output where the bootanimation is changed
from "d 0 0 part2" to "c 0 0 part2":

--

process: baseline experiment (delta)
 - Unit is ms (a jiffy is 10 ms on the system)
------------------------------------
/init: 50 40 (-10)
/system/bin/surfaceflinger: 4320 4470 (+150)
/system/bin/bootanimation: 6980 6990 (+10)
zygote64: 10410 10640 (+230)
zygote: 10410 10640 (+230)
system_server: 15350 15150 (-200)
bootanimation ends at: 33790 31230 (-2560)

--

In this example bootanimation is finished (estimated) 2.56 seconds sooner.

Change-Id: I39d59897c8c53d7d662676813e884b9d58feec3c
2015-06-15 15:57:02 +08:00
Nick Kralevich 58bf572aa2 TypeHelpers.h: Don't underflow unsigned int
When decrementing "n", eventually n will equal zero. When that
happens, n-- underflows. This causes a crash when code which uses
clang's -fsanitize=unsigned-integer-overflow is run.

Avoid trigging an unsigned integer underflow.

Change-Id: I9705be6580d61a164ef5fb1ec77e98a69d888438
2015-06-13 17:49:24 -07:00
Nick Kralevich 746d5cd66a am a27dca0f: am 60c5a460: Merge "Remove calls to is_selinux_enabled()"
* commit 'a27dca0f7a5d6c1f79aaf213a6b26428e4ad855e':
  Remove calls to is_selinux_enabled()
2015-06-13 10:30:52 +00:00
Nick Kralevich a27dca0f7a am 60c5a460: Merge "Remove calls to is_selinux_enabled()"
* commit '60c5a460c1906e52717afde1dc38630b30fc564e':
  Remove calls to is_selinux_enabled()
2015-06-13 10:19:20 +00:00
Nick Kralevich 60c5a460c1 Merge "Remove calls to is_selinux_enabled()" 2015-06-13 10:11:20 +00:00
Christopher Ferris 053f3b8216 am 5c57518b: Remove PtraceRead error message.
* commit '5c57518b6ffb22b815f29ae36d9a77aef3b69330':
  Remove PtraceRead error message.
2015-06-13 06:53:26 +00:00
Christopher Ferris de807ab208 am 826e32ed: am de3bf277: Merge "Remove PtraceRead error message."
* commit '826e32edcbc2adb465b2590b4ae45e4a55aa220e':
  Remove PtraceRead error message.
2015-06-13 06:42:56 +00:00
Christopher Ferris 826e32edcb am de3bf277: Merge "Remove PtraceRead error message."
* commit 'de3bf277196e2a896ede3a5d81d92d394544616c':
  Remove PtraceRead error message.
2015-06-13 06:36:01 +00:00
Christopher Ferris 5c57518b6f Remove PtraceRead error message.
This error message has no meaning and makes it look like an unwinding
failure occurred. These messages are showing up more often now
that a lot more of debuggerd is using the ReadWord and Read calls.

If a higher level function wants to indicate there is an error, then
it can add a more meaningful error.

Bug: 21818730
(cherry picked from commit 35c8136d96)

Change-Id: Ie6e20fbc18702fde935f2cf8cbf1b297fda43282
2015-06-12 23:32:20 -07:00
Christopher Ferris de3bf27719 Merge "Remove PtraceRead error message." 2015-06-13 06:27:30 +00:00
Christopher Ferris 35c8136d96 Remove PtraceRead error message.
This error message has no meaning and makes it look like an unwinding
failure occurred. These messages are showing up more often now
that a lot more of debuggerd is using the ReadWord and Read calls.

If a higher level function wants to indicate there is an error, then
it can add a more meaningful error.

Bug: 21818730
Change-Id: I83aca9cf241aee99e7425059b1b6e0d229c08a5e
2015-06-12 23:03:22 -07:00
Nick Kralevich 4d87095ebf Remove calls to is_selinux_enabled()
d34e407aeb removed support for
running with SELinux completely disabled. SELinux must either be
in permissive or enforcing mode now.

Remove unnecessary calls to is_selinux_enabled(). It always returns
true now.

Change-Id: Ife3156b74b13b2e590afe4accf716fc7776567e5
2015-06-12 22:12:33 -07:00
Mark Salyzyn bc1403ee6a am 643f3c2f: am 555d9198: Merge "Revert "logd: regression in log_strtok_r""
* commit '643f3c2fbf2089dabc8d3340b652cf354e0bcc4e':
  Revert "logd: regression in log_strtok_r"
2015-06-13 02:25:44 +00:00
Mark Salyzyn ff41f149cc am 363963d6: am de42d34c: Merge "logd: regression in log_strtok_r"
* commit '363963d6131d8909b50773dce5df83239761fa79':
  logd: regression in log_strtok_r
2015-06-13 02:25:43 +00:00
Elliott Hughes 5ca8b9b0e6 am dc5993b3: am 4931ae54: Merge "Minor "adb help" fixes."
* commit 'dc5993b3bac7797fb4163e3ea78cdc80f2f0d024':
  Minor "adb help" fixes.
2015-06-13 02:25:37 +00:00
Evgenii Stepanov fc21508615 am 3c90808d: am c1c7f457: Merge "Add a space before :=."
* commit '3c90808d6d257d75d5ebd64af5d0374aa4f03cb4':
  Add a space before :=.
2015-06-13 02:25:34 +00:00
Evgenii Stepanov ed8cdfea87 am a8197073: am 1d2567eb: Merge "Fix SANITIZE_TARGET build of liblog."
* commit 'a81970737a039351aefe7889a68c4dcd57db27b7':
  Fix SANITIZE_TARGET build of liblog.
2015-06-13 02:25:33 +00:00
Mark Salyzyn 643f3c2fbf am 555d9198: Merge "Revert "logd: regression in log_strtok_r""
* commit '555d91985d174217c3e805997bcd86d9c94f5a6b':
  Revert "logd: regression in log_strtok_r"
2015-06-12 22:43:09 +00:00
Mark Salyzyn 363963d613 am de42d34c: Merge "logd: regression in log_strtok_r"
* commit 'de42d34cd5de2ca3ecc89b155ea866e98a5d5568':
  logd: regression in log_strtok_r
2015-06-12 22:43:08 +00:00
Mark Salyzyn 555d91985d Merge "Revert "logd: regression in log_strtok_r"" 2015-06-12 22:37:22 +00:00
Mark Salyzyn 4fb24dda34 Revert "logd: regression in log_strtok_r"
This reverts commit d3c5093a3c.

Change-Id: I52558fd0e9f75ba1cc6a151785fc91857c27ab9a
2015-06-12 22:36:57 +00:00
Mark Salyzyn de42d34cd5 Merge "logd: regression in log_strtok_r" 2015-06-12 22:33:11 +00:00
Mark Salyzyn d3c5093a3c logd: regression in log_strtok_r
In commit 'logd: fix kernel logline stutter'
2c3b300fd8 we introduced log_strtok_r.
as a replacement for strtok_r that dealt with a problem with
some kernel log messages. Fix is to refine definition of
is_timestamp to not match on patterns like [0].

Change-Id: I0867a555a3bca09bbf18d18e75e41dffffe57a22
2015-06-12 22:21:44 +00:00
Elliott Hughes dc5993b3ba am 4931ae54: Merge "Minor "adb help" fixes."
* commit '4931ae545a59b595af718bf16e2280f69b62ca2f':
  Minor "adb help" fixes.
2015-06-12 21:57:51 +00:00
Elliott Hughes 4931ae545a Merge "Minor "adb help" fixes." 2015-06-12 21:45:12 +00:00
Evgenii Stepanov 3c90808d6d am c1c7f457: Merge "Add a space before :=."
* commit 'c1c7f457d773645ba67549ea931ba80fa09dddc5':
  Add a space before :=.
2015-06-12 21:38:54 +00:00
Evgenii Stepanov a81970737a am 1d2567eb: Merge "Fix SANITIZE_TARGET build of liblog."
* commit '1d2567eb7ca3ef449a6272fa45533b56d337fe6b':
  Fix SANITIZE_TARGET build of liblog.
2015-06-12 21:38:52 +00:00
Elliott Hughes 7e067cff7a Minor "adb help" fixes.
One day we should slim this down. (Maybe implement the "help" versus
"help all" distinction that doesn't currently exist but was documented
before this change.)

Bug: https://code.google.com/p/android/issues/detail?id=158394
Change-Id: Ie24b588ffea00d262ce7ab0e5c328120ba8af240
2015-06-12 14:33:17 -07:00
Evgenii Stepanov c1c7f457d7 Merge "Add a space before :=." 2015-06-12 21:31:27 +00:00
Evgenii Stepanov 1d2567eb7c Merge "Fix SANITIZE_TARGET build of liblog." 2015-06-12 21:31:00 +00:00
Evgenii Stepanov 6aaf740834 Add a space before :=.
Change-Id: Ib1d94648cdc163675ac7b6acf86408d5be6b5ad2
2015-06-12 14:18:33 -07:00
Evgenii Stepanov c744ef5547 Fix SANITIZE_TARGET build of liblog.
* liblog does not use STL, don't link it.
* ASan runtime library depends on liblog, hence liblog can never be
  sanitized.

Bug: 21785137
Change-Id: I1e97378c61d4d18d740287f5f0881427aa7cc227
2015-06-12 14:18:33 -07:00
Tim Murray 63e383136b am e5b0c837: Merge "add cpuset support to libcutils" into mnc-dev
* commit 'e5b0c837856007812ace8ec5849f6852015d5d2b':
  add cpuset support to libcutils
2015-06-12 19:03:30 +00:00
Tim Murray e5b0c83785 Merge "add cpuset support to libcutils" into mnc-dev 2015-06-12 18:38:36 +00:00
Spencer Low 2eefc61d03 am d62bce80: adb: win32: fix key files reading/writing
* commit 'd62bce804005ef55bba90b9513a17db63c186ab3':
  adb: win32: fix key files reading/writing
2015-06-12 18:30:56 +00:00
Spencer Low d62bce8040 adb: win32: fix key files reading/writing
The issue is that adb uses fopen() with "e" (presumably to open the file
with O_CLOEXEC), but that flag causes MSVCRT.DLL to return an error. So
when adb_auth_host.cpp goes to read or write the adbkey files, it fails.

The quick fix is to not use the "e" option on adb host code since it
isn't necessary there, compared to adbd.

An alternative fix would be to have a fopen() wrapper on Windows that
filters out the "e" option.

Bug: http://b/21806456
Bug: https://code.google.com/p/android/issues/detail?id=175077
Change-Id: I7d8ba2847dab0ed558ffe156e79093251eb253c9
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
(cherry picked from commit 9b9603148b)
2015-06-12 11:02:37 -07:00