Commit Graph

13827 Commits

Author SHA1 Message Date
Tom Cherry ff5be396d7 Merge changes from topic 'init-rc-breakup'
* changes:
  init: Queue Triggers instead of Actions
  bundle init.rc contents with its service
2015-08-21 17:42:29 +00:00
Tom Cherry cb716f976b init: Queue Triggers instead of Actions
When init queues a trigger, it actually enqueues all of the Actions
that match with that given trigger.  This works currently because
all init scripts are loaded and therefore all Actions are available
before init starts queueing any triggers.

To support loading init scripts after init has started queueing
triggers, this change enqueues Trigger objects instead of their
matching Actions.  Each Trigger object then matches its associated
Actions during its execution.

Additionally, this makes a few cosmetic clean ups related to triggers.

Bug: 23186545
Change-Id: I5d177458e6df1c4b32b1072cf77e87ef952c87e4
2015-08-21 10:14:43 -07:00
Tom Cherry 20391b1de5 bundle init.rc contents with its service
Bug: 23186545
Change-Id: I52616b8ab1165fdef716f9b8f958665f2308c12e
2015-08-21 10:14:43 -07:00
Mark Salyzyn 8a4beeb694 Merge "logd: switch asprintf to std::string" 2015-08-21 16:47:20 +00:00
Mark Salyzyn 67f3dd9c47 Merge "logd: statistics switch to std::string" 2015-08-21 16:43:28 +00:00
Mark Salyzyn cf5bd8ba05 Merge "logd: white and black switch to std::string" 2015-08-21 16:43:15 +00:00
Steve Fung cba296cacb Merge "metricsd: Give directory group permissions" 2015-08-21 16:39:26 +00:00
Mark Salyzyn 25967bbccb Merge "libsparse: use strcmp and validate last_used pointer" 2015-08-21 14:26:07 +00:00
lei wang wang c227a1d855 libsparse: use strcmp and validate last_used pointer
This patch is used to fix two Bugs in backed_block.c

First, fix wrong comparing string way: we should use strcmp rather than
just compare their address. Second, fix using illegal memory risk in
bbl->last_used pointer. When entering queue_bb function,
bbl->last_used = new_bb, but in the following code if
queue_bb(xx, bb, new_bb) return ok, the space of new_bb is released. So
next time, if you use bbl->last_used pointer, may cause segment fault !

Change-Id: I6abb505f9b903b697448639fc64fb7518df5cca1
2015-08-21 14:23:31 +00:00
Steve Fung 3f62060b8d metricsd: Give directory group permissions
Since crash_reporter gets run as root, in order to use metrics_lib
it has to use group permissions to interact with metrics files.

Bug: 23406290
Change-Id: Ie9556233105312f973c0a3e018fc0305a466148d
2015-08-21 02:02:19 -07:00
Christopher Ferris 711e776cc2 Merge "Display the map offset for each frame." 2015-08-20 21:10:03 +00:00
Christopher Ferris 600017332c Display the map offset for each frame.
The dlopen of a shared library in an apk results in large map offsets.
Unfortunately, the current way that the frame data is printed, it's
impossible to tell what the relative pc is relative to. With the
addition of the offset, it's possible to figure out what the relative
pc actually references.

Bug: 23348999
(cherry picked from commit e0ab23223a)

Change-Id: I950f92c1cb29ee05eed777f47453efa03318cf3e
2015-08-20 14:07:30 -07:00
Bertrand Simonnet 300b1a6b47 Merge "metricsd: Don't crash when some metadata is missing." 2015-08-20 20:22:15 +00:00
Bertrand Simonnet 565d20ef04 Merge "metricsd: Enable https by default." 2015-08-20 18:58:53 +00:00
Bertrand SIMONNET 1f14655b27 metricsd: Don't crash when some metadata is missing.
Instead of crashing when the build target id is missing, simply print a
useful warning and discard the log.

BUG: 23351227

