From 7f062361ec6b545ac11bff1ef405c42dcffe36f0 Mon Sep 17 00:00:00 2001 From: Jeff Tang Date: Mon, 13 Apr 2015 16:18:38 -0400 Subject: Implement inet_ntop to support Windows XP --- psutil/_psutil_windows.c | 1 + 1 file changed, 1 insertion(+) (limited to 'psutil/_psutil_windows.c') diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c index 670be24c..f789e03d 100644 --- a/psutil/_psutil_windows.c +++ b/psutil/_psutil_windows.c @@ -31,6 +31,7 @@ #include "arch/windows/process_info.h" #include "arch/windows/process_handles.h" #include "arch/windows/ntextapi.h" +#include "arch/windows/inet_ntop.h" #ifdef __MINGW32__ #include "arch/windows/glpi.h" -- cgit v1.2.1 From e703a4aa3f82f1c963166cbeb371b537256c27ec Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 13 Jun 2015 08:07:08 -0700 Subject: (windows) remove inet_ntop --- psutil/_psutil_windows.c | 1 - 1 file changed, 1 deletion(-) (limited to 'psutil/_psutil_windows.c') diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c index f789e03d..670be24c 100644 --- a/psutil/_psutil_windows.c +++ b/psutil/_psutil_windows.c @@ -31,7 +31,6 @@ #include "arch/windows/process_info.h" #include "arch/windows/process_handles.h" #include "arch/windows/ntextapi.h" -#include "arch/windows/inet_ntop.h" #ifdef __MINGW32__ #include "arch/windows/glpi.h" -- cgit v1.2.1 From 8a8a8fd5e0a8901bde0fedf331df8587bda59ae0 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Wed, 17 Jun 2015 05:31:46 -0700 Subject: windows: add some C comments --- psutil/_psutil_windows.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'psutil/_psutil_windows.c') diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c index 670be24c..7e6792db 100644 --- a/psutil/_psutil_windows.c +++ b/psutil/_psutil_windows.c @@ -2691,6 +2691,19 @@ psutil_proc_num_handles(PyObject *self, PyObject *args) } +/* + * Get various process information by using NtQuerySystemInformation. + * We use this as a fallback when faster functions fail with access + * denied. This is slower because it iterates over all processes. + * Returned tuple includes the following process info: + * + * - num_threads + * - ctx_switches + * - num_handles (fallback) + * - user/kernel times (fallback) + * - create time (fallback) + * - io counters (fallback) + */ static PyObject * psutil_proc_info(PyObject *self, PyObject *args) { @@ -3395,4 +3408,4 @@ void init_psutil_windows(void) #if PY_MAJOR_VERSION >= 3 return module; #endif -} \ No newline at end of file +} -- cgit v1.2.1 From 73f54f47a7d4eac329c27af71c7fc5ad432d2e84 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Thu, 9 Jul 2015 02:23:52 -0700 Subject: fix #636: (Windows): Process.memory_info() raises AccessDenied --- psutil/_psutil_windows.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'psutil/_psutil_windows.c') diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c index 7e6792db..a45124e7 100644 --- a/psutil/_psutil_windows.c +++ b/psutil/_psutil_windows.c @@ -3201,7 +3201,7 @@ PsutilMethods[] = "seconds since the epoch"}, {"proc_memory_info", psutil_proc_memory_info, METH_VARARGS, "Return a tuple of process memory information"}, - {"proc_memory_info_2", psutil_proc_memory_info, METH_VARARGS, + {"proc_memory_info_2", psutil_proc_memory_info_2, METH_VARARGS, "Alternate implementation"}, {"proc_cwd", psutil_proc_cwd, METH_VARARGS, "Return process current working directory"}, -- cgit v1.2.1