Commit Graph

1655 Commits

Author SHA1 Message Date
The Android Open Source Project 6be163b167 merge from open-source master
Change-Id: I8b1e7e238d9d0e828bea72530b5356b8386e48bc
2010-06-04 08:00:52 -07:00
Jack Palevich 192a288315 Improve linenoise.c compatability.
+ Don't flush characters when switching into and out of raw mode. This
avoids eating characters that follow '\n'. (Such characters can occur
when pasting multiple line input, or when scripts are driving input.)

+ Try to be slightly cleverer about calculating the length of the prompt,
so that prompts with embedded '\n' characters are handled OK. This is
an area that really needs to be replaced with a query of the cursor
position from the terminal.

+ As a hack, just assume the screen is very wide if we don't know how
wide it is. This allows dexpropt to work correctly. (It was getting
confused by the editing commands emitted when the end-of-line was reached.)

Change-Id: I988dd0f0bceb22b298e915be0dde085c9358ef66
2010-06-04 14:32:01 +08:00
Jack Palevich ad5431d2ca Emit shell prompt even when in non-interactive mode.
Change-Id: If85c509efe13e4bdb40216c79d560ea7f83ba813
2010-06-04 12:03:14 +08:00
Colin Cross 6f5096b188 am 982a815c: Reap firmware child processes to prevent zombies 2010-06-03 14:45:19 -07:00
Colin Cross 982a815c10 Reap firmware child processes to prevent zombies
Change-Id: Ic6c50b929a025f05450cd309238e60a857690d9b
2010-06-03 12:21:01 -07:00
The Android Open Source Project 2ddc27d0df am f1a4618e: am 324a98f1: merge from open-source master 2010-06-03 09:21:28 -07:00
The Android Open Source Project 42cd1c99c4 am 7bea36bd: am f7e148c1: merge from open-source master 2010-06-03 09:19:26 -07:00
The Android Open Source Project f1a4618e99 am 324a98f1: merge from open-source master
Merge commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4' into kraken

* commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4':
  sh: Fix problem with stray '\r' character that was introduced in previous change
2010-06-03 09:16:51 -07:00
The Android Open Source Project 7bea36bdeb am f7e148c1: merge from open-source master
Merge commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9' into kraken

* commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9':
  adb connect and disconnect improvements:
2010-06-03 09:14:03 -07:00
The Android Open Source Project 324a98f190 merge from open-source master
Change-Id: I6262a725068f89c989e2e6706bcd220ddb217c8e
2010-06-03 09:13:23 -07:00
The Android Open Source Project f7e148c1bc merge from open-source master
Change-Id: I9b051ebd6e785e4d68e148a005a0485e79aa55ea
2010-06-03 09:09:17 -07:00
Christopher Tate f96e700b33 am 25e7b8fc: am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable 2010-06-02 22:23:25 -07:00
Mike Lockwood 1bc4eae349 sh: Fix problem with stray '\r' character that was introduced in previous change
Change-Id: I53148089bcb1989c129c7af465c724495e13e156
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-02 15:08:30 -04:00
Christopher Tate 25e7b8fcc3 am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
Merge commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163' into kraken

* commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163':
  Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
2010-06-02 11:20:39 -07:00
Christopher Tate b1fb3bd13a am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
Merge commit '230cb33fd1ab335c6f808c72db891993b00110a0' into froyo-plus-aosp

* commit '230cb33fd1ab335c6f808c72db891993b00110a0':
  Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
2010-06-02 11:18:36 -07:00
Mike Lockwood cbbe79add1 adb connect and disconnect improvements:
Port number is now optional.  Will use default port 5555 if not specified.
"adb disconnect" with no additional arguments will disconnect all TCP devices.

Change-Id: I7fc26528ed85e66a73b8f6254cea7bf83d98109f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-02 11:31:26 -04:00
The Android Open Source Project b0e270fd24 am 5458065f: am 456688bf: merge from open-source master 2010-06-02 08:19:27 -07:00
The Android Open Source Project 5458065fbb am 456688bf: merge from open-source master
Merge commit '456688bfb4fa7817031a1d704e8353e1dd5efb3c' into kraken

* commit '456688bfb4fa7817031a1d704e8353e1dd5efb3c':
  adb: remove obsolete shell history support.
2010-06-02 08:17:06 -07:00
The Android Open Source Project f296c5bc39 am 12e549b0: am 5dc0f5db: merge from open-source master 2010-06-02 08:16:59 -07:00
The Android Open Source Project f35012b093 am 7e81a617: am c57a22c8: merge from open-source master 2010-06-02 08:16:57 -07:00
The Android Open Source Project 5da46c90db am a11a001f: am 705b37b8: merge from open-source master 2010-06-02 08:15:28 -07:00
The Android Open Source Project 12e549b006 am 5dc0f5db: merge from open-source master
Merge commit '5dc0f5db7152a604377af30f7d2139a84fd7b30c' into kraken

