Chih-hung Hsieh
2d241ec8a8
am 3a387176: Merge "Don\'t build init with clang for now"
...
* commit '3a3871769130428bc1b8f3de03be7231750e1b82':
Don't build init with clang for now
2014-10-16 16:27:07 +00:00
Chih-hung Hsieh
3a38717691
Merge "Don't build init with clang for now"
2014-10-16 16:22:03 +00:00
Chih-Hung Hsieh
07f1300c4c
am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
...
* commit '7979f1ce5fd771aa9814ef7390f290201ae0790d':
Do not inline rarely used trace function bodies.
2014-10-15 17:54:19 +00:00
Chih-Hung Hsieh
7979f1ce5f
Merge "Do not inline rarely used trace function bodies."
2014-10-15 17:49:03 +00:00
Mark Salyzyn
4f083c6156
am a8aad166: Merge "logd: insert order for first entry"
...
* commit 'a8aad1667ff191cbc3972c40e8f9ec960db4ef96':
logd: insert order for first entry
2014-10-15 00:01:39 +00:00
Mark Salyzyn
a8aad1667f
Merge "logd: insert order for first entry"
2014-10-14 23:57:33 +00:00
Mark Salyzyn
eae155e1ce
logd: insert order for first entry
...
Change-Id: I39e8e6d32407a1796a0c3a121f9dc4dc5402c3df
2014-10-14 23:57:13 +00:00
Chih-Hung Hsieh
2d3150e736
Do not inline rarely used trace function bodies.
...
When atrace_* functions are inlined,
the rarely used 1024-byte buffers are allocated on stack.
BUG: 17444504
Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
2014-10-14 15:37:20 -07:00
Dmitriy Ivanov
3f95c89db6
am e63fb8bd: Merge "Remove libsigchain from LD_PRELOADs"
...
* commit 'e63fb8bd8086a280cae61612da965cb13e75194f':
Remove libsigchain from LD_PRELOADs
2014-10-14 17:43:22 +00:00
Dmitriy Ivanov
e63fb8bd80
Merge "Remove libsigchain from LD_PRELOADs"
2014-10-14 17:39:22 +00:00
Riley Andrews
e7502d32cf
am 3bcd5694: Merge "Add gtest conformance tests for libsync."
...
* commit '3bcd569490bceb2c1f2bdd8d6852680e12dedc9f':
Add gtest conformance tests for libsync.
2014-10-11 19:44:46 +00:00
Riley Andrews
3bcd569490
Merge "Add gtest conformance tests for libsync."
2014-10-11 19:40:32 +00:00
Riley Andrews
d0d7f6ac08
Add gtest conformance tests for libsync.
...
Not complete yet, but substantially more comprehensive than the
interactive test that was there before.
(cherry-picked from internal master, same change-id).
Change-Id: I9019b0a8babbc91f78aa850e0e288bbf05f93500
2014-10-11 02:10:23 +00:00
Mark Salyzyn
af191cd157
am 6b66025f: Merge "fs_mgr: fix build breakage"
...
* commit '6b66025f6f3e48d182e8d6aeb989d0f39eb551e3':
fs_mgr: fix build breakage
2014-10-09 14:20:05 +00:00
Mark Salyzyn
6b66025f6f
Merge "fs_mgr: fix build breakage"
2014-10-09 14:14:55 +00:00
Mark Salyzyn
89fa114e2a
fs_mgr: fix build breakage
...
Some compilers are not as smart as other compilers
Change-Id: I9d93c73bdbd2dca37373d8a42a2ed510d0559274
2014-10-08 16:43:47 -07:00
Elliott Hughes
f7c287b750
am 47d24416: Merge "Fix top for very large VSS."
...
* commit '47d244165751f0fa03e63a8b7aa44b50c5f3bf88':
Fix top for very large VSS.
2014-10-08 18:24:13 +00:00
Elliott Hughes
47d2441657
Merge "Fix top for very large VSS."
2014-10-08 18:20:31 +00:00
Elliott Hughes
052d78f334
Fix top for very large VSS.
...
Bug: 17913995
Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
2014-10-08 11:20:03 -07:00
Dmitriy Ivanov
c9f9f35efa
Remove libsigchain from LD_PRELOADs
...
Bug: 15345057
Bug: 15426766
Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
2014-10-07 13:39:02 -07:00
Mark Salyzyn
b2a5d839ec
am a083c857: Merge changes I7d0b85b5,I74796043
...
* commit 'a083c8578a8cfa44b50e6d1159b83182aba63bcb':
logd: LogStatistics leak
logd: kill(0,0) issue
2014-10-07 14:27:06 +00:00
Mark Salyzyn
a083c8578a
Merge changes I7d0b85b5,I74796043
...
* changes:
logd: LogStatistics leak
logd: kill(0,0) issue
2014-10-07 14:23:46 +00:00
Mark Salyzyn
332bdffa4f
am 09dc0633: Merge changes I74796043,I74796043
...
* commit '09dc063319d017625fbde0fd380ed677b680415e':
logd: Add control statistics enable/disable.
logd: cleanup
2014-10-06 23:06:50 +00:00
Mark Salyzyn
f48ea7c8dc
logd: LogStatistics leak
...
- uid = -1 in subtract operation to match add
Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261
2014-10-06 22:43:56 +00:00
Mark Salyzyn
df5aa61f05
logd: kill(0,0) issue
...
- Recognize pid=0 as special case (kernel or pre-init sourced)
and refrain from treating it in the general case.
Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e012
2014-10-06 22:43:46 +00:00
Mark Salyzyn
09dc063319
Merge changes I74796043,I74796043
...
* changes:
logd: Add control statistics enable/disable.
logd: cleanup
2014-10-06 22:43:26 +00:00
Mark Salyzyn
f5fc509589
logd: Add control statistics enable/disable.
...
- ro.build.type=user turn off statistics
- ro.config.low_ram=true turn off statistics
- logd.statistics override
Bug: 17526159
Bug: 17526187
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e00f
2014-10-06 22:42:47 +00:00
Mark Salyzyn
e72c6e4366
logd: cleanup
...
- simplify access and control exposure to class list
- indent
- compile warning
- Follow standard naming convention for variables and methods
- merge common fragments
- Side Effects: none
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e010
2014-10-06 22:42:07 +00:00
Chih-Hung Hsieh
ad0ff1d99c
am 4fceda2b: Merge "Add -no-integrated-as at local level."
...
* commit '4fceda2b53dd2b7537bb65cb6ee0d61bee5ab66c':
Add -no-integrated-as at local level.
2014-10-06 22:31:26 +00:00
Chih-Hung Hsieh
4fceda2b53
Merge "Add -no-integrated-as at local level."
2014-10-06 22:02:06 +00:00
Chih-Hung Hsieh
60c57dad4e
Add -no-integrated-as at local level.
...
Later we will enable integrated-as as default at the global level.
BUG: 17820427
Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
2014-10-06 13:33:25 -07:00
Elliott Hughes
85cac2abd4
am b1dd4af7: Merge "Fix a typo in ioctl usage message."
...
* commit 'b1dd4af7c41dc0d73f9431ec7adabc342e13434e':
Fix a typo in ioctl usage message.
2014-10-06 17:16:04 +00:00
Elliott Hughes
b1dd4af7c4
Merge "Fix a typo in ioctl usage message."
2014-10-06 17:12:01 +00:00
Elliott Hughes
a0d61ba3e9
Fix a typo in ioctl usage message.
...
Change-Id: I850dd9995a8ad6cb1f606cca2f57d7dbba2f40ed
2014-10-06 10:09:25 -07:00
Hans Boehm
072877af48
am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
...
* commit '41198eea42b7a6f1d4222abd7a5fec965d11b238':
Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 01:36:18 +00:00
Hans Boehm
41198eea42
Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
2014-10-04 01:31:49 +00:00
Hans Boehm
2789faabfa
Revert "Rewrite atomic.h to use stdatomic.h."
...
This reverts commit cb344d4640 .
Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm
f5204549fa
am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
...
* commit '028928fe3ca42b7aab55cb49f2784caeec025a12':
Rewrite atomic.h to use stdatomic.h.
2014-10-03 23:59:04 +00:00
Hans Boehm
028928fe3c
Merge "Rewrite atomic.h to use stdatomic.h."
2014-10-03 23:47:36 +00:00
Bernhard Rosenkraenzer
84e07fb7a4
Don't build init with clang for now
...
init doesn't start when built with clang.
Set LOCAL_CLANG:=false until this is analyzed and fixed.
Change-Id: I5a7944aef676ce88defe5c0449e712d9812fb5f3
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-10-04 01:36:49 +02:00
Calin Juravle
2124b521e8
am c6083626: Merge "Use initUnchangeableSystemProperty for initializing os.arch."
...
* commit 'c60836263e19ac15f674320e978caa577c042f12':
Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-02 17:38:03 +00:00
Calin Juravle
c60836263e
Merge "Use initUnchangeableSystemProperty for initializing os.arch."
2014-10-02 17:28:39 +00:00
Hans Boehm
cb344d4640
Rewrite atomic.h to use stdatomic.h.
...
Replace atomic-inl.h with a file that just includes atomic.h.
Remove platform specific implementations.
Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
2014-10-01 17:37:20 -07:00
Calin Juravle
c3eb4314b7
Use initUnchangeableSystemProperty for initializing os.arch.
...
Bug: 17713104
(cherry picked from commit 00851a53be )
Change-Id: Ibddc535248a10e3534586eafb76c074332e025c4
2014-10-01 21:16:16 +01:00
Mark Salyzyn
c4133a6e28
am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization"
...
* commit 'fc1357cffbbe999c8d4065b89ce0435f35243a82':
logd: in nonblocking read, sched_yield() synchronization
2014-09-29 20:48:05 +00:00
Andreas Gampe
f0699c11de
am 68c19686: Merge "Fix mac build for nativebridge tests."
...
* commit '68c19686e8f9b5a88e3b2729a453d03516be79f1':
Fix mac build for nativebridge tests.
2014-09-29 20:48:04 +00:00
Mark Salyzyn
fc1357cffb
Merge "logd: in nonblocking read, sched_yield() synchronization"
2014-09-29 17:41:11 +00:00
Mark Salyzyn
f669acb018
logd: in nonblocking read, sched_yield() synchronization
...
- sched_yield and lock synchronization in reader thread
startup to give writer thread a chance to catch up
Bug: 17512203
Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
2014-09-29 17:40:10 +00:00
Andreas Gampe
68c19686e8
Merge "Fix mac build for nativebridge tests."
2014-09-29 14:59:50 +00:00
Calin Juravle
c00994df05
Fix mac build for nativebridge tests.
...
Bug: 17671501
(cherry picked from commit 2e5e8cc92081da6b0af658d12a60334acea441a1)
Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
2014-09-29 07:58:15 -07:00