Skip to content

Commit

Permalink
Bug 908296 - Upgrade psutil to version 1.0.1; rs=glandium
Browse files Browse the repository at this point in the history
Archive obtained from
https://psutil.googlecode.com/files/psutil-1.0.1.tar.gz and extracted
over existing source code without modifications.
  • Loading branch information
indygreg committed Aug 23, 2013
1 parent d3c91f1 commit 884bea2
Show file tree
Hide file tree
Showing 53 changed files with 3,200 additions and 668 deletions.
34 changes: 26 additions & 8 deletions python/psutil/CREDITS
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Intro
=====

Expand All @@ -11,24 +10,23 @@ name (N), e-mail (E), web-address (W), country (C), description (D), (I) issues
(issue tracker is at http://code.google.com/p/psutil/issues/list).
Really thanks to all of you.


Maintainers
===========
Author
======

N: Giampaolo Rodola'
C: Italy
E: [email protected]
W: http://www.linkedin.com/in/grodola

Contributors
============

N: Jay Loden
C: NJ, USA
E: [email protected]
D: original co-author, initial design/bootstrap and continuing bug fixes
W: http://www.jayloden.com


Contributors
============

N: Jeremy Whitlock
E: [email protected]
I: 125, 150, 174, 206
Expand All @@ -43,6 +41,11 @@ C: Bologna, Italy
E: [email protected]
D: help on Windows development

N: Justin Venus
E: [email protected]
D: Solaris support
I: 18

N: Dave Daeschler
C: USA
E: [email protected]
Expand Down Expand Up @@ -162,3 +165,18 @@ I: 370
N: Jan Beich
E: [email protected]
I: 325

N: floppymaster
E: [email protected]
I: 380

N: Arfrever.FTA
E: [email protected]
I: 369, 404

N: danudey
E: [email protected]
I: 386

N: Adrien Fallou
I: 224
37 changes: 37 additions & 0 deletions python/psutil/HISTORY
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
Bug tracker at http://code.google.com/p/psutil/issues


1.0.1 - 2013-07-12
------------------

BUG FIXES

* #405: network_io_counters(pernic=True) no longer works as intended in 1.0.0.


1.0.0 - 2013-07-10
------------------

NEW FEATURES

* #18: Solaris support (yay!) (thanks Justin Venus)
* #367: Process.get_connections() 'status' strings are now constants.
* #380: test suite exits with non-zero on failure. (patch by floppymaster)
* #391: extensively use unittest2 module in unit tests and provide
workarounds if this is not installed on python < 2.7.

BUG FIXES

* #374: [Windows] negative memory usage reported when processes use a lot of
memory.
* #379: [Linux] Process.get_memory_maps() may raise ValueError.
* #394: [OSX] Mapped memory regions report incorrect file name.
* #404: [Linux] sched_*affinity() are implicitly declared. (patch by Arfrever)

API CHANGES

* Process.get_connections() 'status' field is no longer a string but a constant
object (psutil.CONN_*).
* Process.get_connections() 'local_address' and 'remote_address' fields renamed
to 'laddr' and 'raddr'.
* psutil.network_io_counters() renamed to psutil.net_io_counters().


0.7.1 - 2013-05-03
------------------

Expand Down
1 change: 1 addition & 0 deletions python/psutil/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ include HISTORY
include LICENSE
include MANIFEST.in
include README
include TODO
include setup.py
recursive-include psutil *.py *.c *.h
recursive-include test *.py
Expand Down
48 changes: 29 additions & 19 deletions python/psutil/PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: psutil
Version: 0.7.1
Version: 1.0.1
Summary: A process and system utilities module for Python
Home-page: http://code.google.com/p/psutil/
Author: Giampaolo Rodola
Author-email: g.rodola <at> gmail <dot> com
License: License :: OSI Approved :: BSD License
Download-URL: http://psutil.googlecode.com/files/psutil-0.7.1.tar.gz
Download-URL: http://psutil.googlecode.com/files/psutil-1.0.1.tar.gz
Description: ===========
Quick links
===========
Expand All @@ -25,9 +25,9 @@ Description: ===========
command line tools such as: **ps, top, df, kill, free, lsof, free, netstat,
ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap**.

It currently supports **Linux**, **Windows**, **OSX** and **FreeBSD** both
**32-bit** and **64-bit** with Python versions from **2.4** to **3.3** by using
a single code base.
It currently supports **Linux**, **Windows**, **OSX**, **FreeBSD**,
**Sun Solaris** both **32-bit** and **64-bit** with Python versions from **2.4**
to **3.3** by using a single code base.

==============
Example usages
Expand All @@ -39,7 +39,7 @@ Description: ===========
>>> import psutil
>>> psutil.cpu_times()
cputimes(user=3961.46, nice=169.729, system=2150.659, idle=16900.540,
iowait=629.509, irq=0.0, softirq=19.422)
iowait=629.509, irq=0.0, softirq=19.422, steal=0.0, guest=0, nice=0.0)
>>>
>>> for x in range(3):
... psutil.cpu_percent(interval=1)
Expand All @@ -55,7 +55,15 @@ Description: ===========
[7.0, 8.5]
[1.2, 9.0]
>>>

