Commit graph

101 commits

Author SHA1 Message Date
Colin Cross
2ad280f07a Accept address ranges in r
Change-Id: Ifece1b37d018216462844cc89e0f2f6a2b7d287d
2011-01-19 17:23:40 -08:00
Colin Cross
9d6d030f83 uptime: Use clock_gettime to get monotonic time
The first field in /proc/uptime is bootbased time, not monotonic
time.  If the kernel tracks bootbased time correctly, it counts
elapsed run time as well as sleep time, which is the same as the
elapsed time in the android alarm driver, and sleep time is
always returned as 0.

Use clock_gettime(CLOCK_MONOTONIC) instead, which will return
elapsed run time not counting sleep time on all platforms.

Change-Id: I28a22e8c93d78f62666ee8c877c7c6718a2b640a
2011-01-05 15:22:09 -08:00
Mike Lockwood
123538954b Change libusbhost from static to shared library
Change-Id: I0c16cc4536c4ab700c33433c8a6323ade7cfc95d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 08:33:24 -05:00
Erik Gilling
bec29d4b48 toolbox: add verbose option for lsusb
Change-Id: If9c51d96af7d69395917af55bb337352576f9422
2010-12-09 17:14:27 -08:00
Erik Gilling
fd1e855323 toolbox: add lsusb command
Change-Id: I166d2859633ba4e15f170938262dcf6505b78dd3
2010-12-09 15:27:52 -08:00
Olivier Bailly
b93e5812fa Add missing headers for compilation on x86 targets
Change-Id: I5f4dc797b353a0f01fa00d38375ec303bf863254
2010-11-17 11:47:23 -08:00
Brad Fitzpatrick
e7fe5bf3ac Add ls -n to toolbox.
Change-Id: I641f9504554d14fb1289ac470e6e61c5bc12e9c7
2010-10-25 13:30:41 -07:00
Brian Carlstrom
e3ba1801f0 am f1fd5eb8: am 2f7b72f9: netstat should include /proc/net/tcp6 and /proc/net/udp6 data
Merge commit 'f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e'

* commit 'f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e':
  netstat should include /proc/net/tcp6 and /proc/net/udp6 data
2010-09-29 12:58:11 -07:00
Brian Carlstrom
f1fd5eb8cc am 2f7b72f9: netstat should include /proc/net/tcp6 and /proc/net/udp6 data
Merge commit '2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c' into gingerbread-plus-aosp

* commit '2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c':
  netstat should include /proc/net/tcp6 and /proc/net/udp6 data
2010-09-28 23:37:09 -07:00
Brian Carlstrom
2f7b72f9e8 netstat should include /proc/net/tcp6 and /proc/net/udp6 data
Update netstat.c to process /proc/net/tcp6 and /proc/net/udp6.
Example input and output and output follows.

cat /proc/net/tcp:
  sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode
   0: 0100007F:13AD 00000000:0000 0A 00000000:00000000 00:00000000 00000000     0        0 669 1 c74dbb40 300 0 0 2 -1
   1: 0100007F:A432 0100007F:2253 01 00000000:00000000 00:00000000 00000000     0        0 15257 1 c74da040 22 4 16 2 -1

cat /proc/net/udp:
  sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode ref pointer drops

