Commit Graph

17653 Commits

Author SHA1 Message Date
Elliott Hughes e7c37fb18d am c5d278d4: Merge "metricsd: Remove unused constant."
* commit 'c5d278d48edaa5500e9ea355d8cbb96712de0522':
  metricsd: Remove unused constant.
2015-09-03 04:20:57 +00:00
Elliott Hughes c5d278d48e Merge "metricsd: Remove unused constant." 2015-09-03 04:13:27 +00:00
Elliott Hughes de2c8a24ce resolved conflicts for merge of e9436908 to mnc-dr-dev-plus-aosp
Change-Id: I6204a8463c553779c690bb29447a66cafe4d1038
2015-09-02 21:09:32 -07:00
Bertrand SIMONNET 73f4355433 metricsd: Remove unused constant.
Change-Id: Id151c4a7a091ee9cb07fa7c6188d162cf342d70e
2015-09-02 20:49:38 -07:00
Elliott Hughes 259ad4a8e7 Fix the fastboot build.
load_file takes an int64_t rather than a size_t to support large files on LP32.

Change-Id: I8d3032cab63c30c4158dbc521d3d520415cdf58f
2015-09-02 20:33:44 -07:00
Yabin Cui 7a3f8d6691 adb: clean up debug tracing a little.
Always use LOG() for debug tracing.
Remove useless D_lock. I believe it is useless to lock just before and after fprintf.

I verified the log output both on host and on device. The output looks fine to me.

Change-Id: I96ccfe408ff56864361551afe9ad464d197ae104
2015-09-02 20:21:00 -07:00
Elliott Hughes 45be42e89e resolved conflicts for merge of 7af48652 to mnc-dr-dev-plus-aosp
Change-Id: Icde642757a1335da49d2f884de33b368888ae709
2015-09-02 20:15:48 -07:00
Dan Willemsen 54afdbaef7 am a4b8f9f1: am bfe32228: Merge "Remove USE_MINGW/CYGWIN; Whitelist windows modules"
* commit 'a4b8f9f1c2d9fb6795c81ae39441e720662602d0':
  Remove USE_MINGW/CYGWIN; Whitelist windows modules
2015-09-03 02:15:32 +00:00
Steve Fung 83aad11c35 am 8ff2eb51: am 03bbd64a: Merge "crash_reporter: Call dbus-send using chromeos::ProcessImpl"
* commit '8ff2eb514aa2484e4785ffef77dcd573a07f920a':
  crash_reporter: Call dbus-send using chromeos::ProcessImpl
2015-09-03 00:39:39 +00:00
Bertrand Simonnet 9c9adaf758 am 956818aa: am ad550645: Merge "metricsd: Fix style issues."
* commit '956818aa0210ffe5bb36943bb79377a672beab74':
  metricsd: Fix style issues.
2015-09-03 00:39:38 +00:00
Bertrand Simonnet 21c04920dc am 827f6462: am 74f6f8c3: Merge "metricsd: Make the unit tests pass."
* commit '827f64625ed03d69543953f48a39e70b85ee3255':
  metricsd: Make the unit tests pass.
2015-09-03 00:39:37 +00:00
Dan Willemsen a4b8f9f1c2 am bfe32228: Merge "Remove USE_MINGW/CYGWIN; Whitelist windows modules"
* commit 'bfe322285fdbe86fdc01fdc4c711e22e894bdaee':
  Remove USE_MINGW/CYGWIN; Whitelist windows modules
2015-09-03 00:39:19 +00:00
Mark Salyzyn e1ca19b599 am a4b23123: am 3f5c5a1e: Merge "logd: worst uid record watermark part three" into mnc-dr-dev
* commit 'a4b2312387aa7143e8bedb3c3d45ff2bb8033dc3':
  logd: worst uid record watermark part three
2015-09-03 00:32:37 +00:00
Mark Salyzyn 8a2f9b8a36 am 287dea69: am bd44f59f: Merge "logd: worst uid record watermark part deux" into mnc-dr-dev
* commit '287dea69e71ab5d78192b153dbec0a5210129a39':
  logd: worst uid record watermark part deux
2015-09-03 00:32:36 +00:00
Dan Willemsen bfe322285f Merge "Remove USE_MINGW/CYGWIN; Whitelist windows modules" 2015-09-03 00:32:09 +00:00
Steve Fung 8ff2eb514a am 03bbd64a: Merge "crash_reporter: Call dbus-send using chromeos::ProcessImpl"
* commit '03bbd64aa99bb03bf80a9340750afa96bdb34280':
  crash_reporter: Call dbus-send using chromeos::ProcessImpl
2015-09-03 00:32:02 +00:00
Bertrand Simonnet 956818aa02 am ad550645: Merge "metricsd: Fix style issues."
* commit 'ad550645944051f2fb71a599b10cf08e84474035':
  metricsd: Fix style issues.
