Commit Graph

22280 Commits

Author SHA1 Message Date
Stephen Hines e6cc68559d Merge "Update BacktraceOffline for LLVM rebase to r256229." into nyc-dev
am: bfbb25d

* commit 'bfbb25da241ce180e3b62a3d6e84c5f5dfdba31c':
  Update BacktraceOffline for LLVM rebase to r256229.
2016-03-21 19:43:42 +00:00
Stephen Hines bfbb25da24 Merge "Update BacktraceOffline for LLVM rebase to r256229." into nyc-dev 2016-03-21 19:27:28 +00:00
Viorel Suman 4492dd2f9c Merge "Multiple consoles"
am: a01de8f

* commit 'a01de8fee1fa47ef4893d2017ac8c390c3c08a00':
  Multiple consoles
2016-03-21 16:55:58 +00:00
Elliott Hughes a01de8fee1 Merge "Multiple consoles" 2016-03-21 16:49:37 +00:00
Mike Stroyan dd63e8c6c7 run-as should accept /data/user/0 symlink
am: 57288ad

* commit '57288ad825c3fc976f4db583d6e193fa787e4beb':
  run-as should accept /data/user/0 symlink
2016-03-21 16:45:31 +00:00
Alex Vakulenko f519752a1b Merge "metricsd: Fix upload service to compile with new libchrome version"
am: 5b8ab65

* commit '5b8ab65123726f358d1e88d8b996119ca056103f':
  metricsd: Fix upload service to compile with new libchrome version
2016-03-21 15:53:05 +00:00
Viorel Suman 70daa67062 Multiple consoles
This CL allows enabling of multiple consoles. A service can be
mapped to a specific console by providing the optional argument,
IE "tty0", to "console" service attribute as follows:

service fbconsole /system/bin/sh
    class core
    console tty0
    disabled
    user shell
    group shell log readproc
    seclabel u:r:shell:s0

Bug: None
Change-Id: I3b24e7f6848bbe5c6475f11334c04ec536e6af88
Tracked-On: https://jira01.devtools.intel.com/browse/BP-289
Signed-off-by: Viorel Suman <viorel.suman@intel.com>
2016-03-21 08:50:01 -07:00
Alex Vakulenko 5b8ab65123 Merge "metricsd: Fix upload service to compile with new libchrome version" 2016-03-21 15:43:33 +00:00
Viorel Suman 441c076630 Merge "Revert "Enable multiple consoles""
am: ba44383

* commit 'ba44383197c8d5e1ca6ad32b67837c9aaf7ee224':
  Revert "Enable multiple consoles"
2016-03-21 15:28:16 +00:00
Elliott Hughes ba44383197 Merge "Revert "Enable multiple consoles"" 2016-03-21 15:15:03 +00:00
Mike Stroyan 57288ad825 run-as should accept /data/user/0 symlink
This works around b/21028929.
That old bug reappeared in nyc-dev because of file-based-encryption.

Bug: 21028929
Change-Id: I4eb65ee3b57fb86605fa56fd1395a9666f6aef7f
2016-03-21 07:56:46 -06:00
Viorel Suman efc7275172 Revert "Enable multiple consoles"
This reverts commit caafe5c620.

Bug: None
Change-Id: Iea2a80003d996ce542393242f87dc658ac6d01c9
Tracked-On: https://jira01.devtools.intel.com/browse/BP-289
Signed-off-by: Viorel Suman <viorel.suman@intel.com>
2016-03-21 11:21:19 +02:00
Stephen Hines a0062cfc31 Update BacktraceOffline for LLVM rebase to r256229.
Bug: http://b/26987366

(cherry picked from commit 19c30e9516)

Change-Id: I5e4568292c0b4bbd2daefc0abd3d36c691622eb4
2016-03-20 22:58:29 -07:00
Alex Vakulenko 3d979292d8 metricsd: Fix upload service to compile with new libchrome version
libmetric's HistogramSnapshotManager::PrepareDeltas now takes the
iterators for the histogram collection to work on, instead of getting
a global one.

Change-Id: I3997ea7d2c330431379d055b0cb876069bddf395
2016-03-18 15:36:20 -07:00
Stephen Hines 7ab20efcbc Merge "Update BacktraceOffline for LLVM rebase to r256229."
am: 922e151

* commit '922e151ba2d8e1036849b3882917b5aef2cb431c':
  Update BacktraceOffline for LLVM rebase to r256229.
2016-03-18 22:30:30 +00:00
Pirama Arumuga Nainar 922e151ba2 Merge "Update BacktraceOffline for LLVM rebase to r256229." 2016-03-18 21:54:51 +00:00
Eino-Ville Talvala 3c30fe1106 Add camera2 NDK library to public library lists
am: 5f31ca2

* commit '5f31ca2231a2d743b09d0f9f902d20b30a4baca7':
  Add camera2 NDK library to public library lists
