Skip to content

Commit 57a2393

Browse files
authored
osx lacks process IO counters (#1561)
* osx lacks process IO counters * use latest osx env on travis - maybe py3.7 works now .. * try install snappy on osx via brew
1 parent 92b19c0 commit 57a2393

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

.travis.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ addons:
1919
# needed for vmprof
2020
- libunwind-dev
2121

22+
homebrew:
23+
packages:
24+
- snappy
25+
2226
before_install:
2327
- export PATH=$PATH:$HOME/.local/bin
2428

@@ -73,7 +77,8 @@ matrix:
7377

7478
# osx/cli
7579
- os: osx
76-
language: generic
80+
osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3
81+
language: shell # 'language: python' is an error on Travis CI macOS
7782
env: TOX_ENV=py37-cli
7883

7984
# linux/examples
@@ -85,7 +90,8 @@ matrix:
8590

8691
# osx/examples
8792
- os: osx
88-
language: generic
93+
osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3
94+
language: shell # 'language: python' is an error on Travis CI macOS
8995
env: TOX_ENV=py37-examples
9096

9197
# linux/trial/python3
@@ -111,15 +117,18 @@ matrix:
111117
# osx/trial/python3
112118
# https://docs.travis-ci.com/user/multi-os/#Python-example-(unsupported-languages)
113119
- os: osx
114-
language: generic
120+
osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3
121+
language: shell # 'language: python' is an error on Travis CI macOS
115122
env: TOX_ENV=py37-unpinned-trial
116123

117124
- os: osx
118-
language: generic
125+
osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3
126+
language: shell # 'language: python' is an error on Travis CI macOS
119127
env: TOX_ENV=py37-pinned-trial
120128

121129
- os: osx
122-
language: generic
130+
osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3
131+
language: shell # 'language: python' is an error on Travis CI macOS
123132
env: TOX_ENV=py37-abtrunk-trial
124133

125134
# https://docs.travis-ci.com/user/build-stages/matrix-expansion/

crossbar/common/monitor.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#
2929
#####################################################################################
3030

31+
import sys
3132
import datetime
3233
import psutil
3334

@@ -152,11 +153,13 @@ def __init__(self, worker_type, config):
152153
self._p = psutil.Process()
153154
self._worker_type = worker_type
154155

155-
try:
156-
self._p.io_counters()
157-
self._has_io_counters = True
158-
except psutil.AccessDenied:
159-
self._has_io_counters = False
156+
self._has_io_counters = False
157+
if not sys.platform.startswith('darwin'):
158+
try:
159+
self._p.io_counters()
160+
self._has_io_counters = True
161+
except psutil.AccessDenied:
162+
pass
160163

161164
@inlineCallbacks
162165
def poll(self, verbose=False):

0 commit comments

Comments
 (0)