* commit '5dc0f5db7152a604377af30f7d2139a84fd7b30c':
  Use linenoise to add simple editing and history to the Android shell.
2010-06-02 08:14:35 -07:00
The Android Open Source Project 456688bfb4 merge from open-source master
Change-Id: I99ae03ba51ee185b9cfecf4f26e94a757f3815c2
2010-06-02 08:14:33 -07:00
The Android Open Source Project 7e81a61772 am c57a22c8: merge from open-source master
Merge commit 'c57a22c8561cc571d23cd7f321103b2b4d2c7cde' into kraken

* commit 'c57a22c8561cc571d23cd7f321103b2b4d2c7cde':
  Let "adb connect" connect to emulators too
2010-06-02 08:14:32 -07:00
The Android Open Source Project 5dc0f5db71 merge from open-source master
Change-Id: I9e7ebc99f0de12ed3ae38a3882481485a96f9680
2010-06-02 08:13:29 -07:00
The Android Open Source Project a11a001fc6 am 705b37b8: merge from open-source master
Merge commit '705b37b84c0c13407963fb1cea0309b9c3081368' into kraken

* commit '705b37b84c0c13407963fb1cea0309b9c3081368':
  Fix adb remount on non-MTD devices
2010-06-02 08:13:05 -07:00
The Android Open Source Project a48c07008e am 62f30537: am c0b3ad16: merge from open-source master 2010-06-02 08:11:57 -07:00
The Android Open Source Project c57a22c856 merge from open-source master
Change-Id: I44bd527e51d102a56a1efe40cb6e634859b09461
2010-06-02 08:11:52 -07:00
The Android Open Source Project 62f305371d am c0b3ad16: merge from open-source master
Merge commit 'c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f' into kraken

* commit 'c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f':
  adb: Add Qualcomm USB id
2010-06-02 08:09:28 -07:00
The Android Open Source Project 705b37b84c merge from open-source master
Change-Id: I5f7880bec0c15ae7a42175107d8192ad44b847ca
2010-06-02 08:08:55 -07:00
The Android Open Source Project c0b3ad1659 merge from open-source master
Change-Id: I71f2e47509695ba9ec626f4a6917a645b00a4e70
2010-06-02 08:07:48 -07:00
Mike Lockwood 203f102028 libusbhost: Added usb_device_get_unique_id
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-01 22:18:04 -04:00
Christopher Tate 230cb33fd1 Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
This is so that the system process can capture kernel thread stacks when the
watchdog detects a deadlock.  Previously, /proc/kmsg was root/root and mode
0400, and /proc/sysrq-trigger was root/root and mode 0200.  With this
change, /proc/kmsg becomes root/system and 0440, and /proc/sysrq-trigger
becomes root/system and 0220.

Change-Id: Iac46bd10bd11d495024afeb5d693107ce5074791
2010-06-01 17:48:30 -07:00
Andy McFadden f4dd883389 Fix build.
Missing a #define to map android_atomic_swap to its new name.  Worked
fine in the other branches, because nobody was using android_atomic_swap
in the other branches.

Change-Id: I0e730e9823ac5cd2fee5a3f856ce05d36df5d87e
2010-06-01 09:55:18 -07:00
Andy McFadden 8264358f5b am 8dfa47da: Atomic/SMP update, part 2. 2010-05-30 21:20:45 -07:00
Martyn Capewell 4dc1fa8e8d Adds support for UBFX to JIT and Disassembler
This introduces UBFX instruction generation abilities to the Pixelflinger JIT,
and also modifies the component extraction function to generate the
instruction.

The extract function contains defines to prevent generation of UBFX on pre-v7
cores. The JIT itself retains the ability to produce the instruction even on
v5/6.

This patch only generates UBFX when MOV, AND or BIC can't be used. Based on
the TRM, this appears to be faster on A9 than using UBFX in all cases.

On startup, Pixelflinger JITs three chunks of code. UBFX improves these as
follows:

 00000077:03515104_00000000_00000000
 (Blends a single colour into an RGB565 buffer.)
  Before: 27 inst/pixel, After: 24 inst/pixel, Improvement: 12.5%
 00000077:03545404_00000A01_00000000
 (Blends RGBA8888 texture into an RGB565 buffer using alpha.)
  Before: 30 inst/pixel, After: 27 inst/pixel, Improvement: 11.1%
 00000077:03545404_00000A04_00000000
 (Blends RGB565 texture into an RGB565 buffer using alpha.)
  Before: 29 inst/pixel, After: 27 inst/pixel, Improvement: 7.4%