2016-03-18 19:46:26 +00:00
Eino-Ville Talvala 5f31ca2231 Add camera2 NDK library to public library lists
It was dropped in the migration to the public.libraries format
NDK is the same on standard Android and Wear.

Bug: 27742249
Change-Id: I1eafbb649c0ccc5b9a93471fa387624d838bd3d0
2016-03-18 12:33:19 -07:00
Martijn Coenen d89cd41bc7 Merge "Don\'t use mem cgroups for pid accounting." into nyc-dev
am: e9ea8db

* commit 'e9ea8db617f52ddaa51e3b6fb9663e2f9b069425':
  Don't use mem cgroups for pid accounting.
2016-03-18 15:54:12 +00:00
Martijn Coenen e9ea8db617 Merge "Don't use mem cgroups for pid accounting." into nyc-dev 2016-03-18 15:50:17 +00:00
Martijn Coenen 5bb91ab553 Don't use mem cgroups for pid accounting.
Commit b82bab66 introduced the use of memory cgroups for keeping track
of forked PIDs; it basically creates a separate memory cgroup for every
process forked from zygote.

Each such memory cgroup which also have its own LRU with (in)active file
and anonymous pages. The current theory is this could potentially introduce
two problems:
1) kswapd runs longer because it has to iterate over the LRUs of all mem
cgroups, instead of over the LRUs of a single root mem cgroup;
2) the way kswapd reclaims things will be different also - I think it will
tend to bias reclaim to smaller mem cgroups, and process private pages
will end up on ZRAM swap much sooner.

Until we figure this out, fall back to the CPU accounting cgroup for keeping
track of forked PIDs. This leaves us with a single root mem cgroup again. We
can also keep userspace lmkd enabled because it only requires the root mem
cgroup.

Bug: 27381069
Change-Id: Ife397a6ac232761f2adfe6f5056582be0d1b4ff1
2016-03-18 15:35:48 +01:00
Viorel Suman f50b165a4e Merge "Enable multiple consoles"
am: f3f7d64

* commit 'f3f7d64035ca7225437b54bed43e0282b0758682':
  Enable multiple consoles
2016-03-18 01:19:18 +00:00
Elliott Hughes f3f7d64035 Merge "Enable multiple consoles" 2016-03-18 01:07:48 +00:00
Josh Gao 3b2af05379 debuggerd: don\'t apply timeout when wait_for_gdb is on.
am: e59c76a

* commit 'e59c76ab620b9b0e45d41cc0ea6e472ce1ab2950':
  debuggerd: don't apply timeout when wait_for_gdb is on.
2016-03-17 23:39:11 +00:00
Josh Gao 4c319f6640 Merge "debuggerd: don\'t apply timeout when wait_for_gdb is on."
am: 6a7ddbd

* commit '6a7ddbd37dbcf764d50041670fb6065f74c00391':
  debuggerd: don't apply timeout when wait_for_gdb is on.
2016-03-17 23:14:08 +00:00
Dimitry Ivanov fef37ecd07 resolve merge conflicts of a86d846 to nyc-dev-plus-aosp
Change-Id: I76bc89ff72e4eb11a6c39943336ffbdab16c0dc2
2016-03-17 16:09:03 -07:00
Josh Gao 6a7ddbd37d Merge "debuggerd: don't apply timeout when wait_for_gdb is on." 2016-03-17 23:05:55 +00:00
Dimitry Ivanov a86d846ab7 Merge "Move list of public libraries to a config file" 2016-03-17 22:53:58 +00:00
Josh Gao e59c76ab62 debuggerd: don't apply timeout when wait_for_gdb is on.
Change-Id: Ic632dde4a0510c212a4b1c01890df9a41e9771c9
(cherry picked from commit 676a756b7b)
2016-03-17 15:33:24 -07:00
Josh Gao 676a756b7b debuggerd: don't apply timeout when wait_for_gdb is on.
Change-Id: Ic632dde4a0510c212a4b1c01890df9a41e9771c9
2016-03-17 15:29:00 -07:00
Daniel Rosenberg 65c8f0b9e6 Merge "sdcard: Support sdcardfs" into nyc-dev
am: a775e62

* commit 'a775e6269308db9c56a8b53b85e7bfbb739b2221':
  sdcard: Support sdcardfs
2016-03-17 22:02:23 +00:00
Daniel Rosenberg a775e62693 Merge "sdcard: Support sdcardfs" into nyc-dev 2016-03-17 21:55:05 +00:00
Josh Gao 4473e9c73e debuggerd: don\'t send SIGSTOP to crashing processes.
am: 965d6f4

* commit '965d6f4d177c394c6a7861ce34761e297ee7af2b':
  debuggerd: don't send SIGSTOP to crashing processes.
2016-03-17 21:21:17 +00:00
Josh Gao c010ddca67 Merge "debuggerd: don\'t send SIGSTOP to crashing processes."
am: 1371c05

