Commit Graph

18742 Commits

Author SHA1 Message Date
Christopher Ferris bedab17693 Merge "Change the way some maps are printed."
am: 07d9de7016

* commit '07d9de701631aed34929c31cae89c22e76318743':
  Change the way some maps are printed.
2015-12-01 00:34:05 +00:00
Christopher Ferris 07d9de7016 Merge "Change the way some maps are printed." 2015-12-01 00:29:38 +00:00
Dan Willemsen a3f41bf774 liblog: enable windows builds in soong
Change-Id: I426cdebeddf653bf2daacb3e0724516ac78756cb
2015-11-30 15:57:41 -08:00
Christopher Ferris da750a79c9 Change the way some maps are printed.
Before, an anonymous map wound up printing the pc as relative.
Unfortunately, this meant that it was impossible to tell the actual
pc. The new code prints the map name as <anonymous:map_start> and
still prints the pc as relative.

In addition, add the start of the map for map names that begin with a
'[' character.

Bug: 25844836
Change-Id: Ie0b6149dde258fe13f0e5a3e5739d85374512f4b
2015-11-30 14:39:52 -08:00
Bertrand SIMONNET 9d3a4aeae2 metricsd: Use different directories for each daemon.
Instead of using a single directory for both the internal data of
metricsd and metrics_collector and the shared files (metrics samples log
file and the metrics enabled file), we should use separate directory to
allow for a finer access control.

The new structure will be:
* /data/misc/metrics for the files accessible to all daemons reporting
  metrics, metricsd and metrics_collector.
* /data/misc/metricsd for the private files of metricsd.
* /data/misc/metrics_collector for the private files of
  metrics_collector.

Bug: 25886951
Test: Unit tests.
Test: Manual: metricsd and metrics_collector run without errors.

Change-Id: I006d19f45f5f419d2b08744126c2e2a0b899c9fa
2015-11-30 13:34:49 -08:00
Bertrand SIMONNET a7bc1c14df metricsd: Specify directory for persistent integers.
Instead of using a global directory for persistent integers, specify the
directory to use in the constructor.
This will make changing the backing directory easier.

Bug: 25886951

Change-Id: I590816b195fa81b179a5ec78b9cdf41bc86353dc
2015-11-30 13:34:49 -08:00
Josh Gao b0e039f4ca adb: don't divide by zero
If we stat a file and get a size of 0, and then successfully read bytes
from that file, we would previously divide by zero when calculating the
percentage completion of the file. This case happens either when we're
racing against something else writing to the file, or when we're pulling
magical files such as the ones in /dev/cpuctl/ that lie about their
size.

Bug: http://b/25925733
Change-Id: I980b9c14f44a1eb4a42bc8736c94fa6db06c08d1
2015-11-30 12:03:12 -08:00
Josh Gao 7b284b2f22 adb: don't pull symlinks when pulling a directory
The previous change to do this (f96dc73b) only skipped individually
named symlinks, not symlinks inside of a directory that was being
pulled.

Bug: http://b/25601283
Change-Id: I25bdcbc546a9d3a0dbd8dacdb065fb134d96022b
2015-11-30 11:02:44 -08:00
Josh Gao d3266e058e adb: remove extraneous newline from skip message
Change-Id: I12314da589bf0db14b37ae4c1f526665182f4776
2015-11-30 11:02:21 -08:00
Nick Kralevich 9efbfda576 Merge "fs_config.c: Remove obsolete reference to /system/bin/pppd-ril"
am: e08e4656db

* commit 'e08e4656db4454fb44cf3ee95d0eda75230086f1':
  fs_config.c: Remove obsolete reference to /system/bin/pppd-ril
2015-11-30 18:47:27 +00:00
Nick Kralevich e08e4656db Merge "fs_config.c: Remove obsolete reference to /system/bin/pppd-ril" 2015-11-30 18:45:14 +00:00
Josh Gao dd6cc4d7ee adb: correctly count skipped files in push/pull
Bug: http://b/25650207
Change-Id: I055b08216938640c4f7c5e96a7ea3719bf90ba70
2015-11-30 10:42:37 -08:00
Nick Kralevich cbbc66174c fs_config.c: Remove obsolete reference to /system/bin/pppd-ril
Codesearch finds no reference to this in the Android tree. It was
added in 2010 in commit bbf1c64527.

