1
=== modified file 'src/common/input/android/android_input_receiver.cpp'
2
--- src/common/input/android/android_input_receiver.cpp	2014-09-25 07:57:28 +0000
3
+++ src/common/input/android/android_input_receiver.cpp	2014-09-25 09:02:15 +0000
4
@@ -142,11 +142,19 @@
5
142
    }
142
    }
6
143
143
7
144
    auto reduced_timeout = timeout;
144
    auto reduced_timeout = timeout;
9
145
    if (input_consumer->hasDeferredEvent() || input_consumer->hasPendingBatch())
145
    if (input_consumer->hasDeferredEvent())
10
146
    {
146
    {
11
147
        // consume() didn't finish last time. Retry it immediately.
147
        // consume() didn't finish last time. Retry it immediately.
12
148
        reduced_timeout = std::chrono::milliseconds::zero();
148
        reduced_timeout = std::chrono::milliseconds::zero();
13
149
    }
149
    }
14
150
    else if (input_consumer->hasPendingBatch())
15
151
    {
16
152
        // When in constant motion we will usually "hasPendingBatch".
17
153
        // But the batch won't get flushed until the next frame interval,
18
154
        // so be sure to use a non-zero sleep time to avoid spinning the CPU
19
155
        // for the whole interval...
20
156
        reduced_timeout = std::chrono::milliseconds(1);
21
157
    }
22
150
158
23
151
    auto result = looper->pollOnce(reduced_timeout.count());
159
    auto result = looper->pollOnce(reduced_timeout.count());
24
152
    if (result == ALOOPER_POLL_WAKE)
160
    if (result == ALOOPER_POLL_WAKE)
25
153
161
26
=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
27
--- tests/unit-tests/client/input/test_android_input_receiver.cpp	2014-09-25 07:57:28 +0000
28
+++ tests/unit-tests/client/input/test_android_input_receiver.cpp	2014-09-25 09:02:15 +0000
29
@@ -243,8 +243,11 @@
30
243
    // Sadly using real time as droidinput::Looper doesn't use a mocked clock.
243
    // Sadly using real time as droidinput::Looper doesn't use a mocked clock.
31
244
    ASSERT_LT(duration_cast<nanoseconds>(duration).count(), one_frame);
244
    ASSERT_LT(duration_cast<nanoseconds>(duration).count(), one_frame);
32
245
245
33
246
    // Verify we don't use all the CPU by not sleeping (LP: #1373809)
34
247
    EXPECT_GT(duration_cast<nanoseconds>(duration).count(), one_millisecond);
35
248
36
246
    // But later in a frame or so, the motion will be reported:
249
    // But later in a frame or so, the motion will be reported:
38
247
    t += one_frame;
250
    t += 2 * one_frame;  // Account for the new slower 55Hz event rate
39
248
    ASSERT_TRUE(receiver.next_event(max_timeout, ev));
251
    ASSERT_TRUE(receiver.next_event(max_timeout, ev));
40
249
    ASSERT_EQ(mir_event_type_motion, ev.type);
252
    ASSERT_EQ(mir_event_type_motion, ev.type);
41
250
}
253
}
Reviewer	Review Type	Date Requested	Status
Kevin DuBois (community)			Approve on 2014-09-25
PS Jenkins bot (community)	continuous-integration		Approve on 2014-09-25
Alexandros Frantzis (community)		2014-09-25	Approve on 2014-09-25
Review via email: mp+235917@code.launchpad.net