Commit graph

27187 commits

Author SHA1 Message Date
Mark Salyzyn
f855e29375 Merge "liblog: add IF_ALOG_RATELIMIT" am: 3d6d5b101a am: 342276b428
am: da471bc6e2

Change-Id: Iede8e5a302b9f0c7d57dce30a97a4adb7b3305a7
2016-12-21 22:09:01 +00:00
Mark Salyzyn
da471bc6e2 Merge "liblog: add IF_ALOG_RATELIMIT" am: 3d6d5b101a
am: 342276b428

Change-Id: I153173081b7b723fa749d47bd265dbfed4ee7fa6
2016-12-21 22:04:28 +00:00
Mark Salyzyn
342276b428 Merge "liblog: add IF_ALOG_RATELIMIT"
am: 3d6d5b101a

Change-Id: I762185e364279f2478b601b74379a8daaa4297e0
2016-12-21 22:00:20 +00:00
Mark Salyzyn
7952963fb0 Merge "logd: LogBufferElementKey use uint32_t for uid" am: 3fa88d8689 am: 41a117dbcb
am: 842928b4bd

Change-Id: Ifda61b0876aee10afa89a2d494b24c42137f467d
2016-12-21 21:59:39 +00:00
Treehugger Robot
3d6d5b101a Merge "liblog: add IF_ALOG_RATELIMIT" 2016-12-21 21:55:32 +00:00
Mark Salyzyn
842928b4bd Merge "logd: LogBufferElementKey use uint32_t for uid" am: 3fa88d8689
am: 41a117dbcb

Change-Id: I26948cf98f7bbd4383e79e09bdde65c612dabadf
2016-12-21 21:53:39 +00:00
Mark Salyzyn
41a117dbcb Merge "logd: LogBufferElementKey use uint32_t for uid"
am: 3fa88d8689

Change-Id: I658b42b503404b1c907c1901dc265accc9b01e61
2016-12-21 21:49:29 +00:00
Treehugger Robot
3fa88d8689 Merge "logd: LogBufferElementKey use uint32_t for uid" 2016-12-21 21:40:11 +00:00
Mark Salyzyn
fc148f7f33 liblog: add IF_ALOG_RATELIMIT
IF_ALOG_RATELIMIT()
    ALOGE("Only one message globally using IF_ALOG_RATELIMIT()"
          " in the process may appear ever ten seconds,"
          " (%s)", strerror(errno));

static time_t last; /* initial state zero */
IF_ALOG_RATELIMIT_LOCAL(60, &last)
    ALOGE("Only one message locally may appear every minute,"
          " (%s)", strerror(errno));

These new calls are guaranteed not to affect the value of a
non-zero errno to simplify logging of errors.  However, the
ALOGE calls in the above examples may update the errno value
upon their return.

Test: gTest liblog-unit-tests --gtest_filter=liblog.__android_log_ratelimit
Bug: 33535908
Change-Id: Id8cc192fc7d14504ffd418933cf88ae945c089f2
2016-12-21 21:36:14 +00:00
Mark Salyzyn
684bdb576d logd: LogBufferElementKey use uint32_t for uid
Test: gTest liblog-unit-tests, logd-unit-tests & logcat-unit-test
Change-Id: Icae34b1fa0b3df0a45ad175ec81aaf232f322f38
2016-12-21 12:16:46 -08:00
Dan Willemsen
e0fca05954 Merge "Add system/core/Android.bp" am: 8a1c4b8530 am: 453faf66d8
am: 0209a3cd07

Change-Id: I4cc5f5c39a444c034b2bbe8f2da100af622dba64
2016-12-20 21:00:45 +00:00
Mark Salyzyn
cbc3797327 Merge "logd: trailing spaces in log statistics (part deux)" am: 2ead17196c am: 741051d066
am: 2263d78515

Change-Id: Id7b47c545378db96935133722ebcf92090633c30
2016-12-20 21:00:24 +00:00
Mark Salyzyn
8b76b78ac2 Merge "Revert "logd: trailing spaces in log statistics"" am: 1fa079b255 am: 827973369d
am: 2888798e8d

Change-Id: I0fcbe1dcf1d6e32311f7d6c8dc89674b7bbde927
2016-12-20 21:00:11 +00:00
Dan Willemsen
0209a3cd07 Merge "Add system/core/Android.bp" am: 8a1c4b8530
am: 453faf66d8

Change-Id: I574e6ee52643004beb718543f291c5f85753026d
2016-12-20 20:42:05 +00:00
Mark Salyzyn
2263d78515 Merge "logd: trailing spaces in log statistics (part deux)" am: 2ead17196c
am: 741051d066

Change-Id: I65cbe04f77e2651c4d71782164d2b268727b702f
2016-12-20 20:41:45 +00:00
Mark Salyzyn
2888798e8d Merge "Revert "logd: trailing spaces in log statistics"" am: 1fa079b255
am: 827973369d

