Port last remaining test case in base/stats_table_unittest.cc, and...

base/stats_table_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/multiprocess_test.h"
 #include "base/platform_thread.h"
 #include "base/stats_table.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 48 matching lines @@
 // CounterIncrement will be incremented each time.
 const std::wstring kCounterIncrement = L"CounterIncrement";
 // CounterDecrement will be decremented each time.
 const std::wstring kCounterDecrement = L"CounterDecrement";
 // CounterMixed will be incremented by odd numbered threads and
 // decremented by even threads.
 const std::wstring kCounterMixed = L"CounterMixed";
 // The number of thread loops that we will do.
 const int kThreadLoops = 1000;
 
-// TODO(estade): port this test
-#if defined(OS_WIN)
-unsigned __stdcall StatsTableMultipleThreadMain(void* param) {
+class StatsTableThread : public PlatformThread::Delegate {

[Dean McNamee, 2008/10/31 19:20:37]

Can you use SimpleThread, it was designed for unittests so we have a layer
between PlatformThread.

+public:
+  void ThreadMain();
+  PlatformThreadHandle thread_;
+  int id_;
+};
+
+void StatsTableThread::ThreadMain() {
   // Each thread will open the shared memory and set counters
   // concurrently in a loop.  We'll use some pauses to
   // mixup the thread scheduling.
-  int16 id = reinterpret_cast<int16>(param);
 
   StatsCounter zero_counter(kCounterZero);
   StatsCounter lucky13_counter(kCounter1313);
   StatsCounter increment_counter(kCounterIncrement);
   StatsCounter decrement_counter(kCounterDecrement);
   for (int index = 0; index < kThreadLoops; index++) {
     StatsCounter mixed_counter(kCounterMixed);  // create this one in the loop
     zero_counter.Set(0);
     lucky13_counter.Set(1313);
     increment_counter.Increment();
     decrement_counter.Decrement();
-    if (id % 2)
+    if (id_ % 2)
       mixed_counter.Decrement();
     else
       mixed_counter.Increment();
     PlatformThread::Sleep(index % 10);   // short wait
   }
-  return 0;
 }
 
 // Create a few threads and have them poke on their counters.
 TEST_F(StatsTableTest, MultipleThreads) {
   // Create a stats table.
   const std::wstring kTableName = L"MultipleThreadStatTable";
   const int kMaxThreads = 20;
   const int kMaxCounter = 5;
   StatsTable table(kTableName, kMaxThreads, kMaxCounter);
   StatsTable::set_current(&table);
 
   EXPECT_EQ(0, table.CountThreadsRegistered());
 
   // Spin up a set of threads to go bang on the various counters.
   // After we join the threads, we'll make sure the counters
   // contain the values we expected.
-  HANDLE threads[kMaxThreads];
+  StatsTableThread threads[kMaxThreads];
 
   // Spawn the threads.
-  for (int16 index = 0; index < kMaxThreads; index++) {
-    void* argument = reinterpret_cast<void*>(index);
-    unsigned thread_id;
-    threads[index] = reinterpret_cast<HANDLE>(
-      _beginthreadex(NULL, 0, StatsTableMultipleThreadMain, argument, 0,
-        &thread_id));
-    EXPECT_NE((HANDLE)NULL, threads[index]);
+  for (int index = 0; index < kMaxThreads; index++) {
+    threads[index].id_ = index; 
+    bool created = 
+        PlatformThread::Create(0, &threads[index], &threads[index].thread_);
+    EXPECT_EQ(true, created);
+    EXPECT_NE(static_cast<PlatformThreadHandle>(0), threads[index].thread_);
   }
 
   // Wait for the threads to finish.
   for (int index = 0; index < kMaxThreads; index++) {
-    DWORD rv = WaitForSingleObject(threads[index], 60 * 1000);
-    EXPECT_EQ(rv, WAIT_OBJECT_0);  // verify all threads finished
+    PlatformThread::Join(threads[index].thread_);
   }
   StatsCounter zero_counter(kCounterZero);
   StatsCounter lucky13_counter(kCounter1313);
   StatsCounter increment_counter(kCounterIncrement);
   StatsCounter decrement_counter(kCounterDecrement);
   StatsCounter mixed_counter(kCounterMixed);
 
   // Verify the various counters are correct.
   std::wstring name;
   name = L"c:" + kCounterZero;
   EXPECT_EQ(0, table.GetCounterValue(name));
   name = L"c:" + kCounter1313;
   EXPECT_EQ(1313 * kMaxThreads,
       table.GetCounterValue(name));
   name = L"c:" + kCounterIncrement;
   EXPECT_EQ(kMaxThreads * kThreadLoops,
       table.GetCounterValue(name));
   name = L"c:" + kCounterDecrement;
   EXPECT_EQ(-kMaxThreads * kThreadLoops,
       table.GetCounterValue(name));
   name = L"c:" + kCounterMixed;
   EXPECT_EQ((kMaxThreads % 2) * kThreadLoops,
       table.GetCounterValue(name));
   EXPECT_EQ(0, table.CountThreadsRegistered());
 }
-#endif  // defined(OS_WIN)
 
 const std::wstring kTableName = L"MultipleProcessStatTable";
 
 MULTIPROCESS_TEST_MAIN(StatsTableMultipleProcessMain) {
   // Each process will open the shared memory and set counters
   // concurrently in a loop.  We'll use some pauses to
   // mixup the scheduling.
 
   StatsTable table(kTableName, 0, 0);
   StatsTable::set_current(&table);
@@ skipping 211 matching lines @@
     StatsScope<StatsCounterTimer> timer(foo);
     StatsScope<StatsRate> timer2(bar);
     PlatformThread::Sleep(500);
   }
   EXPECT_LE(1000, table.GetCounterValue(L"t:foo"));
   EXPECT_LE(1000, table.GetCounterValue(L"t:bar"));
   EXPECT_EQ(2, table.GetCounterValue(L"c:bar"));
 }
 
 }  // namespace