2015-09-03 00:31:59 +00:00
Bertrand Simonnet 827f64625e am 74f6f8c3: Merge "metricsd: Make the unit tests pass."
* commit '74f6f8c323a99586316fb1c01452fefadb3f9b5b':
  metricsd: Make the unit tests pass.
2015-09-03 00:31:57 +00:00
Jorge Lucangeli Obes e920c46e7d Use CAP_MASK_LONG for file capabilities.
Extract the |1ULL << $CAP_NAME| construct to a macro, to avoid
repeating it.

Change-Id: I9312c27130d7e6c5b6ab3b4cc5c70a6b98378b98
2015-09-02 17:18:44 -07:00
Dan Willemsen 87a419c8b1 Remove USE_MINGW/CYGWIN; Whitelist windows modules
CYGWIN is not supported, USE_MINGW and HOST_OS==windows are being
replaced with LOCAL_..._windows variables.

Bug: 23566667
Change-Id: I3e4a1e4097dc994cf5abdce6939e83a91758fd75
2015-09-02 17:10:35 -07:00
Bertrand SIMONNET 8835c5b56e metricsd: Log the histogram name to hash mapping.
When running the metrics_daemon in verbose mode, log the histogram name
along with the hash name.
This is useful when debugging as the protobuf message only contains the
hash of the name.

Change-Id: Ifea7edce55d62d30994ec7b75bb8728f6a0c40e8
2015-09-02 15:07:10 -07:00
Bertrand SIMONNET 90b02cd46d metricsd: Collect generic stats about the system.
Collect memory usage and disk IO statistics periodically.

BUG: 22953719

Change-Id: I2e35d4800ddc684284969e6a58a6f50497086b69
2015-09-02 15:04:26 -07:00
Steve Fung 03bbd64aa9 Merge "crash_reporter: Call dbus-send using chromeos::ProcessImpl" 2015-09-02 21:33:29 +00:00
Bertrand Simonnet ad55064594 Merge "metricsd: Fix style issues." 2015-09-02 21:28:11 +00:00
Bertrand Simonnet 74f6f8c323 Merge "metricsd: Make the unit tests pass." 2015-09-02 21:26:40 +00:00
Tim Murray bb641d5f77 am bc8c731a: Add zygote to the foreground cpuset.
* commit 'bc8c731aab0fce447e2b792f443aa5b6d72f55f2':
  Add zygote to the foreground cpuset.
2015-09-02 20:49:50 +00:00
Bertrand SIMONNET 675a10c3d9 metricsd: Fix style issues.
This CL:
* removes dead code.
* converts constants static fields into proper constants.
* converts to C++/libchrome some of the parsing logic.

BUG: 22953719

Change-Id: Ief01178c6c268f8ae3690ad9deef42cfb43b2b75
2015-09-02 13:30:54 -07:00
Bertrand SIMONNET 1253186728 metricsd: Make the unit tests pass.
This cleans up the unit tests and update them to pass.

Cleaned up:
* removed the irrelevant bits.
* Used ScopedTempDir for all test specific files (instead of the current
  directory).
* Update some objects to make them more easily testable.
* Group all the test in a single binary and use bionic's test runner.

BUG: 23682444
Change-Id: I289e3a5ff89968fdecd4a156e93bc38bbc25f58b
2015-09-02 13:30:48 -07:00
Tom Cherry a2bdc2d91e am f23ef77f: am 4aa9dbab: Merge "init: Update readme.txt to reflect recent changes to init."
* commit 'f23ef77ffe4700221bc47c70ea1b7f1473d0d902':
  init: Update readme.txt to reflect recent changes to init.
2015-09-02 19:48:22 +00:00
Tom Cherry f23ef77ffe am 4aa9dbab: Merge "init: Update readme.txt to reflect recent changes to init."
* commit '4aa9dbab6f78a1acae02d39b96fa572fbfc7b6ed':
  init: Update readme.txt to reflect recent changes to init.
2015-09-02 19:37:35 +00:00
Steve Fung 6e68dd72c7 crash_reporter: Call dbus-send using chromeos::ProcessImpl
Convert the call to dbus-send from system() to chromeos::ProcessImpl
so that the shell_exec selinux policy can be removed.

Bug: 23280203
Change-Id: I692ebecf5b7f0611de252225cedabcdefd56dff8
2015-09-02 12:29:22 -07:00
Tom Cherry 4aa9dbab6f Merge "init: Update readme.txt to reflect recent changes to init." 2015-09-02 19:28:00 +00:00
Tim Murray bc8c731aab Add zygote to the foreground cpuset.
This ensures that newly forked zygote processes will end up
in the corret cpuset.

bug 23751126