Change-Id: I8cd1153912b78b4b23b8f5ba2577a58c5c49e316
2015-11-30 09:17:18 -08:00
Nick Kralevich dee5c24927 Merge "fs_config: remove setuid bit from librank"
am: 0380d49024

* commit '0380d49024a408c726d3336551840381a6fbff45':
  fs_config: remove setuid bit from librank
2015-11-30 14:54:41 +00:00
Nick Kralevich 0380d49024 Merge "fs_config: remove setuid bit from librank" 2015-11-30 14:53:20 +00:00
Nick Kralevich 3e6356834f fs_config: remove setuid bit from librank
Anyone wanting to call /system/xbin/librank can execute "su"
beforehand. There's no need for it to be setuid root.

Bug: 25739721
Change-Id: Ie3d68701397d21e901bf1ec17b4b4a9f12128d2d
2015-11-27 18:08:22 -08:00
Steve Fung 2e7f3dd769 Merge "crash_reporter: Use cacerts_google"
am: 2e012ef3bf

* commit '2e012ef3bf3dfa5cb5d36318ef0f8d948608d584':
  crash_reporter: Use cacerts_google
2015-11-24 21:17:41 +00:00
Steve Fung 2e012ef3bf Merge "crash_reporter: Use cacerts_google" 2015-11-24 21:13:12 +00:00
Josh Gao 8e82180c83 Merge changes I36b66fc5,I0561affb
am: 166e716851

* commit '166e716851a11f1c2280b211fe00017e1eb2c3b5':
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.
2015-11-24 20:17:30 +00:00
Josh Gao 166e716851 Merge changes I36b66fc5,I0561affb
* changes:
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.
2015-11-24 20:12:08 +00:00
Josh Gao 1175d0fdb0 libcutils: turn on -Werror on Win32, fix resulting build break.
Mingw doesn't provide strndup or strtok_r used in str_parms.c, resulting in
-Wimplicit-function-declaration being emitted for the Windows build.
None of the consumers of str_parms.c appear to be compiled for Windows,
so we can just remove it from the Windows build.

Change-Id: I36b66fc54ed261d38f5294bc8662ddb2db4fe64f
2015-11-24 09:35:45 -08:00
Chih-hung Hsieh 8893c66d35 Merge "Add explicit cast to shut off clang warnings."
am: f091dfe010

* commit 'f091dfe01079293c0a98afd4fe6d5df7bfd85c7f':
  Add explicit cast to shut off clang warnings.
2015-11-24 17:13:44 +00:00
Chih-hung Hsieh f091dfe010 Merge "Add explicit cast to shut off clang warnings." 2015-11-24 17:08:20 +00:00
Josh Gao 9e86f8e036 libcutils: add prefix to local variables in Android.mk.
Change-Id: I0561affbcc306c20f8aa87beb2d9728a9bb79f5e
2015-11-24 08:45:07 -08:00
Nick Kralevich 17c0edc6ee Merge "init: Don\'t ignore setsockcreatecon errors"
am: 07cb69415a

* commit '07cb69415a478a96c33bffc44bff49d035f51afc':
  init: Don't ignore setsockcreatecon errors
2015-11-24 02:44:57 +00:00
Steve Fung 5acccc682d crash_reporter: Use cacerts_google
Use /system/etc/security/cacerts_google as the default certificates
directory.  If the crash_reporter.full_certs property is set to 1,
use the full /system/etc/security/cacerts directory.  This
property can be set in a target's product.mk, if they decide to
configure crash_reporter with a crash_server not covered by the
cacerts_google subset of certificates.

