1
=== modified file 'tests/unit-tests/client/test_event_distributor.cpp'
2
--- tests/unit-tests/client/test_event_distributor.cpp	2014-06-11 16:11:32 +0000
3
+++ tests/unit-tests/client/test_event_distributor.cpp	2014-07-09 06:07:45 +0000
4
@@ -107,12 +107,18 @@
5
107
        EventCatcher(mcl::EventDistributor* event_distributor)
107
        EventCatcher(mcl::EventDistributor* event_distributor)
6
108
        : event_distributor(event_distributor)
108
        : event_distributor(event_distributor)
7
109
        {
109
        {
8
110
            locked = false;
9
110
            reg = event_distributor->register_event_handler(
111
            reg = event_distributor->register_event_handler(
10
111
                [this](MirEvent const&)
112
                [this](MirEvent const&)
11
112
                {
113
                {
13
113
                    mutex.unlock();
114
                    if (locked)
14
115
                    {
15
116
                        locked = false;
16
117
                        mutex.unlock();
17
118
                    }
18
114
                });
119
                });
19
115
            mutex.lock();
120
            mutex.lock();
20
121
            locked = true;
21
116
        }
122
        }
22
117
        ~EventCatcher()
123
        ~EventCatcher()
23
118
        {
124
        {
24
@@ -122,6 +128,7 @@
25
122
128
26
123
        mcl::EventDistributor* event_distributor;
129
        mcl::EventDistributor* event_distributor;
27
124
        int reg;
130
        int reg;
28
131
        bool locked;
29
125
        std::mutex mutex;
132
        std::mutex mutex;
30
126
    };
133
    };
31
127
134
32
@@ -145,6 +152,7 @@
33
145
152
34
146
    while(!thread_done.woken()) {
153
    while(!thread_done.woken()) {
35
147
        event_distributor.handle_event(e);
154
        event_distributor.handle_event(e);
36
155
        std::this_thread::yield();
37
148
    }
156
    }
38
149
157
39
150
    thread.join();
158
    thread.join();
Reviewer	Review Type	Date Requested	Status
Chris Halse Rogers		2014-07-08	Approve on 2014-07-09
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-09
Nick Dedekind		2014-07-08	Pending
Review via email: mp+225929@code.launchpad.net