win x86: Grab bag of restructuring to get tests working on x86-on-x86

snapshot/win/process_reader_win_test.cc

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "snapshot/win/process_reader_win.h"
 
 #include <string.h>
 #include <windows.h>
 
 #include "gtest/gtest.h"
 #include "test/win/win_multiprocess.h"
+#include "util/synchronization/semaphore.h"
+#include "util/thread/thread.h"
 #include "util/win/scoped_process_suspend.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 TEST(ProcessReaderWin, SelfBasic) {
   ProcessReaderWin process_reader;
   ASSERT_TRUE(process_reader.Initialize(GetCurrentProcess(),
                                         ProcessSuspensionState::kRunning));
@@ skipping 65 matching lines @@
                                         ProcessSuspensionState::kRunning));
 
   const std::vector<ProcessReaderWin::Thread>& threads =
       process_reader.Threads();
 
   // If other tests ran in this process previously, threads may have been
   // created and may still be running. This check must look for at least one
   // thread, not exactly one thread.
   ASSERT_GE(threads.size(), 1u);
 
-  EXPECT_EQ(GetThreadId(GetCurrentThread()), threads[0].id);
+  EXPECT_EQ(GetCurrentThreadId(), threads[0].id);
 #if defined(ARCH_CPU_64_BITS)
   EXPECT_NE(0, threads[0].context.Rip);
 #else
   EXPECT_NE(0u, threads[0].context.Eip);
 #endif
 
   EXPECT_EQ(0, threads[0].suspend_count);
 }
 
 class ProcessReaderChildThreadSuspendCount final : public WinMultiprocess {
  public:
   ProcessReaderChildThreadSuspendCount() : WinMultiprocess() {}
   ~ProcessReaderChildThreadSuspendCount() {}
 
  private:
+  enum : unsigned int { kCreatedThreads = 3 };
+
+  class SleepingThread : public Thread {
+   public:
+    SleepingThread() : done_(nullptr) {}
+
+    void SetHandle(Semaphore* done) {
+      done_= done;
+    }
+
+    void ThreadMain() override {
+      done_->Wait();
+    };
+
+   private:
+    Semaphore* done_;
+  };
+
   void WinMultiprocessParent() override {
+    char c;
+    CheckedReadFile(ReadPipeHandle(), &c, sizeof(c));
+    ASSERT_EQ(' ', c);
+
     {
       ProcessReaderWin process_reader;
       ASSERT_TRUE(process_reader.Initialize(ChildProcess(),
                                             ProcessSuspensionState::kRunning));
 
       const auto& threads = process_reader.Threads();
-      ASSERT_FALSE(threads.empty());
+      ASSERT_GE(threads.size(), kCreatedThreads + 1);
       for (const auto& thread : threads)
         EXPECT_EQ(0u, thread.suspend_count);
     }
 
     {
       ScopedProcessSuspend suspend(ChildProcess());
 
       ProcessReaderWin process_reader;
       ASSERT_TRUE(process_reader.Initialize(
           ChildProcess(), ProcessSuspensionState::kSuspended));
 
       // Confirm that thread counts are adjusted correctly for the process being
       // suspended.
       const auto& threads = process_reader.Threads();
-      ASSERT_FALSE(threads.empty());
+      ASSERT_GE(threads.size(), kCreatedThreads + 1);
       for (const auto& thread : threads)
         EXPECT_EQ(0u, thread.suspend_count);
     }
   }
 
   void WinMultiprocessChild() override {
-    WinVMAddress address = reinterpret_cast<WinVMAddress>(kTestMemory);
-    CheckedWriteFile(WritePipeHandle(), &address, sizeof(address));
+    // Create three dummy threads so we can confirm we read successfully read
+    // more than just the main thread.
+    SleepingThread threads[kCreatedThreads];
+    Semaphore done(0);
+    for (auto& thread : threads)
+      thread.SetHandle(&done);
+    for (auto& thread : threads)
+      thread.Start();
+
+    char c = ' ';
+    CheckedWriteFile(WritePipeHandle(), &c, sizeof(c));
 
     // Wait for the parent to signal that it's OK to exit by closing its end of
     // the pipe.
     CheckedReadFileAtEOF(ReadPipeHandle());
+
+    for (int i = 0; i < arraysize(threads); ++i)
+      done.Signal();
+    for (auto& thread : threads)
+      thread.Join();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ProcessReaderChildThreadSuspendCount);
 };
 
 TEST(ProcessReaderWin, ChildThreadSuspendCounts) {
   WinMultiprocess::Run<ProcessReaderChildThreadSuspendCount>();
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad