Commit graph

18295 commits

Author SHA1 Message Date
Mark Salyzyn
be162cf236 am 72146b93: Merge "logd: Add LogUtils.h"
* commit '72146b931ca61e942df91407b561f22648a70bf2':
  logd: Add LogUtils.h
2015-10-05 16:25:53 +00:00
Mark Salyzyn
bd4f52b2e2 Merge "liblog: optimize code hotspot" 2015-10-05 14:19:31 +00:00
Mark Salyzyn
88e0166123 Merge "logd: optimize code hotspots" 2015-10-05 14:18:53 +00:00
Mark Salyzyn
72146b931c Merge "logd: Add LogUtils.h" 2015-10-05 14:18:42 +00:00
Elliott Hughes
49a59bf317 am 450b592d: am 42b8df38: Merge "adb: win32: specify socket protocol"
* commit '450b592da5e630fad028e3a112651b7071971fd7':
  adb: win32: specify socket protocol
2015-10-03 03:14:55 +00:00
Elliott Hughes
fb068b39e0 am f6d28fca: am e412cc89: Merge "Explain adb client/server version mismatch better."
* commit 'f6d28fcaf048dba2e422824f52ac687b48768c0b':
  Explain adb client/server version mismatch better.
2015-10-03 03:14:53 +00:00
Elliott Hughes
450b592da5 am 42b8df38: Merge "adb: win32: specify socket protocol"
* commit '42b8df38439b390f9c67eee567717f30143cf64f':
  adb: win32: specify socket protocol
2015-10-03 03:09:08 +00:00
Elliott Hughes
f6d28fcaf0 am e412cc89: Merge "Explain adb client/server version mismatch better."
* commit 'e412cc891ebdbcc64137ef3c91950124ff633d6f':
  Explain adb client/server version mismatch better.
2015-10-03 03:09:07 +00:00
Elliott Hughes
42b8df3843 Merge "adb: win32: specify socket protocol" 2015-10-03 03:06:24 +00:00
Elliott Hughes
e412cc891e Merge "Explain adb client/server version mismatch better." 2015-10-03 03:03:17 +00:00
Elliott Hughes
5b73a10f64 Explain adb client/server version mismatch better.
"Out of date" is only probably true. You might equally well have an older
client talking to a newer server. So tell the truth and include the actual
version numbers.

Change-Id: I821de88f5baf65bf2623363129c60c496b407bff
2015-10-02 19:49:10 -07:00
Mark Salyzyn
ddda212faa logd: optimize code hotspots
Discovered that we had a few libc hotspots. Adjust code to generally
reduce or nullify the number of calls to malloc, free, strlen,
strcmp, strncmp, memcmp & strncasecmp. Total gain looks to be about
3% of logd's processing time. malloc still contributes to 3%, but all
others are now total 0.5%.

Bug: 23685592
Change-Id: Ife721121667969260cdb8b055524ae90f5911278
2015-10-02 16:45:22 -07:00
Mark Salyzyn
5ac5c6b193 logd: Add LogUtils.h
Move prototypes from LogBufferElement.h to LogUtils.h

Change-Id: I55e42e17e6c997e35b2b78b87fd2f84f8f393282
2015-10-02 16:36:41 -07:00
Elliott Hughes
ae5a6c06cd Speed up adb sync.
Sending the SEND/DATA/DONE packets all in one write makes small file and
symbolic link transfer orders of magnitude faster. Transferring all the
symbolic links in /system/bin or all the cacerts in /system/etc goes down
from about 6s in each case to less than 0.5s.

Change-Id: Ia1706cef25535d0b685d3744241a0557a52b22ff
2015-10-02 14:48:58 -07:00
Mark Salyzyn
16e1c9dfdc liblog: optimize code hotspot
strcmp was 1/10 #2 behind find_property in __android_log_level(),
now virtually eliminated from performance profile.

Bug: 23685592
Change-Id: I3978886193af77e489c6d1728d6a26b7f53f8f2f
2015-10-02 13:55:44 -07:00
Gilad Arnold
39cfa9ce3e am 65475f8c: am b955f476: Merge "Add a "tlsdate" AID for unprivileged tlsdate execution."
* commit '65475f8cc8d8442ee1c6170aa45ff71928f3c809':
  Add a "tlsdate" AID for unprivileged tlsdate execution.
2015-10-02 18:46:17 +00:00
Gilad Arnold
65475f8cc8 am b955f476: Merge "Add a "tlsdate" AID for unprivileged tlsdate execution."
* commit 'b955f476d3b11da9378d5eedfc569711f625e1ba':
  Add a "tlsdate" AID for unprivileged tlsdate execution.
2015-10-02 18:41:05 +00:00
Gilad Arnold
b955f476d3 Merge "Add a "tlsdate" AID for unprivileged tlsdate execution." 2015-10-02 18:36:20 +00:00
Bertrand Simonnet
42890f5b30 am 3fd57f26: am 66255db0: Merge "metricsd: Only collect metrics over a short period."
* commit '3fd57f26c199c1bc999ac18374be5c633e87ec76':
  metricsd: Only collect metrics over a short period.
2015-10-02 15:47:38 +00:00
Gilad Arnold
b5fa88955c Add a "tlsdate" AID for unprivileged tlsdate execution.
Bug: 23651876
Change-Id: I7ab1bccdcd2434c4af663a1afb9fe9ad124c4428
2015-10-02 08:42:43 -07:00
Bertrand Simonnet
3fd57f26c1 am 66255db0: Merge "metricsd: Only collect metrics over a short period."
* commit '66255db05d590bcd011fd3f8b687161f737b3aa8':
  metricsd: Only collect metrics over a short period.
2015-10-02 15:40:46 +00:00
Bertrand Simonnet
66255db05d Merge "metricsd: Only collect metrics over a short period." 2015-10-02 15:36:49 +00:00
Adam Lesinski
0b2bce0638 am bda375fa: am c6c6ab50: Merge "Implement C++11 move semantics for android::FileMap"
* commit 'bda375fa41c88e6b2f81a8cd88fc5fdda62bc723':
  Implement C++11 move semantics for android::FileMap
2015-10-02 01:25:31 +00:00
Adam Lesinski
bda375fa41 am c6c6ab50: Merge "Implement C++11 move semantics for android::FileMap"
* commit 'c6c6ab50bc11d55f3135312ceccbcf0c400b437e':
  Implement C++11 move semantics for android::FileMap
2015-10-02 01:19:25 +00:00
Adam Lesinski
c6c6ab50bc Merge "Implement C++11 move semantics for android::FileMap" 2015-10-02 01:16:05 +00:00
Bertrand SIMONNET
7a9640559b metricsd: Only collect metrics over a short period.
Instead of reporting the metrics over both a long and a short period,
collect and report only over a short period. This makes the code simpler
and the metrics easier to understand.

Also move the collection out of metrics_daemon and into a separate
collector to make it simpler to understand.

BUG: 24464945

Change-Id: I17e52536aaa75321a5e34f42ed488545c2c3efde
2015-10-01 16:45:56 -07:00
Adam Lesinski
6f8885bc14 Implement C++11 move semantics for android::FileMap
FileMaps should be movable, thereby not requiring them to be only used
with a unique_ptr as they currently are.

Change-Id: I0fb8013bf398a2ced5420d85ba888c2a7fc5a496
2015-10-01 12:47:49 -07:00
Jorge Lucangeli Obes
09b7c05aff am 0c4ad786: am 17cd2c49: Merge "Remove \'seclabel\' option."
* commit '0c4ad786f5a3546c85c0c2f8cb006f59311661ac':
  Remove 'seclabel' option.
2015-10-01 19:04:25 +00:00
Yabin Cui
40bc602445 am fb070f3c: am 7377398b: Merge "adb: fdevent fixes"
* commit 'fb070f3c2b1b2e5398a4cb0e67801192a5d90a94':
  adb: fdevent fixes
2015-10-01 19:04:23 +00:00
Sergio Giro
075f690dae am bdae9bf2: resolved conflicts for 70808827 to stage-aosp-master
* commit 'bdae9bf2ec3bbf8e33a34caa412bd8fd7bc2d434':
  system/core: remove BasicHashtable
2015-10-01 18:59:59 +00:00
Jorge Lucangeli Obes
0c4ad786f5 am 17cd2c49: Merge "Remove \'seclabel\' option."
* commit '17cd2c49c9234758b76cb7e43d0bd12496ef31fb':
  Remove 'seclabel' option.
2015-10-01 18:58:12 +00:00
Yabin Cui
fb070f3c2b am 7377398b: Merge "adb: fdevent fixes"
* commit '7377398be81a9a8a4256b4c11e7ed25b059c32bb':
  adb: fdevent fixes
