Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: test/Thread.cpp

Issue 10026001: Cross-platform thread primitives (Closed)
Patch Set: Improve mutex test Created April 4, 2013, 7:27 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include <gtest/gtest.h> 1 #include <gtest/gtest.h>
2 #include <queue> 2 #include <queue>
3 #include <vector> 3 #include <vector>
4 4
5 #include "../src/Thread.h" 5 #include "../src/Thread.h"
6 6
7 namespace 7 namespace
8 { 8 {
9 #ifndef WIN32 9 #ifndef WIN32
10 void Sleep(const int millis) 10 void Sleep(const int millis)
(...skipping 19 matching lines...) Expand all
30 timesCalled++; 30 timesCalled++;
31 mutex.Unlock(); 31 mutex.Unlock();
32 } 32 }
33 }; 33 };
34 34
35 class LockingMock : public AdblockPlus::Thread 35 class LockingMock : public AdblockPlus::Thread
36 { 36 {
37 public: 37 public:
38 bool working; 38 bool working;
39 39
40 LockingMock(const std::string& name, std::vector<std::string>& log, 40 LockingMock(std::vector<std::string>& log, AdblockPlus::Mutex& logMutex)
41 AdblockPlus::Mutex& logMutex) 41 : log(log), logMutex(logMutex)
42 : name(name), log(log), logMutex(logMutex)
43 { 42 {
44 } 43 }
45 44
46 void Run() 45 void Run()
47 { 46 {
48 logMutex.Lock(); 47 logMutex.Lock();
49 log.push_back(name); 48 log.push_back("started");
49 Sleep(5);
50 log.push_back("ended");
50 logMutex.Unlock(); 51 logMutex.Unlock();
51 } 52 }
52 53
53 private: 54 private:
54 const std::string name; 55 const std::string name;
55 std::vector<std::string>& log; 56 std::vector<std::string>& log;
56 AdblockPlus::Mutex& logMutex; 57 AdblockPlus::Mutex& logMutex;
57 }; 58 };
58 59
59 class Enqueuer : public AdblockPlus::Thread 60 class Enqueuer : public AdblockPlus::Thread
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 ASSERT_EQ(0, mock.timesCalled); 114 ASSERT_EQ(0, mock.timesCalled);
114 mock.mutex.Unlock(); 115 mock.mutex.Unlock();
115 mock.Join(); 116 mock.Join();
116 ASSERT_EQ(1, mock.timesCalled); 117 ASSERT_EQ(1, mock.timesCalled);
117 } 118 }
118 119
119 TEST(ThreadTest, Mutex) 120 TEST(ThreadTest, Mutex)
120 { 121 {
121 std::vector<std::string> log; 122 std::vector<std::string> log;
122 AdblockPlus::Mutex logMutex; 123 AdblockPlus::Mutex logMutex;
123 LockingMock mock1("mock1", log, logMutex); 124 LockingMock mock1(log, logMutex);
124 LockingMock mock2("mock2", log, logMutex); 125 LockingMock mock2(log, logMutex);
125 mock1.Start(); 126 mock1.Start();
126 Sleep(5);
127 mock2.Start(); 127 mock2.Start();
128 mock1.Join(); 128 mock1.Join();
129 mock2.Join(); 129 mock2.Join();
130 ASSERT_EQ("mock1", log[0]); 130 ASSERT_EQ("started", log[0]);
131 ASSERT_EQ("mock2", log[1]); 131 ASSERT_EQ("ended", log[1]);
132 ASSERT_EQ("started", log[2]);
133 ASSERT_EQ("ended", log[3]);
132 } 134 }
133 135
134 TEST(ThreadTest, ConditionVariable) 136 TEST(ThreadTest, ConditionVariable)
135 { 137 {
136 std::queue<int> queue; 138 std::queue<int> queue;
137 AdblockPlus::Mutex queueMutex; 139 AdblockPlus::Mutex queueMutex;
138 AdblockPlus::ConditionVariable notEmpty; 140 AdblockPlus::ConditionVariable notEmpty;
139 Dequeuer dequeuer(queue, queueMutex, notEmpty); 141 Dequeuer dequeuer(queue, queueMutex, notEmpty);
140 Enqueuer enqueuer(queue, queueMutex, notEmpty); 142 Enqueuer enqueuer(queue, queueMutex, notEmpty);
141 dequeuer.Start(); 143 dequeuer.Start();
142 Sleep(5); 144 Sleep(5);
143 enqueuer.Start(); 145 enqueuer.Start();
144 enqueuer.Join(); 146 enqueuer.Join();
145 dequeuer.Join(); 147 dequeuer.Join();
146 ASSERT_EQ(0, queue.size()); 148 ASSERT_EQ(0, queue.size());
147 } 149 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld