windows: move get_process_info() into process_info.c to make room for Cygwin

3 files changed, 91 insertions, 90 deletions

diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
index ba86040b..a98e1c4d 100644
--- a/psutil/_psutil_windows.c
+++ b/psutil/_psutil_windows.c
@@ -1542,94 +1542,6 @@ 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)
- * - cpu_times() (fallback)
- * - create_time() (fallback)
- * - io_counters() (fallback)
- * - memory_info() (fallback)
- */
-static PyObject *
-psutil_proc_info(PyObject *self, PyObject *args) {
-    DWORD pid;
-    PSYSTEM_PROCESS_INFORMATION process;
-    PVOID buffer;
-    ULONG i;
-    ULONG ctx_switches = 0;
-    double user_time;
-    double kernel_time;
-    long long create_time;
-    PyObject *py_retlist;
-
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        return NULL;
-    if (! psutil_get_proc_info(pid, &process, &buffer))
-        return NULL;
-
-    for (i = 0; i < process->NumberOfThreads; i++)
-        ctx_switches += process->Threads[i].ContextSwitches;
-    user_time = (double)process->UserTime.HighPart * HI_T + \
-                (double)process->UserTime.LowPart * LO_T;
-    kernel_time = (double)process->KernelTime.HighPart * HI_T + \
-                    (double)process->KernelTime.LowPart * LO_T;
-
-    // Convert the LARGE_INTEGER union to a Unix time.
-    // It's the best I could find by googling and borrowing code here
-    // and there. The time returned has a precision of 1 second.
-    if (0 == pid || 4 == pid) {
-        // the python module will translate this into BOOT_TIME later
-        create_time = 0;
-    }
-    else {
-        create_time = ((LONGLONG)process->CreateTime.HighPart) << 32;
-        create_time += process->CreateTime.LowPart - 116444736000000000LL;
-        create_time /= 10000000;
-    }
-
-    py_retlist = Py_BuildValue(
-#if defined(_WIN64)
-        "kkdddiKKKKKK" "kKKKKKKKKK",
-#else
-        "kkdddiKKKKKK" "kIIIIIIIII",
-#endif
-        process->HandleCount,                   // num handles
-        ctx_switches,                           // num ctx switches
-        user_time,                              // cpu user time
-        kernel_time,                            // cpu kernel time
-        (double)create_time,                    // create time
-        (int)process->NumberOfThreads,          // num threads
-        // IO counters
-        process->ReadOperationCount.QuadPart,   // io rcount
-        process->WriteOperationCount.QuadPart,  // io wcount
-        process->ReadTransferCount.QuadPart,    // io rbytes
-        process->WriteTransferCount.QuadPart,   // io wbytes
-        process->OtherOperationCount.QuadPart,  // io others count
-        process->OtherTransferCount.QuadPart,   // io others bytes
-        // memory
-        process->PageFaultCount,                // num page faults
-        process->PeakWorkingSetSize,            // peak wset
-        process->WorkingSetSize,                // wset
-        process->QuotaPeakPagedPoolUsage,       // peak paged pool
-        process->QuotaPagedPoolUsage,           // paged pool
-        process->QuotaPeakNonPagedPoolUsage,    // peak non paged pool
-        process->QuotaNonPagedPoolUsage,        // non paged pool
-        process->PagefileUsage,                 // pagefile
-        process->PeakPagefileUsage,             // peak pagefile
-        process->PrivatePageCount               // private
-    );
-
-    free(buffer);
-    return py_retlist;
-}
-
-
 static char *get_region_protection_string(ULONG protection) {
     switch (protection & 0xff) {
         case PAGE_NOACCESS:
diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c
index e8fe8b7d..46b59149 100644
--- a/psutil/arch/windows/process_info.c
+++ b/psutil/arch/windows/process_info.c
@@ -680,8 +680,8 @@ out:
 
 /*
  * Given a process PID and a PSYSTEM_PROCESS_INFORMATION structure
- * fills the structure with various process information by using
- * NtQuerySystemInformation.
+ * fills the structure with various process information in one shot
+ * 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.
  * On success return 1, else 0 with Python exception already set.
@@ -749,3 +749,91 @@ error:
         free(buffer);
     return 0;
 }
+
+
+/*
+ * 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)
+ * - cpu_times() (fallback)
+ * - create_time() (fallback)
+ * - io_counters() (fallback)
+ * - memory_info() (fallback)
+ */
+PyObject *
+psutil_proc_info(PyObject *self, PyObject *args) {
+    DWORD pid;
+    PSYSTEM_PROCESS_INFORMATION process;
+    PVOID buffer;
+    ULONG i;
+    ULONG ctx_switches = 0;
+    double user_time;
+    double kernel_time;
+    long long create_time;
+    PyObject *py_retlist;
+
+    if (! PyArg_ParseTuple(args, "l", &pid))
+        return NULL;
+    if (! psutil_get_proc_info(pid, &process, &buffer))
+        return NULL;
+
+    for (i = 0; i < process->NumberOfThreads; i++)
+        ctx_switches += process->Threads[i].ContextSwitches;
+    user_time = (double)process->UserTime.HighPart * HI_T + \
+                (double)process->UserTime.LowPart * LO_T;
+    kernel_time = (double)process->KernelTime.HighPart * HI_T + \
+                    (double)process->KernelTime.LowPart * LO_T;
+
+    // Convert the LARGE_INTEGER union to a Unix time.
+    // It's the best I could find by googling and borrowing code here
+    // and there. The time returned has a precision of 1 second.
+    if (0 == pid || 4 == pid) {
+        // the python module will translate this into BOOT_TIME later
+        create_time = 0;
+    }
+    else {
+        create_time = ((LONGLONG)process->CreateTime.HighPart) << 32;
+        create_time += process->CreateTime.LowPart - 116444736000000000LL;
+        create_time /= 10000000;
+    }
+
+    py_retlist = Py_BuildValue(
+#if defined(_WIN64)
+        "kkdddiKKKKKK" "kKKKKKKKKK",
+#else
+        "kkdddiKKKKKK" "kIIIIIIIII",
+#endif
+        process->HandleCount,                   // num handles
+        ctx_switches,                           // num ctx switches
+        user_time,                              // cpu user time
+        kernel_time,                            // cpu kernel time
+        (double)create_time,                    // create time
+        (int)process->NumberOfThreads,          // num threads
+        // IO counters
+        process->ReadOperationCount.QuadPart,   // io rcount
+        process->WriteOperationCount.QuadPart,  // io wcount
+        process->ReadTransferCount.QuadPart,    // io rbytes
+        process->WriteTransferCount.QuadPart,   // io wbytes
+        process->OtherOperationCount.QuadPart,  // io others count
+        process->OtherTransferCount.QuadPart,   // io others bytes
+        // memory
+        process->PageFaultCount,                // num page faults
+        process->PeakWorkingSetSize,            // peak wset
+        process->WorkingSetSize,                // wset
+        process->QuotaPeakPagedPoolUsage,       // peak paged pool
+        process->QuotaPagedPoolUsage,           // paged pool
+        process->QuotaPeakNonPagedPoolUsage,    // peak non paged pool
+        process->QuotaNonPagedPoolUsage,        // non paged pool
+        process->PagefileUsage,                 // pagefile
+        process->PeakPagefileUsage,             // peak pagefile
+        process->PrivatePageCount               // private
+    );
+
+    free(buffer);
+    return py_retlist;
+}
diff --git a/psutil/arch/windows/process_info.h b/psutil/arch/windows/process_info.h
index 110d01df..20535669 100644
--- a/psutil/arch/windows/process_info.h
+++ b/psutil/arch/windows/process_info.h
@@ -11,3 +11,4 @@ int psutil_get_proc_info(DWORD pid, PSYSTEM_PROCESS_INFORMATION *retProcess,
 PyObject* psutil_get_cmdline(long pid, int use_peb);
 PyObject* psutil_get_cwd(long pid);
 PyObject* psutil_get_environ(long pid);
+PyObject* psutil_proc_info(PyObject *self, PyObject *args);