Change-Id: If9e9ae745c9df25cbd07766fd531628021ab672a
2016-12-20 20:41:32 +00:00
Dan Willemsen
453faf66d8 Merge "Add system/core/Android.bp"
am: 8a1c4b8530

Change-Id: I3152b6ff9ee59a0997753540891446c6053542a1
2016-12-20 20:33:23 +00:00
Treehugger Robot
8a1c4b8530 Merge "Add system/core/Android.bp" 2016-12-20 20:25:09 +00:00
Dan Willemsen
d66e7bb7cf Add system/core/Android.bp
Test: Soong's build.ninja is identical before/after (except GlobRules)
Change-Id: I97c1e4cedad1dfc8622abb6cfed6257971199a96
2016-12-20 10:58:18 -08:00
Mark Salyzyn
741051d066 Merge "logd: trailing spaces in log statistics (part deux)"
am: 2ead17196c

Change-Id: If4ed858ba2885c532e3ffd424dada114fcd9d510
2016-12-20 18:52:39 +00:00
Mark Salyzyn
827973369d Merge "Revert "logd: trailing spaces in log statistics""
am: 1fa079b255

Change-Id: I19eb25472a59f2b82e711552aae7fa74085d93ba
2016-12-20 18:52:24 +00:00
Treehugger Robot
2ead17196c Merge "logd: trailing spaces in log statistics (part deux)" 2016-12-20 18:16:15 +00:00
Treehugger Robot
1fa079b255 Merge "Revert "logd: trailing spaces in log statistics"" 2016-12-20 18:16:00 +00:00
forfun
7bda65010f Merge "modify a minor error in mount_with_alternatives Test: when called with end_idx = null" am: 3080ce2fe4 am: d3435f5d31
am: 4d592aba52

Change-Id: I2f61e53e70b814f246cc4683e2b60dfd665ec642
2016-12-20 02:21:08 +00:00
forfun
4d592aba52 Merge "modify a minor error in mount_with_alternatives Test: when called with end_idx = null" am: 3080ce2fe4
am: d3435f5d31

Change-Id: If9cd28111e7c8dc2635b27d7bd28fe608eeb78fa
2016-12-20 02:17:06 +00:00
forfun
d3435f5d31 Merge "modify a minor error in mount_with_alternatives Test: when called with end_idx = null"
am: 3080ce2fe4

Change-Id: I3b7b2167a9d3cd492bb9970e9330ca965d0fb843
2016-12-20 02:13:07 +00:00
Treehugger Robot
3080ce2fe4 Merge "modify a minor error in mount_with_alternatives Test: when called with end_idx = null" 2016-12-20 02:08:36 +00:00
Mark Salyzyn
487af62e43 Merge "logd: sum liblog tag messages" am: 27425fd80d am: 0f3c31086d
am: 6b0b5dad26

Change-Id: I5e21caf0bacf398c0b86fe62e788042cd2114797
2016-12-19 23:58:38 +00:00
Mark Salyzyn
7c31d1fafd Merge "logd: correct duplicate message state machine" am: 9fa0215e15 am: ebfba62dcb
am: 70489ff0b6

Change-Id: I65ac9f58e79a7c4b6909077afde422b7feeb2a0b
2016-12-19 23:58:26 +00:00
Mark Salyzyn
6b0b5dad26 Merge "logd: sum liblog tag messages" am: 27425fd80d
am: 0f3c31086d

Change-Id: Ib1ccd333aea17bc4120976bc32d9d108d0fb651e
2016-12-19 23:54:08 +00:00
Mark Salyzyn
70489ff0b6 Merge "logd: correct duplicate message state machine" am: 9fa0215e15
am: ebfba62dcb

Change-Id: I1c0a344e926bbd92308131c7ba6c1c47364cfee9
2016-12-19 23:53:56 +00:00
Mark Salyzyn
0f3c31086d Merge "logd: sum liblog tag messages"
am: 27425fd80d

Change-Id: Iff565b1ff40c100c2d4b38d1514de0d5b1c94b8e
2016-12-19 23:50:07 +00:00
Mark Salyzyn
ebfba62dcb Merge "logd: correct duplicate message state machine"
am: 9fa0215e15

Change-Id: Id08fcce15a8edb5985f76e2063a1bf8486c93b22
2016-12-19 23:49:56 +00:00
Treehugger Robot
27425fd80d Merge "logd: sum liblog tag messages" 2016-12-19 23:43:48 +00:00
Treehugger Robot
9fa0215e15 Merge "logd: correct duplicate message state machine" 2016-12-19 23:43:23 +00:00
Mark Salyzyn
52504bf3da Merge "logd: add android::sizesTotal() function" am: d04fa942e5 am: 704c1b9dfa
am: 059085b2a5

