Fix #517 (net_io_counters on Solaris 10) #680
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
September 6, 2015 11:02
instead of testing ksp->ks_module is 'link'
and not system dependent _INT64_TYPE may be defined but kstat may still return the IO counters in 32-bit types. In addition, on SunOS, sizeof(long)==sizeof(long long)==8 so using 'k' and 'K' means the same, and we need to ue 'I' for unsigned 32 bit integers.
| @@ -7,6 +7,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues | |||
|
|
|||
| - #677: [Linux] can't install psutil due to bug in setup.py. | |||
| - #610: [SunOS] fix build and tests on Solaris 10 | |||
| - #517: [SunOS] fix net_io_counters on Solaris 10 | |||
There was a problem hiding this comment.
please be more specific (describe what issue is being addressed)
|
Does this fix #517? |
| @@ -685,25 +688,30 @@ psutil_net_io_counters(PyObject *self, PyObject *args) { | |||
| if (kc == NULL) | |||
| goto error; | |||
|
|
|||
| sock = socket(AF_INET, SOCK_DGRAM, 0); | |||
| if (sock == -1) | |||
| goto error; | |||
There was a problem hiding this comment.
You need to PyErr_SetFromErrno(PyExc_OSError) before goto error;.
|
Yes, it does. |
giampaolo
added a commit
that referenced
this pull request
Sep 6, 2015
Fix #517 (net_io_counters on Solaris 10)
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
During kstat enumeration in net_io_counters on Solaris, we check for class=net and module=link to find kstats for network interfaces. As reported in #517 (example kstat output is submitted there), module is not always 'link' so on Solaris 10 we don't find any interfaces.
net_if_stats does the same enumeration but there is no problem there because it doesn't check the module, and instead sends a ioctl and decides if the current stat name is a network interface name according to the result. I copied the same logic from there to net_io_counters.
Also fixed 2 minor bugs along the way that would only happen in error cases.
The second commit is modelled after parts of the patch in #517 but also fixes the data types passed to Py_BuildValue.