cat /proc/net/tcp6:
  sl  local_address                         remote_address                        st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode
   0: 00000000000000000000000000000000:8A88 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000     0        0 15461 1 c730aaa0 300 0 0 2 -1
   1: 00000000000000000000000000000000:2253 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000     0        0 15255 1 c7393060 300 0 0 2 -1
   2: 00000000000000000000000000000000:C91B 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000     0        0 15261 1 c6591080 300 0 0 2 -1
   3: 0000000000000000FFFF00000100007F:C91B 0000000000000000FFFF00000100007F:9238 01 00000000:00000000 00:00000000 00000000     0        0 15263 1 c7394aa0 22 4 29 4 -1
   4: 0000000000000000FFFF00000100007F:C0E9 0000000000000000FFFF00000100007F:D3A4 01 00000000:00000000 00:00000000 00000000     0        0 15274 1 c7393aa0 22 4 26 4 -1
   5: 0000000000000000FFFF00000100007F:C41A 0000000000000000FFFF00000100007F:B031 01 00000000:00000000 00:00000000 00000000     0        0 15269 1 c7126ac0 22 4 29 4 -1
   6: 0000000000000000FFFF00000100007F:2253 0000000000000000FFFF00000100007F:A432 01 00000000:00000000 00:00000000 00000000     0        0 15256 1 c65e9040 21 0 0 5 -1
   7: 0000000000000000FFFF00000100007F:9238 0000000000000000FFFF00000100007F:C91B 01 00000000:00000000 00:00000000 00000000     0        0 15262 1 c7394580 22 4 16 4 -1
   8: 0000000000000000FFFF00000100007F:B031 0000000000000000FFFF00000100007F:C41A 01 00000000:00000000 00:00000000 00000000     0        0 15268 1 c71585a0 22 4 16 4 -1
   9: 0000000000000000FFFF00000100007F:8A88 0000000000000000FFFF00000100007F:8A31 01 00000000:00000000 00:00000000 00000000     0        0 15503 1 c71265a0 22 4 30 2 -1
  10: 0000000000000000FFFF00000100007F:D3A4 0000000000000000FFFF00000100007F:C0E9 01 00000000:00000000 00:00000000 00000000     0        0 15273 1 c7126080 22 4 12 4 -1
  11: 0000000000000000FFFF00000100007F:8A31 0000000000000000FFFF00000100007F:8A88 01 00000000:00000000 00:00000000 00000000     0        0 15502 1 c730a060 22 0 0 3 -1

cat /proc/net/udp6:
  sl  local_address                         remote_address                        st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode ref pointer drops
   86: 00000000000000000000000000000000:A256 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000  1000        0 14302 2 c6d13820 0
  102: 00000000000000000000000000000000:A466 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000  1000        0 14301 2 c6d13ac0 0
  125: 00000000000000000000000000000000:8B7D 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000  1000        0 14295 2 c6d13d60 0

netstat:
Proto Recv-Q Send-Q Local Address          Foreign Address        State
tcp        0      0 127.0.0.1:5037         0.0.0.0:*              LISTEN
tcp        0      0 127.0.0.1:42034        127.0.0.1:8787         ESTABLISHED
tcp6       0      0 :::35464               :::*                   LISTEN
tcp6       0      0 :::8787                :::*                   LISTEN
tcp6       0      0 :::51483               :::*                   LISTEN
tcp6       0      0 ::ffff:127.0.0.1:51483 ::ffff:127.0.0.1:37432 ESTABLISHED
tcp6       0      0 ::ffff:127.0.0.1:49385 ::ffff:127.0.0.1:54180 ESTABLISHED
tcp6       0      0 ::ffff:127.0.0.1:50202 ::ffff:127.0.0.1:45105 ESTABLISHED
tcp6       0      0 ::ffff:127.0.0.1:8787  ::ffff:127.0.0.1:42034 ESTABLISHED
tcp6       0      0 ::ffff:127.0.0.1:37432 ::ffff:127.0.0.1:51483 ESTABLISHED
tcp6       0      0 ::ffff:127.0.0.1:45105 ::ffff:127.0.0.1:50202 ESTABLISHED
tcp6       0      0 ::ffff:127.0.0.1:35464 ::ffff:127.0.0.1:35377 ESTABLISHED
tcp6       0      0 ::ffff:127.0.0.1:54180 ::ffff:127.0.0.1:49385 ESTABLISHED
tcp6       0      0 ::ffff:127.0.0.1:35377 ::ffff:127.0.0.1:35464 ESTABLISHED
udp6       0      0 :::41558               :::*                   CLOSE
udp6       0      0 :::42086               :::*                   CLOSE
udp6       0      0 :::35709               :::*                   CLOSE

Bug: 2511871

Change-Id: I25e0470ba65e8a88e57506ae26232a7c43a9c16b
2010-09-28 22:22:02 -07:00
Brian Swetland
14200b4c3b am 5833769d: am 09dd3e57: make df more readable
Merge commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1'

* commit '5833769d9aa41dfb28a74c665fda0fca9c321fc1':
  make df more readable
2010-09-11 18:42:53 -07:00
Brian Swetland
5833769d9a am 09dd3e57: make df more readable
Merge commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46' into gingerbread-plus-aosp

* commit '09dd3e57b920c8f65cb486313a4c0f35b8cb9f46':
  make df more readable
2010-09-11 18:34:21 -07:00
Brian Swetland
09dd3e57b9 make df more readable
Filesystem             Size   Used   Free   Blksize
/dev                   164M    32K   164M   4096
/system                442M   117M   325M   4096
/cache                 492M     8M   483M   4096
/data                  984M    59M   925M   4096
/mnt/sdcard             12G    27M    12G   32768