* commit '1371c0562cb58a8599d2f533fc4afd4eb4f307dd':
  debuggerd: don't send SIGSTOP to crashing processes.
2016-03-17 21:18:15 +00:00
Daniel Rosenberg 7972040588 Merge "Set up configfs" into nyc-dev
am: 290127b

* commit '290127b29290c133f759eda3fc992e3dcbfb7cb1':
  Set up configfs
2016-03-17 21:16:24 +00:00
Josh Gao 965d6f4d17 debuggerd: don't send SIGSTOP to crashing processes.
This was actually nonfunctional until f5e8f0b, because it was using kill
after privileges were dropped. This doesn't seem necessary after the
changes to the sibling thread ptrace logic, though.

Bug: http://b/27427439
Change-Id: I6bffbc14e0cf5e377bbfa39c945518e0d436c223
(cherry picked from commit b17f228ff6)
2016-03-17 14:15:01 -07:00
Daniel Rosenberg 290127b292 Merge "Set up configfs" into nyc-dev 2016-03-17 21:11:03 +00:00
Josh Gao 1371c0562c Merge "debuggerd: don't send SIGSTOP to crashing processes." 2016-03-17 21:07:48 +00:00
Josh Gao b17f228ff6 debuggerd: don't send SIGSTOP to crashing processes.
This was actually nonfunctional until f5e8f0b, because it was using kill
after privileges were dropped. This doesn't seem necessary after the
changes to the sibling thread ptrace logic, though.

Bug: http://b/27427439
Change-Id: I6bffbc14e0cf5e377bbfa39c945518e0d436c223
2016-03-17 13:47:48 -07:00
Josh Gao 199d92abbe Merge "debuggerd: fix stupid typo."
am: b45800a

* commit 'b45800afa38a1cfb7c4e1e9adb3440022c82618a':
  debuggerd: fix stupid typo.
2016-03-17 20:32:09 +00:00
Josh Gao 5ef2c6a2ac debuggerd: fix stupid typo.
am: a951f4c

* commit 'a951f4ca5507f43485b9efdc61570e0c5e7c7d8b':
  debuggerd: fix stupid typo.
2016-03-17 20:29:37 +00:00
Josh Gao a951f4ca55 debuggerd: fix stupid typo.
Change-Id: Icd9a25a71e1e8580a200fe68bce0b17d09c51642
2016-03-17 13:23:41 -07:00
Josh Gao b45800afa3 Merge "debuggerd: fix stupid typo." 2016-03-17 20:22:58 +00:00
Josh Gao 1b301836bb debuggerd: fix stupid typo.
Change-Id: Icd9a25a71e1e8580a200fe68bce0b17d09c51642
2016-03-17 13:21:56 -07:00
Josh Gao 90c307bc07 debuggerd: monitor the worker process for failure.
am: 036ff2c

* commit '036ff2ce83e07a6a7ad0ca339cb2c8f410fc2667':
  debuggerd: monitor the worker process for failure.
  debuggerd: fork the signal sender once.
  Clean up CLOEXEC in debuggerd.
  Remove dead code from debuggerd.
2016-03-17 20:15:55 +00:00
Josh Gao c2cef0202e Merge changes I5a5da1f1,I6294ff68
am: e21e3c6

* commit 'e21e3c65b0bbcf8ef176a4f5863765d353245714':
  debuggerd: monitor the worker process for failure.
  debuggerd: fork the signal sender once.
2016-03-17 20:11:26 +00:00
Josh Gao 036ff2ce83 debuggerd: monitor the worker process for failure.
Use sigtimedwait on SIGCHLD to watch our forked worker processes for
failure, so that we can guarantee that we always resume/kill the target
process if libunwind crashes.

Bug: http://b/27427439
Change-Id: I5a5da1f1abd7dc9d01223f5b3778e946e2d47d20
(cherry picked from commit 630bc80e18)
2016-03-17 13:11:08 -07:00
Josh Gao e5dbdd09c7 debuggerd: fork the signal sender once.
Bug: http://b/27427439
Change-Id: I6294ff68a150bc9950a300264c31d2141307ac66
(cherry picked from commit f5e8f0b9cd)
2016-03-17 13:11:05 -07:00
Elliott Hughes 1a69e2811e Clean up CLOEXEC in debuggerd.
Change-Id: I1cd75f6a8f98e99f4a4fedfc706103ce34035765
(cherry picked from commit 17ba68d0cd)
2016-03-17 13:11:01 -07:00
Elliott Hughes aa41756851 Remove dead code from debuggerd.
system/core/debuggerd/debuggerd.cpp:683:5: warning: Value stored to 'logsocket' is never read
    logsocket = -1;
    ^           ~~

Bug: http://b/27264392
Change-Id: I8eab8a02b67f219c32aea49e4d4957e5642df38f
(cherry picked from commit 6da1353863)
2016-03-17 13:10:58 -07:00