Change-Id: I3abf3063d6440b07103db29938eec5071ea8f60b
2015-08-20 11:57:50 -07:00
Bertrand SIMONNET 10fe60d36c metricsd: Enable https by default.
libchromeos was updated to set the certificates path correctly, we can
enable https by default.

BUG: 23016355
Change-Id: I88393df4a6892055f4865d86de78ba3a2a5b45e8
2015-08-20 10:40:55 -07:00
Mark Salyzyn 07ee12aafc Merge "logd: worst uid record watermark" 2015-08-20 17:35:19 +00:00
Mark Salyzyn 73160acc5c logd: switch asprintf to std::string
Bug: 23350706
Change-Id: I715cdd4563a09de3680081947a3439f0cac623be
2015-08-20 10:32:16 -07:00
Mark Salyzyn decbcd9c41 logd: statistics switch to std::string
Bug: 23350706
Change-Id: I5564898c4f67b8fcc43cee64604855f789409482
2015-08-20 10:25:57 -07:00
Mark Salyzyn b332f1c427 logd: white and black switch to std::string
Bug: 23350706
Change-Id: I92f21aee0a9702f63e8465851d0f35007b0469a7
2015-08-20 10:25:57 -07:00
Mark Salyzyn c892ea3fa8 logd: worst uid record watermark
Hold on to last worst uid watermark and bypass a spike to O(n*n*x)
(n=samples, x=number of spammers) wrt chatty trimming.

Bug: 23327476
Change-Id: I9f21ce95e969b67e576417a760f75c4d86acf364
2015-08-20 10:25:57 -07:00
Mark Salyzyn 2c1b8f9e20 Merge changes Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4
* changes:
  logd: log buffer switch to std::list
  logd: white and black switch to std::list
  logd: logtimes switch to std::list
  logd: prune 10% or 256 entries max
2015-08-20 17:12:05 +00:00
Mark Salyzyn 94a89c42fe logd: log buffer switch to std::list
Bug: 23350706
Bug: 23327476
Change-Id: Ib0530b9dd5842c6d05c84d7a66f2531c97461067
2015-08-20 08:36:13 -07:00
Mark Salyzyn e0ed16c6db logd: white and black switch to std::list
Bug: 23350706
Change-Id: I981d9fa63a0d87eb309485cca93cfc44fc0506cc
2015-08-20 08:36:08 -07:00
Mark Salyzyn 98dca2d0b1 logd: logtimes switch to std::list
Bug: 23350706
Change-Id: Icc60dd06119ea20a22610644ff880d5135363aba
2015-08-20 08:36:03 -07:00
Mark Salyzyn b39ed0c992 logd: prune 10% or 256 entries max
Bug: 22351810
Bug: 23327476
Change-Id: I902ba6b431d8b7cee2d65ee2f76e9f7c4f30b152
2015-08-20 08:35:45 -07:00
Elliott Hughes e03d0322db Merge "fastboot should say which device it's waiting for." 2015-08-20 00:52:50 +00:00
Elliott Hughes b46964f3c9 fastboot should say which device it's waiting for.
Change-Id: Ia8a04b2727983cb05a9a3e85d9a9586b15c71600
2015-08-19 17:49:45 -07:00
Elliott Hughes e728eb9150 Merge "Get fastboot working on OS X" 2015-08-20 00:44:30 +00:00
Daniel Erat 9a995b2c8f Merge "Use __ANDROID__ instead of __BRILLO__." 2015-08-19 23:47:47 +00:00
Daniel Erat 69200d9191 Use __ANDROID__ instead of __BRILLO__.
__ANDROID__ is defined automatically by the toolchain.

Bug: 23358460
Change-Id: Ib122bfc86a7af6ab6b0b1fcc29dc671e44049524
2015-08-19 17:38:45 -06:00
Steve Fung d45556895c Merge "crash_reporter: Enable core dumps" 2015-08-19 22:32:38 +00:00
Bertrand Simonnet 0172dea6ee Merge "metrics: Add init script for metrics_daemon." 2015-08-19 22:21:26 +00:00
Matt Reimer 81c24f6f86 Get fastboot working on OS X
Get fastboot working on OS X by calling USBDeviceOpen() before
calling SetConfiguration().