2010-05-28 17:04:36 +01:00
Brian Carlstrom 0e67a03748 Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master 2010-05-27 22:38:57 -07:00
Andy McFadden 8dfa47da8c Atomic/SMP update, part 2.
Added new atomic functions, renamed some old ones.  Some #defines have
been added for backward compatibility.

Merged the pre- and post-ARMv6 implementations into a single file.

Renamed the semi-private __android_membar_full_smp to USE_SCREAMING_CAPS
since that's more appropriate for a macro.

Added lots of comments.

Note Mac OS X primitives have not been tested.

Change-Id: If827260750aeb61ad5c2b760e30658e29dbb26f2
2010-05-27 15:29:38 -07:00
Mike Lockwood 67d5358e2a adb: remove obsolete shell history support.
Change-Id: I85a7cda176ca3bb7cb9f96e18556d53daaac3023
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-25 13:40:15 -04:00
Mike Lockwood 3de417e16a Merge "adb: Adjust usb_linux.c for changes in libusbhost API." 2010-05-25 05:22:36 -07:00
Mike Lockwood cc6ff1071d Merge "libusbhost: Remove global data to allow multiple instances in the same process." 2010-05-25 05:22:26 -07:00
Mike Lockwood 36b99e4cac adb: Adjust usb_linux.c for changes in libusbhost API.
Change-Id: Ie63e4455460100b579fa87120e63c913dc5f16ad
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-25 08:20:42 -04:00
Mike Lockwood 6ac3aa1574 libusbhost: Remove global data to allow multiple instances in the same process.
Change-Id: I977145f44131ec8b588dd274e0afbc563f3aa4c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-25 08:20:32 -04:00
Jack Palevich 7fe202f160 Use linenoise to add simple editing and history to the Android shell.
The linenoise library is from http://github.com/antirez/linenoise

This patch also disables command-line editing and history from adb. The
adb implementation was shadowing the Android shell's implementation.

The adb implementation was also shadowing the editing and history
implementation in alternative shells such as BusyBox's ash.

Change-Id: I7ebd4cb391d0ce966c0ce0e707d80ecd659f9079
2010-05-25 14:49:57 +08:00
Jack Palevich c6793c5290 Include the linenoise.h header in a cleaner way.
(This was a comment to an earlier change that I
overlooked.)
2010-05-25 08:36:36 +08:00
Jack Palevich 0cf08ed5ad Move linenoise to its own static library.
This allows us to publish its license, as required
by the terms of its license.
2010-05-25 08:20:12 +08:00
Jack Palevich e7de18e445 Add simple readline-like input editing to the android shell.
Adapted from http://github.com/antirez/linenoise
2010-05-25 07:53:13 +08:00
Meng Hu ae7b91b680 debuggerd: Show function names in tombstone backtraces
This change enables debuggerd to provide backtraces with function
names in tombstone files and log messages.  It does this by reading
the image file that the address is found in, and parsing the dynamic
symbol table to try to extract the symbol corresponding to the given
address.

This works best when "-Wl,-export-dynamic" is added to the LDFLAGS
of each library and executable, because this will cause all symbols
to be added to the dynamic symbol table.  If this flag is not present,
it will still work, but it will only be able to identify functions
which are part of the external API of the library/executable.

Change-Id: I618baaff9ed9143b7d1a1f302224e9f21d2b0626
2010-05-24 17:20:10 -05:00
Stefan Hilzinger d9d1ca4780 Let "adb connect" connect to emulators too
- adb can now connect to an emulator configured with an arbitrary
  pair of <console port, adb port>. These two ports do not have to be
  adjacent.
  This can be done from the commandline at any time using
  adb connect emu:<console_port>,<adb_port>
- Emulators running on ports outside the normal range
  (5554/5555-5584/5585) register themselves on startup if they follow
  the convention "console port+1==abd port".
- Emulators outside the normal port range will not be auto-detected on
  adb startup as these ports are not probed.
- The index into local_transports[] array in transport_local.c does no
  longer indicate the port number of the local transport. Use the altered
  atransport struct to get the port number.
- I have chosen not to document the adb connect emu:console_port,adb_port
  syntax on adb's help screen as this might be confusing to most readers
  and useful to very few.
- I don't expect this to introduce any (backwards) compatibility issues.

Change-Id: Iad3eccb2dcdde174b24ef0644d705ecfbff6e59d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-24 11:27:16 -04:00
Colin Cross 5762ec2905 Fix adb remount on non-MTD devices
Change-Id: If8e07502bcface53aaac81022f6183c6a147edc8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-24 11:27:16 -04:00