Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: third_party/psutil/psutil/_common.py

Issue 8774018: Add psutil build step to fix pyauto media issues. Upgrade psutil to 0.4.0. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Replace 'python' w/ sys.executable. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/psutil/psutil/_common.py
diff --git a/third_party/psutil/psutil/_common.py b/third_party/psutil/psutil/_common.py
index e08011d0a8bcc479ec4e636a6c949e0487739106..b78c7273b1fca4e8c15fc209da5ff7beec9932d0 100644
--- a/third_party/psutil/psutil/_common.py
+++ b/third_party/psutil/psutil/_common.py
@@ -1,6 +1,6 @@
#/usr/bin/env python
#
-#$Id: _common.py 1142 2011-10-05 18:45:49Z g.rodola $
+#$Id: _common.py 1157 2011-10-14 18:36:03Z g.rodola $
#
# Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
@@ -10,6 +10,8 @@
from psutil._compat import namedtuple
+# --- functions
+
def usage_percent(used, total, _round=None):
"""Calculate percentage usage of 'used' against 'total'."""
try:
@@ -35,6 +37,8 @@ class constant(int):
def __str__(self):
return self._name
+# --- constants
+
STATUS_RUNNING = constant(0, "running")
STATUS_SLEEPING = constant(1, "sleeping")
STATUS_DISK_SLEEP = constant(2, "disk sleep")
@@ -48,6 +52,32 @@ STATUS_IDLE = constant(9, "idle") # BSD
STATUS_LOCKED = constant(10, "locked") # BSD
STATUS_WAITING = constant(11, "waiting") # BSD
+# --- Process.get_connections() 'kind' parameter mapping
+
+import socket
+from socket import AF_INET, SOCK_STREAM, SOCK_DGRAM
+AF_INET6 = getattr(socket, 'AF_INET6', None)
+
+conn_tmap = {
+ "all" : ([AF_INET, AF_INET6], [SOCK_STREAM, SOCK_DGRAM]),
+ "tcp" : ([AF_INET, AF_INET6], [SOCK_STREAM]),
+ "tcp4" : ([AF_INET], [SOCK_STREAM]),
+ "udp" : ([AF_INET, AF_INET6], [SOCK_DGRAM]),
+ "udp4" : ([AF_INET], [SOCK_DGRAM]),
+ "inet" : ([AF_INET, AF_INET6], [SOCK_STREAM, SOCK_DGRAM]),
+ "inet4": ([AF_INET], [SOCK_STREAM, SOCK_DGRAM]),
+ "inet6": ([AF_INET6], [SOCK_STREAM, SOCK_DGRAM]),
+}
+
+if AF_INET6 is not None:
+ conn_tmap.update({
+ "tcp6" : ([AF_INET6], [SOCK_STREAM]),
+ "udp6" : ([AF_INET6], [SOCK_DGRAM]),
+ })
+
+del AF_INET, AF_INET6, SOCK_STREAM, SOCK_DGRAM, socket
+
+# --- namedtuples
# system
ntuple_sys_cputimes = namedtuple('cputimes', 'user nice system idle iowait irq softirq')

Powered by Google App Engine
This is Rietveld 408576698