>>> for x in range(3):
... psutil.cpu_times_percent(interval=1, percpu=False)
...
cpupercent(user=1.5, nice=0.0, system=0.5, idle=96.5, iowait=1.5, irq=0.0,
softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
cpupercent(user=1.0, nice=0.0, system=0.0, idle=99.0, iowait=0.0, irq=0.0,
softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
cpupercent(user=2.0, nice=0.0, system=0.0, idle=98.0, iowait=0.0, irq=0.0,
softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)

Memory
======
Expand Down Expand Up @@ -89,21 +97,22 @@ Description: ===========
Network
=======

>>> psutil.network_io_counters(pernic=True)
>>> psutil.net_io_counters(pernic=True)
{'lo': iostat(bytes_sent=799953745, bytes_recv=799953745,
packets_sent=453698, packets_recv=453698),
'eth0': iostat(bytes_sent=734324837, bytes_recv=4163935363,
packets_sent=3605828, packets_recv=4096685)}
>>>


Users
=====
Other system info
=================

>>> psutil.get_users()
[user(name='giampaolo', terminal='pts/2', host='localhost', started=1340737536.0),
user(name='giampaolo', terminal='pts/3', host='localhost', started=1340737792.0)]
>>>
>>> psutil.get_boot_time()
1365519115.0


Process management
Expand Down Expand Up @@ -172,14 +181,14 @@ Description: ===========
[openfile(path='/home/giampaolo/svn/psutil/somefile', fd=3)]
>>>
>>> p.get_connections()
[connection(fd=115, family=2, type=1, local_address=('10.0.0.1', 48776),
remote_address=('93.186.135.91', 80), status='ESTABLISHED'),
connection(fd=117, family=2, type=1, local_address=('10.0.0.1', 43761),
remote_address=('72.14.234.100', 80), status='CLOSING'),
connection(fd=119, family=2, type=1, local_address=('10.0.0.1', 60759),
remote_address=('72.14.234.104', 80), status='ESTABLISHED'),
connection(fd=123, family=2, type=1, local_address=('10.0.0.1', 51314),
remote_address=('72.14.234.83', 443), status='SYN_SENT')]
[connection(fd=115, family=2, type=1, laddr=('10.0.0.1', 48776),
raddr=('93.186.135.91', 80), status='ESTABLISHED'),
connection(fd=117, family=2, type=1, laddr=('10.0.0.1', 43761),
raddr=('72.14.234.100', 80), status='CLOSING'),
connection(fd=119, family=2, type=1, laddr=('10.0.0.1', 60759),
raddr=('72.14.234.104', 80), status='ESTABLISHED'),
connection(fd=123, family=2, type=1, laddr=('10.0.0.1', 51314),
raddr=('72.14.234.83', 443), status='SYN_SENT')]
>>>
>>> p.get_num_threads()
4
Expand Down Expand Up @@ -226,6 +235,7 @@ Classifier: Operating System :: Microsoft :: Windows :: Windows NT/2000
Classifier: Operating System :: POSIX
Classifier: Operating System :: POSIX :: Linux
Classifier: Operating System :: POSIX :: BSD :: FreeBSD
Classifier: Operating System :: POSIX :: SunOS/Solaris
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: C
Classifier: Programming Language :: Python
Expand Down
43 changes: 26 additions & 17 deletions python/psutil/README
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ a portable way by using Python, implementing many functionalities offered by
command line tools such as: **ps, top, df, kill, free, lsof, free, netstat,
ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap**.

It currently supports **Linux**, **Windows**, **OSX** and **FreeBSD** both
**32-bit** and **64-bit** with Python versions from **2.4** to **3.3** by using
a single code base.
It currently supports **Linux**, **Windows**, **OSX**, **FreeBSD**,
**Sun Solaris** both **32-bit** and **64-bit** with Python versions from **2.4**
to **3.3** by using a single code base.

==============
Example usages
Expand All @@ -30,7 +30,7 @@ CPU
>>> import psutil
>>> psutil.cpu_times()
cputimes(user=3961.46, nice=169.729, system=2150.659, idle=16900.540,
iowait=629.509, irq=0.0, softirq=19.422)
iowait=629.509, irq=0.0, softirq=19.422, steal=0.0, guest=0, nice=0.0)
>>>
>>> for x in range(3):
... psutil.cpu_percent(interval=1)
Expand All @@ -46,7 +46,15 @@ cputimes(user=3961.46, nice=169.729, system=2150.659, idle=16900.540,
[7.0, 8.5]
[1.2, 9.0]
>>>

>>> for x in range(3):
... psutil.cpu_times_percent(interval=1, percpu=False)
...
cpupercent(user=1.5, nice=0.0, system=0.5, idle=96.5, iowait=1.5, irq=0.0,
softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
cpupercent(user=1.0, nice=0.0, system=0.0, idle=99.0, iowait=0.0, irq=0.0,
softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
cpupercent(user=2.0, nice=0.0, system=0.0, idle=98.0, iowait=0.0, irq=0.0,
softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)

Memory
======
Expand Down Expand Up @@ -80,21 +88,22 @@ iostat(read_count=719566, write_count=1082197, read_bytes=18626220032,
Network
=======

>>> psutil.network_io_counters(pernic=True)
>>> psutil.net_io_counters(pernic=True)
{'lo': iostat(bytes_sent=799953745, bytes_recv=799953745,
packets_sent=453698, packets_recv=453698),
'eth0': iostat(bytes_sent=734324837, bytes_recv=4163935363,
packets_sent=3605828, packets_recv=4096685)}
>>>


Users
=====
Other system info
=================

>>> psutil.get_users()
[user(name='giampaolo', terminal='pts/2', host='localhost', started=1340737536.0),
user(name='giampaolo', terminal='pts/3', host='localhost', started=1340737792.0)]
>>>
>>> psutil.get_boot_time()
1365519115.0


Process management
Expand Down Expand Up @@ -163,14 +172,14 @@ io(read_count=478001, write_count=59371, read_bytes=700416, write_bytes=69632)
[openfile(path='/home/giampaolo/svn/psutil/somefile', fd=3)]
>>>
>>> p.get_connections()
[connection(fd=115, family=2, type=1, local_address=('10.0.0.1', 48776),
remote_address=('93.186.135.91', 80), status='ESTABLISHED'),
connection(fd=117, family=2, type=1, local_address=('10.0.0.1', 43761),
remote_address=('72.14.234.100', 80), status='CLOSING'),
connection(fd=119, family=2, type=1, local_address=('10.0.0.1', 60759),
remote_address=('72.14.234.104', 80), status='ESTABLISHED'),
connection(fd=123, family=2, type=1, local_address=('10.0.0.1', 51314),
remote_address=('72.14.234.83', 443), status='SYN_SENT')]
[connection(fd=115, family=2, type=1, laddr=('10.0.0.1', 48776),
raddr=('93.186.135.91', 80), status='ESTABLISHED'),
connection(fd=117, family=2, type=1, laddr=('10.0.0.1', 43761),
raddr=('72.14.234.100', 80), status='CLOSING'),
connection(fd=119, family=2, type=1, laddr=('10.0.0.1', 60759),
raddr=('72.14.234.104', 80), status='ESTABLISHED'),
connection(fd=123, family=2, type=1, laddr=('10.0.0.1', 51314),
raddr=('72.14.234.83', 443), status='SYN_SENT')]
>>>
>>> p.get_num_threads()
4
Expand Down
Loading

0 comments on commit 884bea2

Please sign in to comment.