Elliott Hughes
437d698257
resolved conflicts for merge of 038b76c2
to mnc-dr-dev-plus-aosp
...
Change-Id: I5041d5ac2f377adfeaa6138db47359f1a47fffc7
2015-07-24 20:12:02 -07:00
Yabin Cui
9b09bf4aed
am 10821da3
: am 8a502000
: Merge "init: expand_props for onrestart commands."
...
* commit '10821da3221ce4fe021c80956a5cac733c97ebb9':
init: expand_props for onrestart commands.
2015-07-25 02:15:19 +00:00
Elliott Hughes
038b76c23e
am bb4370f8
: Merge "Turn on warnings for libcutils, fix a bug."
...
* commit 'bb4370f833a661033184d258892906d63a347571':
Turn on warnings for libcutils, fix a bug.
2015-07-25 02:01:34 +00:00
Yabin Cui
10821da322
am 8a502000
: Merge "init: expand_props for onrestart commands."
...
* commit '8a502000d15cce102569d3609e24846ef19a4a77':
init: expand_props for onrestart commands.
2015-07-25 02:01:32 +00:00
Elliott Hughes
bb4370f833
Merge "Turn on warnings for libcutils, fix a bug."
2015-07-25 01:56:24 +00:00
Yabin Cui
8a502000d1
Merge "init: expand_props for onrestart commands."
2015-07-25 01:49:01 +00:00
Elliott Hughes
8fea1ede67
Turn on warnings for libcutils, fix a bug.
...
This doesn't actually spot the bug I'm about to fix, but maybe one day...
Change-Id: Ib8a2016ecd8a426f38960a05d439646255ea6cd8
2015-07-24 18:48:31 -07:00
Yabin Cui
310851549b
am bd5f10ad
: am 699be5f6
: Merge "init: do expand_props before calling the builtins."
...
* commit 'bd5f10addfba8df40c8293d95c002044acbfa526':
init: do expand_props before calling the builtins.
2015-07-25 01:19:29 +00:00
Yabin Cui
ee53006564
init: expand_props for onrestart commands.
...
It is only a temporary fix. I hope the code can be moved into a member
function of class Command.
Bug: 22654233
Change-Id: I38c24fb624e54986a953f44d398b3b80c3795d24
2015-07-24 18:17:16 -07:00
Yabin Cui
bd5f10addf
am 699be5f6
: Merge "init: do expand_props before calling the builtins."
...
* commit '699be5f66950d0767cb6d9e1190ecd6932a4c7bb':
init: do expand_props before calling the builtins.
2015-07-25 01:05:25 +00:00
Elliott Hughes
727f40ebda
am b8fa711f
: am 3fe6de1c
: Merge "Add a simple test for using non-ASCII paths with adb."
...
* commit 'b8fa711fa92791f67592d9b9730354b1dd9e78e5':
Add a simple test for using non-ASCII paths with adb.
2015-07-25 01:03:24 +00:00
Yabin Cui
699be5f669
Merge "init: do expand_props before calling the builtins."
2015-07-25 00:54:21 +00:00
Elliott Hughes
b8fa711fa9
am 3fe6de1c
: Merge "Add a simple test for using non-ASCII paths with adb."
...
* commit '3fe6de1c39f532d4f462da8acbb3d2e84ee1a053':
Add a simple test for using non-ASCII paths with adb.
2015-07-24 23:22:35 +00:00
Elliott Hughes
3fe6de1c39
Merge "Add a simple test for using non-ASCII paths with adb."
2015-07-24 23:07:56 +00:00
Elliott Hughes
614e0a47d3
Add a simple test for using non-ASCII paths with adb.
...
Bug: https://code.google.com/p/android/issues/detail?id=8185
Change-Id: If28a0ff345f44b60d6651bb36afb0bf72fe55e16
2015-07-24 15:26:46 -07:00
Elliott Hughes
6281dbcd11
am 7d86f5e5
: am 239f6ac8
: Merge "Fix Win32 adb build (for the second time today)."
...
* commit '7d86f5e527c01d3fda84575af98888ee117159ee':
Fix Win32 adb build (for the second time today).
2015-07-24 22:04:19 +00:00
Yabin Cui
00ede7d262
init: do expand_props before calling the builtins.
...
Also switch expand_props to std::string.
Bug: 22654233
Change-Id: I62910d4f74e2b1a5bd2b14aea440767a2a8462b7
2015-07-24 15:02:19 -07:00
Elliott Hughes
7d86f5e527
am 239f6ac8
: Merge "Fix Win32 adb build (for the second time today)."
...
* commit '239f6ac8e73e294eaf21ec70a9f2f7a3631ab964':
Fix Win32 adb build (for the second time today).
2015-07-24 21:47:49 +00:00
Elliott Hughes
239f6ac8e7
Merge "Fix Win32 adb build (for the second time today)."
2015-07-24 21:34:17 +00:00
Elliott Hughes
4f1d7b55d7
Fix Win32 adb build (for the second time today).
...
Change-Id: I83cb407660cd8b5ed65a80574875fe261e8a8926
2015-07-24 14:32:46 -07:00
Elliott Hughes
c53ef014e5
am f077e45c
: am 9dad4ec4
: Merge "Clean up the locking in usb_linux.cpp."
...
* commit 'f077e45cc47d1bf16779f3a689bd0cd857cb7f03':
Clean up the locking in usb_linux.cpp.
2015-07-24 21:11:11 +00:00
Elliott Hughes
0ddd9b2143
am 51d08e8e
: am 2e942a47
: Merge "Fix Win32 adb build."
...
* commit '51d08e8e7abe50051650b1ea5936006c6d6da3e9':
Fix Win32 adb build.
2015-07-24 21:10:48 +00:00
Yabin Cui
0ff8590e78
resolved conflicts for merge of bff40697
to mnc-dr-dev-plus-aosp
...
Change-Id: I7d7a614a5eb987ef6aecd32ed15a6eaa43e93957
2015-07-24 13:58:03 -07:00
Elliott Hughes
f077e45cc4
am 9dad4ec4
: Merge "Clean up the locking in usb_linux.cpp."
...
* commit '9dad4ec4408bf412c265ac9bb27c84bb5098e67c':
Clean up the locking in usb_linux.cpp.
2015-07-24 20:37:12 +00:00
Elliott Hughes
9dad4ec440
Merge "Clean up the locking in usb_linux.cpp."
2015-07-24 20:21:53 +00:00
Elliott Hughes
812f030477
Clean up the locking in usb_linux.cpp.
...
tsan complained that usb_bulk_write accesses usb_handle members outside
a lock. Fix that, but by moving everything over to C++11 locking.
Note that the old code was checking whether pthread_cond_timedwait returned
a negative value, which it will never do --- it will signal timeout (or
any other error) by returning a positive errno value. The rewrite does
what they appeared to intend to do (break out on timeout), rather than
what they actually did (keep trying forever).
Bug: http://b/22598587
Change-Id: Iab6869ffed4874143a7da97193d6b09e34cf2933
2015-07-24 12:35:50 -07:00
Elliott Hughes
51d08e8e7a
am 2e942a47
: Merge "Fix Win32 adb build."
...
* commit '2e942a47967ad302db15b3f7f17cf17f28785d16':
Fix Win32 adb build.
2015-07-24 18:50:30 +00:00
Elliott Hughes
2e942a4796
Merge "Fix Win32 adb build."
2015-07-24 18:36:56 +00:00
Elliott Hughes
d48dbd89c8
Fix Win32 adb build.
...
Change-Id: I0a07379c470b7fa7f9bdef68c17ccb7bd0bd2079
2015-07-24 11:35:40 -07:00
Yabin Cui
bff406978a
am addf7a96
: Merge "init: Let property_get return std::string."
...
* commit 'addf7a964b5b17c00e5e371e2d0ed42eb5e563e1':
init: Let property_get return std::string.
2015-07-24 18:26:51 +00:00
Yabin Cui
addf7a964b
Merge "init: Let property_get return std::string."
2015-07-24 18:16:06 +00:00
Yabin Cui
74edcea90e
init: Let property_get return std::string.
...
Bug: 22654233
Change-Id: Id6091f58432f75e966b9871256049fbe17766c10
2015-07-24 11:14:08 -07:00
Elliott Hughes
470df782f4
am 1f76c1ab
: am 9727a6a0
: Merge "Report getaddrinfo failures correctly."
...
* commit '1f76c1abea3196a61f85164a078d44505d3a6b5e':
Report getaddrinfo failures correctly.
2015-07-24 17:42:55 +00:00
Elliott Hughes
1f76c1abea
am 9727a6a0
: Merge "Report getaddrinfo failures correctly."
...
* commit '9727a6a01942551af248563535196e6d722eb186':
Report getaddrinfo failures correctly.
2015-07-24 17:27:47 +00:00
Elliott Hughes
9727a6a019
Merge "Report getaddrinfo failures correctly."
2015-07-24 17:18:47 +00:00
Elliott Hughes
381cfa9a8b
Report getaddrinfo failures correctly.
...
Also move us off the "convenience" function because you can't get useful
error reporting from it.
Change-Id: I5fcc6a6d762f5f60906980a7835f01a35045be65
2015-07-23 21:14:38 -07:00
Elliott Hughes
646732eb94
am f5defe75
: am 89cc750e
: Merge "Don\'t limit Windows USB reads."
...
* commit 'f5defe752334c557a6be2d7242c944a81f11be76':
Don't limit Windows USB reads.
2015-07-23 19:10:09 +00:00
Elliott Hughes
819f022181
am 2fc8a91e
: am 6b40d0aa
: Merge "adb: win32: fix exec-in and exec-out to use binary mode"
...
* commit '2fc8a91eb35556b6f2bb4018b0fe2c08de55fe1c':
adb: win32: fix exec-in and exec-out to use binary mode
2015-07-23 19:10:07 +00:00
Elliott Hughes
335321e7c1
am d804c6cd
: am 571c8d71
: Merge "Increase size of the the adb packets sent over the wire"
...
* commit 'd804c6cdc5f0dd4bccfe802f3e4db12e9110e0ef':
Increase size of the the adb packets sent over the wire
2015-07-23 19:10:05 +00:00
Elliott Hughes
f5defe7523
am 89cc750e
: Merge "Don\'t limit Windows USB reads."
...
* commit '89cc750e9b2623aae3c257ce6c72f4ffe3e1bb33':
Don't limit Windows USB reads.
2015-07-23 18:28:39 +00:00
Elliott Hughes
2fc8a91eb3
am 6b40d0aa
: Merge "adb: win32: fix exec-in and exec-out to use binary mode"
...
* commit '6b40d0aaa1e8142dbe14a1fb1bfd7ff04de54e53':
adb: win32: fix exec-in and exec-out to use binary mode
2015-07-23 18:28:37 +00:00
Elliott Hughes
d804c6cdc5
am 571c8d71
: Merge "Increase size of the the adb packets sent over the wire"
...
* commit '571c8d713c43d418f722ee71105457b8e76adc20':
Increase size of the the adb packets sent over the wire
2015-07-23 18:28:35 +00:00
Elliott Hughes
89cc750e9b
Merge "Don't limit Windows USB reads."
2015-07-22 23:48:08 +00:00
Elliott Hughes
61ee830ec9
Don't limit Windows USB reads.
...
In 3d2904cdf2
we removed the code that broke
Linux USB reads into 4KiB chunks. This patch does the same for Windows. This
improves Windows "adb pull" speeds 6x in my VM. (There was no equivalent
problem with writes, so this change only affects pull speeds.)
Change-Id: If19013e5f51975f4824bf9147b7b76cebd305b96
2015-07-22 15:59:06 -07:00
Elliott Hughes
6b40d0aaa1
Merge "adb: win32: fix exec-in and exec-out to use binary mode"
2015-07-22 22:43:45 +00:00
Elliott Hughes
571c8d713c
Merge "Increase size of the the adb packets sent over the wire"
2015-07-22 22:42:05 +00:00
Tamas Berghammer
3d2904cdf2
Increase size of the the adb packets sent over the wire
...
The reason behing this change is to increase the adb push/pull speed
with reduceing the number of packets sent between the host and the
device because the communication is heavily bound by packet latency.
The change maintains two way compatibility in the communication
protocol with negotiating a packet size between the target and the
host with the CONNECT packets.
After this change the push/pull speeds improved significantly
(measured from Linux-x86_64 with 100MB of data):
| Old push | Old pull || New push | New pull |
-----------------------------------------------------------
Hammerhead | 4.6 MB/s | 3.9 MB/s || 13.1 MB/s | 16.5 MB/s |
-----------------------------------------------------------
Volantis | 6.0 MB/s | 6.2 MS/s || 25.9 MB/s | 29.0 MB/s |
-----------------------------------------------------------
Fugu | 6.0 MB/s | 5.1 MB/s || 27.9 MB/s | 33.2 MB/s |
-----------------------------------------------------------
Change-Id: Id9625de31266e43394289e325c7e7e473379c5d8
2015-07-22 13:06:06 -07:00
Elliott Hughes
2694ad9ad9
am 7f12fa27
: am f5b46079
: Merge "init: use init\'s property expansion code for mount_all"
...
* commit '7f12fa275604504ed874c08d6b7f906e8e522c73':
init: use init's property expansion code for mount_all
2015-07-22 18:05:02 +00:00
Elliott Hughes
7f12fa2756
am f5b46079
: Merge "init: use init\'s property expansion code for mount_all"
...
* commit 'f5b46079621801ced3c24e37507e58299953c814':
init: use init's property expansion code for mount_all
2015-07-22 17:50:48 +00:00
Elliott Hughes
f5b4607962
Merge "init: use init's property expansion code for mount_all"
2015-07-22 17:38:55 +00:00