2015-10-01 18:57:59 +00:00
Sergio Giro
bdae9bf2ec resolved conflicts for 70808827 to stage-aosp-master
Change-Id: I2de8a63fa5be5423846df4c2e8ccc5f12e843f09
2015-10-01 19:49:22 +01:00
Jorge Lucangeli Obes
17cd2c49c9 Merge "Remove 'seclabel' option." 2015-10-01 18:37:15 +00:00
Jorge Lucangeli Obes
fcbd11f42e Remove 'seclabel' option.
The executable is already labelled in the filesystem.

Bug: 24571067
Change-Id: I2bef76628b08bec299fea4da8a58fe0eb53b1e59
2015-10-01 11:31:10 -07:00
Yabin Cui
7377398be8 Merge "adb: fdevent fixes" 2015-10-01 18:05:52 +00:00
Sergio Giro
70808827a4 Merge "system/core: remove BasicHashtable" 2015-10-01 17:24:01 +00:00
Steve Fung
9625980058 am 3f43729a: am 7c262abe: Merge "crash_reporter: Set Version and Product ID"
* commit '3f43729a36a7f2b318a8738bdb9660dd891dfa04':
  crash_reporter: Set Version and Product ID
2015-10-01 17:22:48 +00:00
Steve Fung
3f43729a36 am 7c262abe: Merge "crash_reporter: Set Version and Product ID"
* commit '7c262abeac08483d039da29b4dec3ed02abe12bf':
  crash_reporter: Set Version and Product ID
2015-10-01 17:17:03 +00:00
Steve Fung
7c262abeac Merge "crash_reporter: Set Version and Product ID" 2015-10-01 17:11:55 +00:00
Sergio Giro
f84a4906fa system/core: remove BasicHashtable
Towards deprecation of SharedBuffer

Change-Id: Id6d1c8637583df38b6f28398b6804d9c1e96472a
2015-10-01 11:44:47 +01:00
Stephen Hines
fc5185a578 am cabf610d: am d29f10cd: Merge "Fix build break due to unknown pragma (on gcc)."
* commit 'cabf610da0799abc302233acf4b3c420543a9c04':
  Fix build break due to unknown pragma (on gcc).
2015-10-01 06:49:19 +00:00
Stephen Hines
cabf610da0 am d29f10cd: Merge "Fix build break due to unknown pragma (on gcc)."
* commit 'd29f10cd271324a70f970bec4379cce880a621b5':
  Fix build break due to unknown pragma (on gcc).
2015-10-01 06:42:30 +00:00
Stephen Hines
d29f10cd27 Merge "Fix build break due to unknown pragma (on gcc)." 2015-10-01 06:37:50 +00:00
Stephen Hines
9466bb2ab6 Fix build break due to unknown pragma (on gcc).
Change-Id: I36bf855769b243139fd45186ac53578448b87a2b
2015-09-30 23:30:38 -07:00
Spencer Low
888a748bf2 adb: fdevent fixes
* fdevent_{set,add,del}()

  * CHECK() that the fdevent is FDE_ACTIVE, otherwise the caller would
    be waiting for events that will never arrive.

  * Remove ~ from "fde->events &= ~events" to keep desired bits instead
    of turning off desired bits.

* fdevent_call_fdfunc()

  * CHECK(FDE_PENDING) since it should always be true if the fdevent was
    on the pending list, or if fdevent_subproc_event_func() is faking
    things. The goal is to try to avoid losing events.

Change-Id: I979c2fffa0b3d6b635488cde11dc544691193018
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-30 23:29:25 -07:00
Stephen Hines
e6a782cc9f am f141312c: am dc91dafa: Merge "Ignore explicit infinite recursion."
* commit 'f141312c826a1c03b10d1e8acd033f39063f7599':
  Ignore explicit infinite recursion.
2015-10-01 05:46:17 +00:00
Stephen Hines
f141312c82 am dc91dafa: Merge "Ignore explicit infinite recursion."
* commit 'dc91dafa3b614b399074a1506ba1684c89ae4eae':
  Ignore explicit infinite recursion.
2015-10-01 05:41:54 +00:00
Stephen Hines
dc91dafa3b Merge "Ignore explicit infinite recursion." 2015-10-01 05:36:40 +00:00
Yabin Cui
5027ffd873 am 4b3ee266: am ffa866f5: Merge "adb: detect sockets in CLOSE_WAIT state to prevent socket leak on linux."
* commit '4b3ee2666cdddbace5b7115853780e1d969c2776':
  adb: detect sockets in CLOSE_WAIT state to prevent socket leak on linux.
2015-10-01 00:14:43 +00:00