Solaris 10 Fixes #1248
Solaris 10 Fixes #1248
Conversation
| # Note #1: getpriority(3) doesn't work for realtime processes. | ||
| # Psinfo is what ps uses, see: | ||
| # https://github.com/giampaolo/psutil/issues/1194 | ||
| return self._proc_basic_info()[proc_info_map['nice']] |
There was a problem hiding this comment.
Nice that we got rid of that mess.
| @@ -40,7 +40,7 @@ PyUnicode_DecodeFSDefaultAndSize(char *s, Py_ssize_t size) { | |||
| * If msg != "" the exception message will change in accordance. | |||
| */ | |||
| PyObject * | |||
| NoSuchProcess(char *msg) { | |||
| NoSuchProcess(const char *msg) { | |||
There was a problem hiding this comment.
const char * means pointer to const characters. The const modifier signals the caller that NoSuchProcess will not change the passed message. Otherwise, it's not clear and one has to inspect the function body. In case someone accidentally writes to msg using that const pointer it's a compile error. This change also remove compiler warnings since NoSuchProcess is called with string literals that effectively have the type const char *. Thus, this additional type safety protects against accidental writing into a const character array through a non-const pointer which would invoke undefined behavior (e.g. crash if the string literals are placed in a read-only data section).
| @@ -4,6 +4,9 @@ | |||
| * found in the LICENSE file. | |||
| */ | |||
|
|
|||
| #ifndef PSUTIL_PSUTIL_COMMON_H | |||
| #define PSUTIL_PSUTIL_COMMON_H | |||
There was a problem hiding this comment.
This guards the header from being included multiple times into one translation unit (either directly/indirectly). In C, unless the header does something special, you always define such guards (or use the non-standardized once pragma).
| @@ -394,7 +398,10 @@ def _proc_basic_info(self): | |||
|
|
|||
| @memoize_when_activated | |||
| def _proc_cred(self): | |||
| return cext.proc_cred(self.pid, self._procfs_path) | |||
| @wrap_exceptions | |||
There was a problem hiding this comment.
Why not decorate the method instead?
There was a problem hiding this comment.
I tried stacking the @wrap_exceptions on top of @memoize_when_activated of _proc_cred but it didn't work. Something about a missing attribute, IIRC.
psutil/_pssunos.py
Outdated
| except AccessDenied: | ||
| real = self._proc_basic_info()[proc_info_map['gid']] | ||
| effective = self._proc_basic_info()[proc_info_map['egid']] | ||
| saved = None |
There was a problem hiding this comment.
PEP8 (please remove extra spaces)
There was a problem hiding this comment.
Ok, will update (rebase) the commit.
psutil/_pssunos.py
Outdated
| except AccessDenied: | ||
| real = self._proc_basic_info()[proc_info_map['uid']] | ||
| effective = self._proc_basic_info()[proc_info_map['euid']] | ||
| saved = None |
There was a problem hiding this comment.
PEP8 (please remove extra spaces)
There was a problem hiding this comment.
Ok, will fix this.
with respect to strict aliasing rules and fix some warnings For example, under strict aliasing rules of the C standard, casting a char pointer to a struct pointer and accessing the character array through that struct pointer yields undefined behavior.
|
So I've updated the pull request and implemented the requested changes (HISTORY and PEP 8). Btw, looking at the But #1120 doesn't really match the description. Probably a mixup with #694, right? |
Fixes #1193 and #1194, a double free, some undefined behavior and some warnings.