Bug: 25798318
Change-Id: I617c3d13b74af8d9577823a8f1a61f8375bcb504
2015-11-23 17:55:11 -08:00
Nick Kralevich 07cb69415a Merge "init: Don't ignore setsockcreatecon errors" 2015-11-24 01:18:12 +00:00
Nick Kralevich 83ccb1c76b init: Don't ignore setsockcreatecon errors
The init language supports setting the creation context of a socket
as the 6th argument to the socket keyword. For example, in the
following service, the context associated with the netd socket
is u:r:netd:s0

service netd /system/bin/netd
    class main
    socket netd stream 0660 root system u:r:netd:s0
    socket dnsproxyd stream 0660 root inet
    socket mdns stream 0660 root system
    socket fwmarkd stream 0660 root inet

The 6 argument form of the socket statement is rarely if ever used,
since the init code supplies a sensible default.

Currently, there's no error checking on the value supplied as
the 6th argument. For example, if you have the following socket
statement:

  socket netd stream 0660 root system graphics

a socket will attempt to get created with an invalid "graphics"
context. When setsockcreatecon fails, it retains the default socket
creation context, which for init is u:r:init:s0. This results in a
socket being created which is in an unexpected context.

Check the return value from the setsockcreatecon() call. If an
invalid context is specified, return early and don't subsequently
attempt to create the socket with the default context.

Bug: 25851205
Change-Id: Ic66cd6f7efe3897fb247b587ddeac5d35e1602b7
2015-11-23 17:09:49 -08:00
Chih-Hung Hsieh 2858ba18e7 Add explicit cast to shut off clang warnings.
* The literals are signed negative int and got warnings about
  .... cannot be narrowed to type uint64_t [-Wc++11-narrowing]

Change-Id: I88c2fc328dfe5c7e2f9ade32bcba273e4a74a84c
2015-11-23 09:07:16 -08:00
Elliott Hughes cc65c3b9f8 Fix "adb sync" (and "adb push") error reporting.
This patch ensures that we read any error response from the server if the
server closes the connection. Unfortunately, that's not sufficient to ensure
that we always see the server's error message --- sometimes the data just
gets thrown away because we keep writing without reading. Setting SO_LINGER
avoids this.

Bug: http://b/25230872
Change-Id: I96c019cc72bd139198de79bf29e6536cc462c20f
2015-11-20 22:01:06 -08:00
Elliott Hughes 49f4f575f9 Merge "Move SendLargeFile into SyncConnection."
am: ddf41f1ad0

* commit 'ddf41f1ad0bc5fbe4a09fbcfde74492a51a705cf':
  Move SendLargeFile into SyncConnection.
2015-11-21 01:48:14 +00:00
Elliott Hughes ddf41f1ad0 Merge "Move SendLargeFile into SyncConnection." 2015-11-21 01:44:08 +00:00
Elliott Hughes 6aab58c499 Move SendLargeFile into SyncConnection.
Just a trivial refactor. Code change comes later.

Change-Id: If9e509a8c44649e5be4daaca57972939b037b8db
2015-11-20 17:35:17 -08:00
Chih-hung Hsieh 7a2aa9d26d Merge "Add explicit cast to shut off clang warnings."
am: 79cfba55e9

* commit '79cfba55e9d1ff72930f2c10dd5805864baf4276':
  Add explicit cast to shut off clang warnings.
2015-11-20 20:35:13 +00:00
Chih-hung Hsieh 79cfba55e9 Merge "Add explicit cast to shut off clang warnings." 2015-11-20 20:30:10 +00:00
Elliott Hughes 1146ae0205 Merge "Avoid SIGPIPE in adb."
am: 8c5511c692

* commit '8c5511c692eaf3a9239be68dcc8650162933bd10':
  Avoid SIGPIPE in adb.
2015-11-20 20:22:05 +00:00
Elliott Hughes 8c5511c692 Merge "Avoid SIGPIPE in adb." 2015-11-20 20:18:01 +00:00
Chih-Hung Hsieh caa8810c64 Add explicit cast to shut off clang warnings.
* The literals are signed int type and got warnings about
  .... cannot be narrowed to type int16_t [-Wc++11-narrowing]

