Reorganize Multiprocess and implement for Windows

util/test/multiprocess_exec_test_child.cc

Index: util/test/multiprocess_exec_test_child.cc
diff --git a/util/test/multiprocess_exec_test_child.cc b/util/test/multiprocess_exec_test_child.cc
index 8ad358a5227e2919eccc8872c9aa0f9a381f0194..4f6c2cd5c6b86b4a714255d043e9a1675213bf62 100644
--- a/util/test/multiprocess_exec_test_child.cc
+++ b/util/test/multiprocess_exec_test_child.cc
@@ -32,102 +32,6 @@
 #include <windows.h>
 #endif
 
-#if defined(OS_WIN)
-
-namespace {
-
-// Various semi-documented NT internals to retrieve open handles.
-
-typedef enum _SYSTEM_INFORMATION_CLASS {
-  SystemHandleInformation = 16
-} SYSTEM_INFORMATION_CLASS;
-
-typedef struct _SYSTEM_HANDLE_INFORMATION {
-  USHORT ProcessId;
-  USHORT CreatorBackTraceIndex;
-  UCHAR ObjectTypeNumber;
-  UCHAR Flags;
-  USHORT Handle;
-  PVOID Object;
-  ACCESS_MASK GrantedAccess;
-} SYSTEM_HANDLE_INFORMATION, *PSYSTEM_HANDLE_INFORMATION;
-
-typedef struct _SYSTEM_HANDLE_INFORMATION_EX {
-  ULONG NumberOfHandles;
-  SYSTEM_HANDLE_INFORMATION Information[1];
-} SYSTEM_HANDLE_INFORMATION_EX, *PSYSTEM_HANDLE_INFORMATION_EX;
-
-typedef NTSTATUS(WINAPI* NTQUERYSYSTEMINFORMATION)(
-    SYSTEM_INFORMATION_CLASS SystemInformationClass,
-    PVOID SystemInformation,
-    ULONG SystemInformationLength,
-    PULONG ReturnLength);
-
-void EnsureOnlyStdioHandlesOpen() {
-  // Initialize the NTAPI functions we need.
-  HMODULE ntdll_handle = GetModuleHandle(L"ntdll.dll");
-  if (!ntdll_handle) {
-    fprintf(stderr, "GetModuleHandle ntdll.dll failed.\n");
-    abort();
-  }
-
-  NTQUERYSYSTEMINFORMATION NtQuerySystemInformation;
-  NtQuerySystemInformation = reinterpret_cast<NTQUERYSYSTEMINFORMATION>(
-                      GetProcAddress(ntdll_handle, "NtQuerySystemInformation"));
-  if (!NtQuerySystemInformation) {
-    fprintf(stderr, "GetProcAddress NtQuerySystemInformation failed.\n");
-    abort();
-  }
-
-  // Get the number of handles on the system.
-  DWORD buffer_size = 0;
-  SYSTEM_HANDLE_INFORMATION_EX temp_info;
-  NTSTATUS status = NtQuerySystemInformation(
-      SystemHandleInformation, &temp_info, sizeof(temp_info), &buffer_size);
-  if (!buffer_size) {
-    fprintf(stderr,
-            "NtQuerySystemInformation for number of handles failed: 0x%lX\n",
-            status);
-    abort();
-  }
-
-  SYSTEM_HANDLE_INFORMATION_EX *system_handles =
-      reinterpret_cast<SYSTEM_HANDLE_INFORMATION_EX*>(new BYTE[buffer_size]);
-
-  // This is likely flaky as we're racing with other handles being created on
-  // the system between the size query above, and the actual retrieval here.
-  status = NtQuerySystemInformation(SystemHandleInformation, system_handles,
-                                    buffer_size, &buffer_size);
-  if (status != 0) {
-    fprintf(stderr, "Failed to get the handle list: 0x%lX\n", status);
-    delete[] system_handles;
-    abort();
-  }
-
-  for (ULONG i = 0; i < system_handles->NumberOfHandles; ++i) {
-    USHORT h = system_handles->Information[i].Handle;
-    if (system_handles->Information[i].ProcessId != GetCurrentProcessId())
-      continue;
-
-    // TODO(scottmg): This is probably insufficient, we'll need to allow having
-    // a few other standard handles open (for example, to the window station),
-    // or only check for handles of certain types.
-    HANDLE handle = reinterpret_cast<HANDLE>(h);
-    if (handle != GetStdHandle(STD_INPUT_HANDLE) &&
-        handle != GetStdHandle(STD_OUTPUT_HANDLE) &&
-        handle != GetStdHandle(STD_ERROR_HANDLE)) {
-      fprintf(stderr, "Handle 0x%lX is not stdio handle\n", handle);
-      abort();
-    }
-  }
-
-  delete [] system_handles;
-}
-
-}  // namespace
-
-#endif  // OS_WIN
-
 int main(int argc, char* argv[]) {
 #if defined(OS_POSIX)
   // Make sure that there’s nothing open at any FD higher than 3. All FDs other
@@ -155,13 +59,11 @@ int main(int argc, char* argv[]) {
     abort();
   }
 #elif defined(OS_WIN)
-  // Make sure there's nothing open other than stdin, stdout, and stderr.

[scottmg, 2015/01/27 01:37:47]

This didn't work at all, once I finally got the binaries running. It's flaky,
and there's a ton of other non-file handles open. Need to determine what we want
to test here, and do it in some other way.

[Mark Mentovai, 2015/01/28 19:58:28]

scottmg wrote:
Let’s leave a TODO here, then.

[scottmg, 2015/01/28 22:14:58]

Done.

-  EnsureOnlyStdioHandlesOpen();
-
   // Read a byte from stdin, expecting it to be a specific value.
   char c;
   DWORD bytes_read;
-  if (!ReadFile(GetStdHandle(STD_INPUT_HANDLE), &c, 1, &bytes_read, nullptr) ||
+  HANDLE stdin_handle = GetStdHandle(STD_INPUT_HANDLE);
+  if (!ReadFile(stdin_handle, &c, 1, &bytes_read, nullptr) ||
       bytes_read != 1 || c != 'z') {
     abort();
   }