Change-Id: I9a84b7b84ae528ee5cf0b1e92a8bee032b87703b
2010-09-11 18:19:35 -07:00
Dmitry Shmidt
4358544a3f toolbox: top: Add processor field
Change-Id: I9f8e45a963a0773f27ddcd1d249aecac1ab9152e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-08-30 16:39:14 -07:00
Dmitry Shmidt
8b37c91b93 ps: Add -c flag to show CPU number last executed on
Change-Id: I9a8faef0824c390ef980ce6c33e9c79102884879
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-08-18 17:26:26 -07:00
Jean-Baptiste Queru
30be93c6e2 am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53'

* commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53':
  Userland support for VM interconnection
2010-07-29 15:55:34 -07:00
Jean-Baptiste Queru
60c8f863ca resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
2010-07-29 15:53:16 -07:00
Jean-Baptiste Queru
0fcbdb4147 Merge "Userland support for VM interconnection" 2010-07-29 15:04:57 -07:00
Kenny Root
7a58bcfb1e am 331eb52d: am 5a0adf95: Merge "Add basic lsof command" into gingerbread
Merge commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657'

* commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657':
  Add basic lsof command
2010-07-27 13:02:58 -07:00
Kenny Root
331eb52d61 am 5a0adf95: Merge "Add basic lsof command" into gingerbread
Merge commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4' into gingerbread-plus-aosp

* commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4':
  Add basic lsof command
2010-07-27 13:00:58 -07:00
Kenny Root
5a0adf95b1 Merge "Add basic lsof command" into gingerbread 2010-07-27 12:58:23 -07:00
Kenny Root
2d392f24b8 am 65757da0: am 53308d4c: Correct copyright header for uptime and NOTICE
Merge commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd'

* commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd':
  Correct copyright header for uptime and NOTICE
2010-07-27 11:41:50 -07:00
Kenny Root
65757da0c9 am 53308d4c: Correct copyright header for uptime and NOTICE
Merge commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f' into gingerbread-plus-aosp

* commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f':
  Correct copyright header for uptime and NOTICE
2010-07-27 11:39:19 -07:00
Kenny Root
53308d4cd5 Correct copyright header for uptime and NOTICE
Change-Id: I89f91c21db87955b20b1ef9b4590f7009f106b26
2010-07-27 11:26:06 -07:00
Kenny Root
8b9b105bc7 Add basic lsof command
Basic "list open files" command.

Supports reading all processes for their "exe", "cwd", "root", and "fd"
entries.

Change-Id: I2e2f0911dd65a1993aa1ce9f51222bf264a9d68d
2010-07-27 11:22:20 -07:00
The Android Open Source Project
534bc027a2 am 869cc685: merge from open-source master
Merge commit '869cc685b171c5c0c1efbad5df693cfaebe0af43'

* commit '869cc685b171c5c0c1efbad5df693cfaebe0af43':
  fix insmod reading more than one module parameter
2010-07-16 13:30:54 -07:00
The Android Open Source Project
869cc685b1 merge from open-source master
Change-Id: I9365615f5f94484fb5ab28bb076b25fb4721e2bc
2010-07-16 13:23:40 -07:00
Jean-Baptiste Queru
e3f6a6e1d3 Merge "fix insmod reading more than one module parameter" 2010-07-16 07:26:05 -07:00
Dries Harnie
2a743730c7 Userland support for VM interconnection
Change-Id: I699608f3072b39c8da1a7cc313bd0b736e90f225
2010-07-15 13:19:37 +02:00
The Android Open Source Project
f4f7697f69 am 0bcda269: merge from open-source master
Merge commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60'

* commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60':
  Add -R to chmod
  Add -p support to mkdir
2010-07-14 16:16:20 -07:00
The Android Open Source Project
0bcda26970 merge from open-source master
Change-Id: If9a300a80228f30166ed42853ae13236aaa2eee5
2010-07-14 16:12:40 -07:00
Jean-Baptiste Queru
6cebee2647 Merge "Add -R to chmod" 2010-07-14 15:17:47 -07:00
Jean-Baptiste Queru
34225919ab Merge "Add -p support to mkdir" 2010-07-14 15:15:53 -07:00
Anthony Newnam
365a09e817 Add -R to chmod
Change-Id: I30f976598bd937f656a3ad3395349f09e695cfce
2010-07-14 13:30:11 -05:00
Anthony Newnam
b55de67985 Add -p support to mkdir
Change-Id: Ia0298ccc6b476d6bd6756471c05ef2a345312734
2010-07-14 13:29:42 -05:00
Kenny Root
45f7fde3c9 am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly
Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1'