Change-Id: I156d8e456c70840953aebb24739f94256248b810
2015-11-20 10:21:55 -08:00
Elliott Hughes 65433da1cb Avoid SIGPIPE in adb.
We're now able to send packets faster than the device can handle them,
meaning that sometimes we're several packets through before the device
says "hey, wait, I can't write" and closes the connection. At best this
led to us reporting that we couldn't sync because "Connection reset";
at worst we'd get SIGPIPE because we were still streaming to a connection
that had already been closed.

This change renames adb_main adb_server_main, and moves the ignoring of
SIGPIPE into adb_commandline so it applies to both client and server (but
not adbd).

This change doesn't address the "wrong error message" part of the problem,
but at least it means you'll get *an* error message.

Bug: http://b/25230872
Change-Id: Ic60e4d13ed03fdcdf0d5cbc97201ebd1097c16ed
2015-11-20 09:42:23 -08:00
Sergio Giro e483305e47 Merge "libutils: fix cache removal when callback invalidates the key"
am: b0df9dca7c

* commit 'b0df9dca7ca4d7ea2506f42e8b7ad720099401f6':
  libutils: fix cache removal when callback invalidates the key
2015-11-20 17:12:41 +00:00
Sergio Giro b0df9dca7c Merge "libutils: fix cache removal when callback invalidates the key" 2015-11-20 17:09:10 +00:00
Sergio Giro b7170fe3fe libutils: fix cache removal when callback invalidates the key
Bug: 24785286
Change-Id: I9d17d2247258a56ef7776b3a701389e825a9c533
2015-11-20 14:54:51 +00:00
Mark Salyzyn 247e22090a Merge "liblog: resolve deadlocks"
am: 8f8a88cad3

* commit '8f8a88cad334a630d6325672a7c6a32a0769a783':
  liblog: resolve deadlocks
2015-11-19 22:45:38 +00:00
Mark Salyzyn 8f8a88cad3 Merge "liblog: resolve deadlocks" 2015-11-19 22:37:25 +00:00
Mark Salyzyn 2d2e0a5c5e liblog: resolve deadlocks
Although ever present, an increased regression introduced with
commit b6bee33182 (liblog: logd:
support logd.timestamp = monotonic).

A signal handler can interrupt in locked context, if log is written
in the signal handler, we are in deadlock. To reduce the contention
and chances for this problem separate out timestamp lock from is
loggable lock to reduce contention situations. Provide a best-guess
response if lock would fail in timestamp path.

Use a common lock() inline within each module, with a comment speaking
to the issues surrounding calling a function that has a mutex within
a signal handler.

ToDo: Hold off signals temporarily in mainline, restart when unblock.
      Can not use pthread_sigmask(SIG_BLOCK,,) as it breaks AtCmd.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 25563384
Change-Id: I47e2c87c988c3e359eb9eef129c6a3a08e9eedef
2015-11-19 13:14:16 -08:00
Elliott Hughes 5e3589da14 Merge "Don\'t send screen unless we\'re talking to a new adbd."
am: 9f90368701

* commit '9f903687011c195154b0c69c02e6aaa35c867242':
  Don't send $TERM unless we're talking to a new adbd.
2015-11-18 21:04:14 +00:00
Elliott Hughes 9f90368701 Merge "Don't send $TERM unless we're talking to a new adbd." 2015-11-18 20:55:40 +00:00
Elliott Hughes c2252df25a Don't send $TERM unless we're talking to a new adbd.
I put the conditional in the wrong place, not realizing that even the
old shell system allowed one 'argument'.

Bug: http://b/25765657
Change-Id: I2752fb838d6377bf24e5b4cf959462557a196c87
2015-11-18 12:45:48 -08:00
Casey Dahlin 47f25063af Merge "Introduce unique_fd"
am: 9a6b8eeb44

* commit '9a6b8eeb44a78064ffbe4c04928a3904b1be2ab3':
  Introduce unique_fd
2015-11-18 20:44:51 +00:00
Casey Dahlin 9a6b8eeb44 Merge "Introduce unique_fd" 2015-11-18 20:36:05 +00:00