openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,847 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

1847 Commits

Author SHA1 Message Date
Andy McFadden 2bf937e6bb Use DMB ST for store fence. 
Change-Id: Ic713f30fcec0f2d2eb486c549917575ff0afa82f
 2010-10-01 11:29:48 -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
Carl Shapiro a417657880 am df2f5a07: am d55f0adf: Qualify the source argument of atomic loads as a const pointer. 
Merge commit 'df2f5a07aecac7be4ac2d1100668a0396fd256e7'

* commit 'df2f5a07aecac7be4ac2d1100668a0396fd256e7':
  Qualify the source argument of atomic loads as a const pointer.
 2010-09-28 17:38:03 -07:00
Carl Shapiro df2f5a07ae am d55f0adf: Qualify the source argument of atomic loads as a const pointer. 
Merge commit 'd55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa' into gingerbread-plus-aosp

* commit 'd55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa':
  Qualify the source argument of atomic loads as a const pointer.
 2010-09-28 14:20:54 -07:00
Carl Shapiro d55f0adfb5 Qualify the source argument of atomic loads as a const pointer. 
Also normalizes the opening brace placment in a few locations.

Change-Id: I8f518e933094337d5d3371321326ffc03b3a5f5a
 2010-09-28 14:06:00 -07:00
Xavier Ducrohet 579ca37361 am 1e3f8f27: am f62b23f2: Add new USB vendor IDs. 
Merge commit '1e3f8f2769f9a227fe4d4abfe3d26083e4da91e9'

* commit '1e3f8f2769f9a227fe4d4abfe3d26083e4da91e9':
  Add new USB vendor IDs.
 2010-09-28 13:57:56 -07:00
Xavier Ducrohet 1e3f8f2769 am f62b23f2: Add new USB vendor IDs. 
Merge commit 'f62b23f2c1540221621024c850fdf615dda0c903' into gingerbread-plus-aosp

* commit 'f62b23f2c1540221621024c850fdf615dda0c903':
  Add new USB vendor IDs.
 2010-09-28 10:44:12 -07:00
Xavier Ducrohet f62b23f2c1 Add new USB vendor IDs. 
Change-Id: Ie3b1ee09c67c4c8fdb294cfc99fa28e4ebe8dfae
 2010-09-28 09:54:07 -07:00
Mike Lockwood b07c78aa94 am d1971c4c: resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp 
Merge commit 'd1971c4cac37fccdccd105f78f7252582685ccd9'

* commit 'd1971c4cac37fccdccd105f78f7252582685ccd9':
  Add AID_GPS user ID for GPS daemon
 2010-09-27 11:46:54 -07:00
Mike Lockwood d1971c4cac resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp 
Change-Id: I860b7690c40428839e45e2c2b122661b00d47e0e
 2010-09-27 14:16:44 -04:00
Mike Lockwood c29919c8d7 Add AID_GPS user ID for GPS daemon 
Change-Id: I2f8ffba40e3f5145b37296f19c698e08d768ce59
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-27 08:01:58 -04:00
Mathias Agopian 0715f91223 update adbd to use the new screencap command for taking screenshots. 
Change-Id: I02c49240f9db9258824020f3f5f04463e17a537a
 2010-09-26 18:44:28 -07:00
Brian Carlstrom b32007c54b Merge "Add definitions for store barrier." 2010-09-24 13:59:41 -07:00
Brian Carlstrom 464431e65f Add definitions for store barrier. 
I usually call this a "store/store barrier" for maximum clarity, but
the common way of describing it is "store barrier" or "store fence".

This doesn't use "dmb st" yet since we're waiting on the toolchain
update, but it gets the various macros and inline functions in place
so we can use them in the VM.

Bug 3003477

git cherry-pick 2ba5eec3972b4ce46feb677116534fcd3d136e0a

Change-Id: Ifd2d3588be96aa529d490789436cf48c962021ba
 2010-09-24 10:56:43 -07:00
Paul Eastham f43219e0b1 Partially implement SETATTR for sdcard/FUSE 
Handle truncate cases within SETATTR so that truncate() and ftruncate() call
will work.

Change-Id: I5a9862dcaa6ca7b5e9115cb5d3bfed88787fa7ac
Signed-off-by: Paul Eastham <eastham@google.com>
 2010-09-24 08:13:49 -07:00