Change-Id: I5034721d5f33ef18273153ff40eb940baa8261cd
2015-08-19 14:46:17 -07:00
Yusuke Sato e656be3313 Merge "Add |opts| argument to android_fork_execvp_ext" 2015-08-19 20:23:43 +00:00
Bertrand SIMONNET 73eaa46559 metrics: Add init script for metrics_daemon.
This init script creates the metrics data directory (/data/misc/metrics)
and starts the daemon.

BUG: 22953527

Change-Id: I21cd36f38a7a3550bc755cef5699e9a6ac3dfb94
2015-08-19 11:32:41 -07:00
Yusuke Sato d81c3c6c45 Add |opts| argument to android_fork_execvp_ext
to allow the caller to send data to the child's stdin.

Bug: 21725996
Change-Id: I818f5cf61045286c8d64a91b6d50f05740329be1
2015-08-19 11:00:37 -07:00
Steve Fung ab2ac7d114 crash_reporter: Enable core dumps
Fix various path/directory locations to their Android equivalents
to enable collection of core dumps and generation of mini dumps
to work correctly.  Also add the init script to initialize
crash_reporter.

Bug: 22874832
Change-Id: Iffb1529e5259c5da5ba7f6977b2787e738f68a78
2015-08-18 23:38:27 -07:00
Elliott Hughes a169f3b401 Merge "adb: win32: fix unittest exit code parsing" 2015-08-19 03:37:23 +00:00
Elliott Hughes d0cae5b9fe Merge "Remove a HAVE_MS_C_RUNTIME I missed." 2015-08-19 01:26:26 +00:00
Elliott Hughes 27507d8ba1 Remove a HAVE_MS_C_RUNTIME I missed.
Change-Id: I063c6c802b8967d812d4f4a0972f00b0a88704af
2015-08-18 18:03:04 -07:00
Sergio Giro 1d44be87ff Merge "libutils: fix overflow in String8::allocFromUTF8" 2015-08-18 17:04:07 +00:00
Sergio Giro 4eeacbeec0 libutils: fix overflow in String8::allocFromUTF8
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908

Bug: 23290056
Change-Id: Ide0e9a8acc4e95a9104bab3ae803aa3a40098222
2015-08-18 14:44:54 +01:00
Yusuke Sato 4d09db9d1a Merge "perfboot.py: Add --end-tag option" 2015-08-18 05:44:04 +00:00
Yusuke Sato 3966ebb74d perfboot.py: Add --end-tag option
The current behavior, which is to use tags[-1] for end_tag, is good
enough in most cases, but sometime it makes more sense to use a
different one as end_tag.

For example, when optimizing APK scanning code in package manager,
using 'boot_progress_pms_scan_end' as end_tag would give us quicker
benchmark iterations as well as more relevant numbers possibly with
a smaller standard deviation.

Change-Id: Ic6371c936b36d1d87e9742502fd8958682a3b7d5
2015-08-17 22:07:34 -07:00
Nick Kralevich 6d81403797 Merge "libutils: fix signed/unsigned comparison warnings" 2015-08-18 04:00:00 +00:00
Nick Kralevich 3e6c451908 libutils: fix signed/unsigned comparison warnings
Change-Id: Ib283c85a404a20688c5357fa513e5d07c2f42803
2015-08-17 20:54:15 -07:00
Elliott Hughes 28595721b1 Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core." 2015-08-17 20:50:50 +00:00
Elliott Hughes cd4ef7581d Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.
Change-Id: I202c3185d177c85d02ee5d9f7e5bf3422c1422db
2015-08-17 12:38:58 -07:00
Spencer Low b7e79af048 adb: win32: fix unittest exit code parsing
adb on Windows uses \r\n line-endings, so take that into account when
parsing output for the exit code.

Change-Id: I6a3d7c5ca455b0f0f7dae174866857e0aeee9926
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-08-16 16:38:47 -07:00