Change-Id: I78bfb8c51947ace327c8f59f599cb9d6f10ab9d8
2016-12-19 23:34:05 +00:00
Mark Salyzyn
059085b2a5 Merge "logd: add android::sizesTotal() function" am: d04fa942e5
am: 704c1b9dfa

Change-Id: Id5cc6d5f0cb447288ed8c94bba9a29b9d81eecdc
2016-12-19 23:30:04 +00:00
Mark Salyzyn
704c1b9dfa Merge "logd: add android::sizesTotal() function"
am: d04fa942e5

Change-Id: I8dbf35655c0c32ebbb8c563c11b2fe62fe37084b
2016-12-19 23:25:39 +00:00
Treehugger Robot
d04fa942e5 Merge "logd: add android::sizesTotal() function" 2016-12-19 23:19:11 +00:00
Mark Salyzyn
b545e1c9e3 logd: trailing spaces in log statistics (part deux)
Test: manual
Bug: 30118730
Change-Id: Iafda6f95e1b1377649e01868c81c0056c116e01b
2016-12-19 15:06:42 -08:00
Mark Salyzyn
d966e22680 Revert "logd: trailing spaces in log statistics"
Caused +/- field data to land under the Pruned column

This reverts commit 0adcc3e3e8.

Test: manual
Bug: 30118730
Change-Id: Ic75ce3a90baded19f3efc0cc77474fe5d9a8accd
2016-12-19 15:06:37 -08:00
Mark Salyzyn
1dfb4de436 logd: sum liblog tag messages
As an extension to the duplicate multiple message filtering, special
case liblog tagged event messages to be summed.  This solves the
inefficient and confusing duplicate message report from the DOS attack
detection such as:

liblog: 2
liblog: 2
liblog: 2
liblog: 2
liblog: 3

which would result in:

liblog: 2
chatty: ... expire 2 lines
liblog: 2
liblog: 3

And instead sums them and turns them all into:

liblog: 11

liblog messages should never be subject to chatty conversion.

Test: liblog-benchmarks manually check for coalesced liblog messages
      and make sure they do not turn into chatty messages.
      Instrumented code to capture sum intermediates to be sure.
Bug: 33535908
Change-Id: I3bf03c4bfa36071b578bcd6f62234b409a91184b
2016-12-19 14:03:38 -08:00
Mark Salyzyn
8f83a35511 logd: correct duplicate message state machine
Inspection turned up that for the case of three identical messages,
the result would be a stutter of the first message only.  Added
comments to describe the state machine, incoming variables, outcoming
and false condition outputs, for proper maintenance in the future.

Test: gTest liblog-benchmarks BM_log_maximum* and manually check
      for correct midstream chatty messages,
Bug: 33535908
Change-Id: I852260d18a484e6207b80063159f1a74eaa83b55
2016-12-19 14:01:45 -08:00
Mark Salyzyn
174ff08f4e Merge "liblog: pmsg read permissions for AID_LOGD" am: 152b003bbf am: c4b880d146
am: 8e309e8fc1

Change-Id: I86c95f13ab85a8f0a158f92f0d1379802ac1cee3
2016-12-19 16:09:55 +00:00
Mark Salyzyn
8e309e8fc1 Merge "liblog: pmsg read permissions for AID_LOGD" am: 152b003bbf
am: c4b880d146

Change-Id: Iab7dee493b79ae1fe78a130d88b84e481637123f
2016-12-19 16:05:56 +00:00
Mark Salyzyn
c4b880d146 Merge "liblog: pmsg read permissions for AID_LOGD"
am: 152b003bbf

Change-Id: Ifcc860bb70ab30a387132ccfecaa29afde3f5bde
2016-12-19 16:02:25 +00:00
Mark Salyzyn
3296291cff logd: add android::sizesTotal() function
Test: gTest liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Bug: 31456426
Change-Id: I6fb6cd589227fc43d22f9336e01f1bf7e3feb24c
2016-12-19 08:00:16 -08:00
Mark Salyzyn
152b003bbf Merge "liblog: pmsg read permissions for AID_LOGD" 2016-12-19 15:57:08 +00:00
Mark Salyzyn
5bd8f2d956 liblog: pmsg read permissions for AID_LOGD
Test: gTest liblog-unit-test and logd-unit-tests
Bug: 31456426
Change-Id: I7a2fe8245ecd651883f7851ce71b6c45e373af82
2016-12-19 15:57:01 +00:00
Elliott Hughes
5629b442bd Merge "Move init bootcharting onto its own thread." am: 8766ecb78d am: c7816ee377
am: fd47309d33

Change-Id: If17cc90d238addf1ba2a19d179336f4f38837f3e
2016-12-17 18:04:31 +00:00