Brad Fitzpatrick d7482b2f4c am 33357f54: am 6490257d: Make netd restart when system server hangs on it. 
Merge commit '33357f5477a24cb16bd3dd692fe5ca14755ab033'

* commit '33357f5477a24cb16bd3dd692fe5ca14755ab033':
  Make netd restart when system server hangs on it.
 2010-09-21 17:44:45 -07:00
Brad Fitzpatrick 33357f5477 am 6490257d: Make netd restart when system server hangs on it. 
Merge commit '6490257d116c35d3da927ee7b91179dde64ef713' into gingerbread-plus-aosp

* commit '6490257d116c35d3da927ee7b91179dde64ef713':
  Make netd restart when system server hangs on it.
 2010-09-21 16:27:25 -07:00
Brad Fitzpatrick 6490257d11 Make netd restart when system server hangs on it. 
netd has been seen hanging (cause suspected but unconfirmed)
which then brings down the system server which blocks forever
on its main thread trying to connect to netd with its hung
event loop.

This then results in an infinite watchdog runtime restart loop
because the situation never improves:  netd is still borked.

Instead, we should kill netd and give it another chance when
the system server dies.

Bug: 3018996
Bug: 3017876
Change-Id: Ibf9ecf0ffcb78e48c38e5167f21cbeefe0e2a47f
 2010-09-21 15:49:06 -07:00
Brian Swetland d06df51bcd resolved conflicts for merge of 3b5214a6 to master 
Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
 2010-09-19 04:35:19 -07:00
Brian Swetland 3b5214a67f am 02863b95: add /vendor support 
Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp

* commit '02863b957cfbfc302d3136ed78c0cba86accacd8':
  add /vendor support
 2010-09-19 03:49:43 -07:00
Brian Swetland 02863b957c add /vendor support 
- look in /vendor/firmware/... in addition to /system/etc/firmware/... for firmware loading
- add /vendor/bin to path before /system/bin
- add /vendor/lib to ldpath before /system/lib
- configure appropriate permissions for /system/vendor/bin
- symlink /vendor -> /system/vendor

Change-Id: I0c06ca1e38a44f0c7024cee6cea8907aa93a4532
 2010-09-19 03:36:39 -07:00
Mathias Agopian 1f7bc6d1a9 am 06b21887: am 2da0032c: add graphics events to the eventlog definitions 
Merge commit '06b21887e8f5719e9b421371b4a47ef371c972b5'

* commit '06b21887e8f5719e9b421371b4a47ef371c972b5':
  add graphics events to the eventlog definitions
 2010-09-15 12:19:33 -07:00
Kenny Root 3000e4f9c4 am 1db75e7b: am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread 
Merge commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860'

* commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860':
  Fetch peer credentials for local sockets
 2010-09-15 12:17:44 -07:00
Brad Fitzpatrick 9a5c61a277 am 2c42e440: am 9915e3fd: Add dvm_lock_sample\'s new fields. 
Merge commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987'

* commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987':
  Add dvm_lock_sample's new fields.
 2010-09-15 12:17:19 -07:00
Brad Fitzpatrick f254ddc761 am 0e6242f7: am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread 
Merge commit '0e6242f7e2c1181d486ae8f86592619738574dd3'

* commit '0e6242f7e2c1181d486ae8f86592619738574dd3':
  Add missing lock in SocketListener.
 2010-09-15 07:09:03 -07:00
Kenny Root 89b01a815e am c3fa6149: am f31d2ed1: Return false on socket read error 
Merge commit 'c3fa6149284058b30e3eea5010c16d3133711afb'

* commit 'c3fa6149284058b30e3eea5010c16d3133711afb':
  Return false on socket read error
 2010-09-15 07:08:42 -07:00
Mathias Agopian 06b21887e8 am 2da0032c: add graphics events to the eventlog definitions 
Merge commit '2da0032c9447d0e259be31872e123559b5442d8f' into gingerbread-plus-aosp

* commit '2da0032c9447d0e259be31872e123559b5442d8f':
  add graphics events to the eventlog definitions
 2010-09-14 15:14:00 -07:00
Mathias Agopian 2da0032c94 add graphics events to the eventlog definitions 
by default this logging is turned off

Change-Id: Ic7e5fe2b377c4760e1673e7d19a69d34cc9333c9
 2010-09-14 15:11:07 -07:00
Kenny Root 1db75e7b9b am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread 
Merge commit '6fd75635d820754295557c300ccee89c643864cc' into gingerbread-plus-aosp

