Skip to content

Commit

Permalink
Merge remote-tracking branch 'giampaolo/master'
Browse files Browse the repository at this point in the history
* giampaolo/master: (148 commits)
  update doc
  add DEVNOTES.rst
  Add import-time tests for psutil
  one import per line
  use with lock:
  set global cpu vars to None if they can't be determined at import time
  add more tests
  giampaolo#717: ignore everything after the first occurrence of '\x00' instead of replacing '\x00' for the whole string
  fix giampaolo#717: [Linux] Process.open_files fails if deleted files still visible.
  giampaolo#715: don't crash at import time if cpu_times() fail for some reason.
  safety measure for ZombieProcess exc
  giampaolo#718: process_iter() thread safety
  giampaolo#708: use buffering for open() only on Python 2; on Python 3 this does not have any effect so it's better to let python decide what to do
  little speedup for system connections
  fix giampaolo#708 [Linux]: speedup psutil.net_connections() and psutil.Process.connections()
  linux refactoring: use a wrapper around open() for binary files
  update doc
  raise no memory err if malloc() fails
  giampaolo#714: [OpenBSD] return shared virtual mem
  add test for vmem total on freebsd
  ...
  • Loading branch information
mrjefftang committed Jan 5, 2016
2 parents bf07eeb + 508bf9d commit bebf9e9
Show file tree
Hide file tree
Showing 43 changed files with 3,993 additions and 2,300 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ matrix:
include:
- python: 2.6
- python: 2.7
- python: 3.2
- python: 3.3
- python: 3.4
- language: generic
Expand All @@ -13,9 +12,6 @@ matrix:
- language: generic
os: osx
env: PYVER=py27
- language: generic
os: osx
env: PYVER=py32
- language: generic
os: osx
env: PYVER=py33
Expand Down
13 changes: 13 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ E: jcscoobyrs@gmail.com
D: great help with OSX C development.
I: 125, 150, 174, 206

N: Landry Breuil
W: https://github.com/landryb
D: OpenBSD implementation.
I: 615

N: wj32
E: wj32.64@gmail.com
D: process username() and get_connections() on Windows
Expand Down Expand Up @@ -329,3 +334,11 @@ I: 659
N: wiggin15
W: https://github.com/wiggin15
I: 517, 607, 610

N: dasumin
W: https://github.com/dasumin
I: 541

N: Mike Sarahan
W: https://github.com/msarahan
I: 688
39 changes: 38 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
@@ -1,14 +1,51 @@
Bug tracker at https://github.com/giampaolo/psutil/issues

3.2.2 - XXXX-XX-XX
3.3.1 - XXXX-XX-XX
==================

**Enhancements**

- #708: [Linux] psutil.net_connections() and Process.connections() on Python 2
can be up to 3x faster in case of many connections.
Also psutil.Process.memory_maps() is slightly faster.
- #718: process_iter() is now thread safe.

**Bug fixes**

- #714: [OpenBSD] virtual_memory().cached value was always set to 0.
- #715: don't crash at import time if cpu_times() fail for some reason.
- #717: [Linux] Process.open_files fails if deleted files still visible.


3.3.0 - 2015-11-25
==================

**Enhancements**

- #558: [Linux] exposed psutil.PROCFS_PATH constant to change the default
location of /proc filesystem.
- #615: [OpenBSD] added OpenBSD support. (contributed by Landry Breuil)

**Bug fixes**

- #692: [UNIX] Process.name() is no longer cached as it may change.


3.2.2 - 2015-10-04
==================

**Bug fixes**

- #517: [SunOS] net_io_counters failed to detect network interfaces
correctly on Solaris 10
- #541: [FreeBSD] disk_io_counters r/w times were expressed in seconds instead
of milliseconds. (patch by dasumin)
- #610: [SunOS] fix build and tests on Solaris 10
- #623: [Linux] process or system connections raises ValueError if IPv6 is not
supported by the system.
- #678: [Linux] can't install psutil due to bug in setup.py.
- #688: [Windows] compilation fails with MSVC 2015, Python 3.5. (patch by
Mike Sarahan)


3.2.1 - 2015-09-03
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ include .gitignore
include .travis.yml
include appveyor.yml
include CREDITS
include DEVNOTES.rst
include HISTORY.rst
include INSTALL.rst
include LICENSE
Expand Down
12 changes: 5 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
:target: https://github.com/giampaolo/psutil/
:alt: Github stars

.. image:: https://img.shields.io/scrutinizer/g/giampaolo/psutil.svg
:target: https://scrutinizer-ci.com/g/giampaolo/psutil/
:alt: Code quality (scrutinizer-ci.com)

.. image:: https://img.shields.io/pypi/l/psutil.svg
:target: https://pypi.python.org/pypi/psutil/
:alt: License
Expand Down Expand Up @@ -54,9 +50,9 @@ monitoring**, **profiling and limiting process resources** and **management of
running processes**. It implements many functionalities offered by command line
tools such as: ps, top, lsof, netstat, ifconfig, who, df, kill, free, nice,
ionice, iostat, iotop, uptime, pidof, tty, taskset, pmap. It currently supports
**Linux, Windows, OSX, FreeBSD** and **Sun Solaris**, both **32-bit** and
**64-bit** architectures, with Python versions from **2.6 to 3.5** (users of
Python 2.4 and 2.5 may use `2.1.3 <https://pypi.python.org/pypi?name=psutil&version=2.1.3&:action=files>`__ version).
**Linux, Windows, OSX, FreeBSD, OpenBSD** and **Sun Solaris**, both **32-bit**
and **64-bit** architectures, with Python versions from **2.6 to 3.5** (users
of Python 2.4 and 2.5 may use `2.1.3 <https://pypi.python.org/pypi?name=psutil&version=2.1.3&:action=files>`__ version).
`PyPy <http://pypy.org/>`__ is also known to work.

====================
Expand Down Expand Up @@ -350,6 +346,8 @@ http://groups.google.com/group/psutil/
Timeline
========
- 2015-11-25: `psutil-3.3.0.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.3.0.tar.gz>`_
- 2015-10-04: `psutil-3.2.2.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.2.tar.gz>`_
- 2015-09-03: `psutil-3.2.1.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.1.tar.gz>`_
- 2015-09-02: `psutil-3.2.0.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.2.0.tar.gz>`_
- 2015-07-15: `psutil-3.1.1.tar.gz <https://pypi.python.org/packages/source/p/psutil/psutil-3.1.1.tar.gz>`_
Expand Down
6 changes: 3 additions & 3 deletions TODO
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ https://github.com/giampaolo/psutil/issues
PLATFORMS
=========

* #615 (PR): OpenBSD
* #429 (patch): NetBSD

* #355 (patch): Android

* #429 (patch): NetBSD

* #605 (branch): AIX

* #276: GNU/Hurd
Expand All @@ -35,6 +33,8 @@ HIGHER PRIORITY

* Process.threads(): thread names; patch for OSX available at:
https://code.google.com/p/plcrashreporter/issues/detail?id=65
Sample code:
https://github.com/janmojzis/pstree/blob/master/proc_kvm.c

* Asynchronous psutil.Popen (see http://bugs.python.org/issue1191964)

Expand Down
Loading

0 comments on commit bebf9e9

Please sign in to comment.