diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2021-01-08 19:37:54 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2021-01-08 19:37:54 +0100 |
| commit | 9bcbcbe173f49750954f557caa6b194596120b28 (patch) | |
| tree | c3c26dfc3e58e68ab63f448ca9b3ef2388a69e46 | |
| parent | 5bf1f8ef336045da222255062dc344e7aa456eb9 (diff) | |
| download | psutil-9bcbcbe173f49750954f557caa6b194596120b28.tar.gz | |
better debug msg
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
| -rw-r--r-- | psutil/_psutil_osx.c | 1 | ||||
| -rw-r--r-- | psutil/_psutil_posix.c | 2 | ||||
| -rw-r--r-- | psutil/arch/osx/process_info.c | 9 |
3 files changed, 6 insertions, 6 deletions
diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c index 121b4f56..b90ae496 100644 --- a/psutil/_psutil_osx.c +++ b/psutil/_psutil_osx.c @@ -136,7 +136,6 @@ psutil_proc_list_fds(pid_t pid, int *num_fds) { } } - psutil_debug("list_fds: allocate buf size %i", fds_size); if (fds_pointer != NULL) { free(fds_pointer); } diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c index 305cec76..7c0d548c 100644 --- a/psutil/_psutil_posix.c +++ b/psutil/_psutil_posix.c @@ -147,7 +147,7 @@ psutil_pid_exists(pid_t pid) { */ void psutil_raise_for_pid(long pid, char *syscall) { - if (errno != 0) // unlikely + if (errno != 0) PyErr_SetFromOSErrnoWithSyscall(syscall); else if (psutil_pid_exists(pid) == 0) NoSuchProcess(syscall); diff --git a/psutil/arch/osx/process_info.c b/psutil/arch/osx/process_info.c index 0ccd3678..eb75147d 100644 --- a/psutil/arch/osx/process_info.c +++ b/psutil/arch/osx/process_info.c @@ -361,7 +361,7 @@ psutil_get_kinfo_proc(pid_t pid, struct kinfo_proc *kp) { // sysctl succeeds but len is zero, happens when process has gone away if (len == 0) { - NoSuchProcess("sysctl (len == 0)"); + NoSuchProcess("sysctl(kinfo_proc), len == 0"); return -1; } return 0; @@ -370,8 +370,8 @@ psutil_get_kinfo_proc(pid_t pid, struct kinfo_proc *kp) { /* * A wrapper around proc_pidinfo(). - * https://opensource.apple.com/source/xnu/xnu-2050.7.9/bsd/kern/proc_info.c. - * Returns 0 on failure (and Python exception gets already set). + * https://opensource.apple.com/source/xnu/xnu-2050.7.9/bsd/kern/proc_info.c + * Returns 0 on failure. */ int psutil_proc_pidinfo(pid_t pid, int flavor, uint64_t arg, void *pti, int size) { @@ -384,7 +384,8 @@ psutil_proc_pidinfo(pid_t pid, int flavor, uint64_t arg, void *pti, int size) { return 0; } if ((unsigned long)ret < sizeof(pti)) { - psutil_raise_for_pid(pid, "proc_pidinfo() size mismatch"); + psutil_raise_for_pid( + pid, "proc_pidinfo() return size < sizeof(struct_pointer)"); return 0; } return ret; |