* commit '6fd75635d820754295557c300ccee89c643864cc':
  Fetch peer credentials for local sockets
 2010-09-14 14:39:18 -07:00
Kenny Root 6fd75635d8 Merge "Fetch peer credentials for local sockets" into gingerbread 2010-09-14 14:37:08 -07:00
Kenny Root 30abb7234d Fetch peer credentials for local sockets 
Fetch the PID, UID, and GID of the remote side of a local socket
connection in case any users of this library class want to check it.

Change-Id: Ia3230e6bc68ab6f93160df9f5996d2bf744b872c
 2010-09-14 14:35:10 -07:00
Brad Fitzpatrick 2c42e4404b am 9915e3fd: Add dvm_lock_sample\'s new fields. 
Merge commit '9915e3fd389519764436ad029ef2f172eb1cc0ca' into gingerbread-plus-aosp

* commit '9915e3fd389519764436ad029ef2f172eb1cc0ca':
  Add dvm_lock_sample's new fields.
 2010-09-14 13:50:41 -07:00
Brad Fitzpatrick 9915e3fd38 Add dvm_lock_sample's new fields. 
Change-Id: I2ec442834c38d3716695ab90bf0db220bd8dae27
 2010-09-14 13:12:11 -07:00
Brad Fitzpatrick 0e6242f7e2 am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread 
Merge commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6' into gingerbread-plus-aosp

* commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6':
  Add missing lock in SocketListener.
 2010-09-14 10:46:35 -07:00
Brad Fitzpatrick 40c2b7cbed Merge "Add missing lock in SocketListener." into gingerbread 2010-09-14 10:44:15 -07:00
Kenny Root c3fa614928 am f31d2ed1: Return false on socket read error 
Merge commit 'f31d2ed1fd3a39a92bccc12eb66728594290ef3b' into gingerbread-plus-aosp

* commit 'f31d2ed1fd3a39a92bccc12eb66728594290ef3b':
  Return false on socket read error
 2010-09-14 10:24:26 -07:00
Brad Fitzpatrick 86d01dec4b Add missing lock in SocketListener. 
Change-Id: I3d97a06381fce67ef13b1ccdeaa4e8e2830ab2aa
 2010-09-14 10:22:14 -07:00
Kenny Root f31d2ed1fd Return false on socket read error 
FrameworkListener was returning the errno from a function marked as
returning bool which caused an implicit conversion to true since we were
in an error block where errno was set to something non-zero.

This caused the clients that had errors to stick around forever and not
get removed from the set of file descriptors that SocketListener was
listening to.

Change-Id: Ia27a4cac47459f3a3c2bb6a7f66803a3165c894a
 2010-09-14 09:55:22 -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
Jean-Baptiste Queru 0dd00036d2 am 1d10577e: manual merge from readonly-korg-master 
Merge commit '1d10577e9b474a5099d0f5a09468c55a0324d876'

* commit '1d10577e9b474a5099d0f5a09468c55a0324d876':
  Don't alias 'stop' to 'kill -STOP'
 2010-09-10 11:30:36 -07:00
Jean-Baptiste Queru a5220b24d1 am 26ce6e0e: manual merge from readonly-korg-master 
Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1'

* commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1':
  - Add drm and drmio service
 2010-09-10 11:30:33 -07:00
Jean-Baptiste Queru 1d10577e9b manual merge from readonly-korg-master 
Change-Id: Id4a09fa11fee4262d9b945369b595644cca6d330
 2010-09-10 10:43:44 -07:00
Jean-Baptiste Queru 26ce6e0e16 manual merge from readonly-korg-master 
Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
 2010-09-10 10:43:36 -07:00
Jeff Hamilton f41986bbc7 Don't alias 'stop' to 'kill -STOP' 
Android has already has a stop command used
to stop the main runtime and the alias
interferes with testing tools that expect
stop to kill the runtime.

Change-Id: I02b7efb9203dc39e97f63eb702a54ff79935b316
 2010-09-10 11:16:14 -05:00
Jean-Baptiste Queru bb130ba799 Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM related data" 2010-09-09 14:13:01 -07:00
Brian Swetland e6d8a5f1df am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread 
Merge commit '8df3a4a554184afba71887995c5f0983ce81196f'

* commit '8df3a4a554184afba71887995c5f0983ce81196f':
  remount / as read-only only on post-fs to allow per-target config of /
 2010-09-08 15:51:10 -07:00