* commit '0b1ff6be08844c541e36fd735b41990453582ec1':
  Display file sizes larger than 2GB correctly
2010-06-25 14:21:11 -07:00
Kenny Root
0b1ff6be08 am eb42170e: Display file sizes larger than 2GB correctly
Merge commit 'eb42170e6c8b70f11dca9965785aa04a80290c72' into gingerbread-plus-aosp

* commit 'eb42170e6c8b70f11dca9965785aa04a80290c72':
  Display file sizes larger than 2GB correctly
2010-06-25 09:50:08 -07:00
Kenny Root
eb42170e6c Display file sizes larger than 2GB correctly
File size was cast to a signed integer which displayed files over 2GB as
negative sizes on devices. Use a long long for printing instead which
matches the stat struct.

Change-Id: I0ec07f33716bb4c2e5d120633ed435f637238f46
2010-06-25 09:08:05 -07:00
Jean-Baptiste Queru
7570ab61d4 am f72961d0: merge from froyo-plus-aosp 2010-06-09 16:28:31 -07:00
Jean-Baptiste Queru
f72961d068 merge from froyo-plus-aosp
Change-Id: I82ec6dbd7c8c3b37b9505eaef351042f2ee53fb5
2010-06-09 16:26:32 -07:00
The Android Open Source Project
7c84efe083 merge from open-source master
Change-Id: I2f725ca20bf08748a4b3e81a4e98fbe08fcf1a47
2010-06-09 07:16:49 -07:00
David 'Digit' Turner
aa2106b008 toolbox-ls: sort file and directory lists
Sorts file and directory names properly in 'ls'
+ accept group flags (e.g. '-ld' instead of '-l -d')
+ accept flags in any position on the command line (e.g. 'ls foo -l' works)

Change-Id: Idc24a69ae31fe0c13726d39892357ac89a8830db
2010-06-04 10:44:56 -07:00
The Android Open Source Project
a92be64809 am 53a79a84: am 49337b27: merge from open-source master 2010-05-19 11:35:48 -07:00
The Android Open Source Project
53a79a841b am 49337b27: merge from open-source master
Merge commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d' into kraken

* commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d':
  Fix "route add default dev <iface>" behaviour
2010-05-19 11:33:56 -07:00
The Android Open Source Project
49337b27d9 merge from open-source master
Change-Id: I77e33ce567b9682f51785cc574e37dc2cd15028f
2010-05-19 11:28:01 -07:00
Colin Cross
4e7dd3d270 mount: Add support for remounting without specifying device
Change-Id: I48c84fab3ab2a9704ec5b7bf7002b8960fa53c27
2010-05-07 12:09:19 -07:00
Daniel Baeyens
e898faddb3 Fix "route add default dev <iface>" behaviour
Previous behaviour was to set route's network mask as 255.255.255.255
Setting a destination network with netmask /32 blocks the connections
just to the specified host. 0.0.0.0/32 defines the exact IPv4 address
0.0.0.0 and not the whole IPv4 hosts range.
This patch allows traffic to any network, setting a 0.0.0.0/0 route.

Change-Id: I1665f2fac52526337bb2c48e3b09564d9da448e7
2010-04-21 01:51:18 +02:00
Viral Mehta
918fb893e8 fix insmod reading more than one module parameter
it seems wrong to put '/0' after reading one argument
if we are passing more than one module parameters, they are not being propogated
to the kernel properly.

Second module parameters onwards are simply being ignored by kernel
since insmod incorrectly put '/0' after reading first module parameter

Change-Id: I54283eb30a66a83d5c619ffb1fb174ccf5fdcaf7
2010-04-20 09:53:12 +05:30
Jean-Baptiste Queru
1ded19f455 fix build
Change-Id: I93714131dc9d18797009154e6e25dc6e122058c7
2010-04-12 14:15:23 -07:00
The Android Open Source Project
a8415325a8 am 1888de8e: merge from open-source master
Merge commit '1888de8e13f82f7af21bce267254fac124237afe' into kraken

* commit '1888de8e13f82f7af21bce267254fac124237afe':
  toolbox: add "uptime" command
2010-04-12 13:28:12 -07:00