Change-Id: I987a2828cf2504963f1317d17f0b51d26cf22a70
2015-09-02 11:39:05 -07:00
Yasuhiro Matsuda cf187a007a am fcdd7ea3: am 7b0bdec4: Merge "Add a tag for tracing system server."
* commit 'fcdd7ea34f9b5bf300ed15f4b73e8fa0c42192bc':
  Add a tag for tracing system server.
2015-09-02 14:36:32 +00:00
Yasuhiro Matsuda fcdd7ea34f am 7b0bdec4: Merge "Add a tag for tracing system server."
* commit '7b0bdec4b294dff29af1cf75118be5f3d2b346b9':
  Add a tag for tracing system server.
2015-09-02 14:25:48 +00:00
Yasuhiro Matsuda 7b0bdec4b2 Merge "Add a tag for tracing system server." 2015-09-02 12:54:23 +00:00
Narayan Kamath c609c31fb5 libutils: Fix integer overflows in VectorImpl.
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

Change-Id: I46b1ae8ca1f3a010be13aca36a091e76a97a7b70
2015-09-02 12:37:49 +01:00
Tom Cherry cd7d73faf6 am 68df4bd0: Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev
* commit '68df4bd08bfb550456cc8edb19fa894a124db38c':
  DO NOT MERGE init: Fix parsing of multiple property triggers
2015-09-02 02:23:45 +00:00
Tom Cherry 68df4bd08b Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev 2015-09-02 02:06:39 +00:00
Tom Cherry 8b72ea3f25 DO NOT MERGE init: Fix parsing of multiple property triggers
Triggers of the form on property:a=b && property:b=c are only
triggered on the transition of a->b (given that b=c), but not on the
transition of b->c (given that a=b).

This commit allows both transitions to trigger the property as expected

Bug 23631258

Change-Id: I9f70b4cbf36f8a99d10c37ad049ae8ceb378d610
2015-09-01 23:54:35 +00:00
Badhri Jagan Sridharan ddc296e841 am e1801863: init: usb: Add init scripts for configfs commands
* commit 'e18018639bd38e959118d16d567c7567bb88d80b':
  init: usb: Add init scripts for configfs commands
2015-09-01 23:36:57 +00:00
Badhri Jagan Sridharan 723b410ff5 am 48d59acc: init.usb.rc: Add new system property for configfs
* commit '48d59acc57701dce66113544ccf2a711e21fb1f4':
  init.usb.rc: Add new system property for configfs
2015-09-01 23:36:56 +00:00
Badhri Jagan Sridharan e18018639b init: usb: Add init scripts for configfs commands
This CL adds a new init script init.usb.configfs.rc
to add generic configfs commands. Setting
sys.usb.configfs in init.usb.{hardware}.rc
enables executing commands in this script

Bug=23633457

Change-Id: Iaae844a7957d6c9bf510648aaff86d56aa0c6243
2015-09-01 15:39:22 -07:00
Badhri Jagan Sridharan 48d59acc57 init.usb.rc: Add new system property for configfs
This CL helps to execute a different set of
commands for the usb configs specified in
init.usb.rc. Aimed at using configfs based
commands over android composition driver.

Bug=23633457

Change-Id: Ifa5f804e1cff93d15ad57d0ed553300bc5868936
2015-09-01 15:39:22 -07:00
Elliott Hughes 0b23a08b27 am 1428640f: am 5d804006: Merge "adb/base win32 tests: fix comment and open() flags"
* commit '1428640f5cf69ede7dcafa7ae5ecca5a0a4fff50':
  adb/base win32 tests: fix comment and open() flags
2015-09-01 22:39:00 +00:00
Tom Cherry 3be66edc59 init: Update readme.txt to reflect recent changes to init.
Updates are as follows:

A detailed explanation of event triggers and property triggers
including how they can now be used

A new section describing .rc files, their locations, and the
intentions for each of these locations

A new section describing the import keyword and how it is not a
command but rather its own section

Removal of deprecated or incorrect text

Change-Id: If0a37375ac92a857900f3303ada4ba742360daff
2015-09-01 15:32:33 -07:00
Tom Cherry af20a7cb12 resolved conflicts for merge of cda81d01 to mnc-dr-dev-plus-aosp
Change-Id: I747b279bc49f9f82b8f8859c49b3fc2a4e3b4977
2015-09-01 15:30:56 -07:00
Elliott Hughes 1428640f5c am 5d804006: Merge "adb/base win32 tests: fix comment and open() flags"
* commit '5d8040060515128f2bee9b4759d0618b90c4d70c':
  adb/base win32 tests: fix comment and open() flags
2015-09-01 22:10:57 +00:00
Elliott Hughes 5d80400605 Merge "adb/base win32 tests: fix comment and open() flags" 2015-09-01 22:03:41 +00:00
Spencer Low 2fbeb0cc71 adb/base win32 tests: fix comment and open() flags
Match base's use of O_BINARY.

Change-Id: I930b5c8fddde20966580069f2e681b99cb26f1a3
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-01 14:57:58 -07:00