1
=== modified file 'src/common/input/android/android_input_receiver.cpp'
2
--- src/common/input/android/android_input_receiver.cpp	2014-09-11 05:51:44 +0000
3
+++ src/common/input/android/android_input_receiver.cpp	2014-09-24 07:21:12 +0000
4
@@ -134,23 +134,11 @@
5
134
    }
134
    }
6
135
135
7
136
    auto reduced_timeout = timeout;
136
    auto reduced_timeout = timeout;
9
137
    if (input_consumer->hasDeferredEvent())
137
    if (input_consumer->hasDeferredEvent() || input_consumer->hasPendingBatch())
10
138
    {
138
    {
11
139
        // consume() didn't finish last time. Retry it immediately.
139
        // consume() didn't finish last time. Retry it immediately.
12
140
        reduced_timeout = std::chrono::milliseconds::zero();
140
        reduced_timeout = std::chrono::milliseconds::zero();
13
141
    }
141
    }
14
142
    else if (input_consumer->hasPendingBatch())
15
143
    {
16
144
        /*
17
145
         * A batch is pending and must be completed or else the client could
18
146
         * be starved of events. But don't hurry. A continuous motion gesture
19
147
         * will wake us up much sooner than 50ms. This timeout is only reached
20
148
         * in the case that motion has ended (fingers lifted).
21
149
         */
22
150
        std::chrono::milliseconds const motion_idle_timeout(50);
23
151
        if (timeout.count() < 0 || timeout > motion_idle_timeout)
24
152
            reduced_timeout = motion_idle_timeout;
25
153
    }
26
154
142
27
155
    auto result = looper->pollOnce(reduced_timeout.count());
143
    auto result = looper->pollOnce(reduced_timeout.count());
28
156
    if (result == ALOOPER_POLL_WAKE)
144
    if (result == ALOOPER_POLL_WAKE)
29
157
145
30
=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
31
--- tests/unit-tests/client/input/test_android_input_receiver.cpp	2014-09-11 05:51:44 +0000
32
+++ tests/unit-tests/client/input/test_android_input_receiver.cpp	2014-09-24 07:21:12 +0000
33
@@ -204,6 +204,51 @@
34
204
    EXPECT_FALSE(receiver.next_event(std::chrono::milliseconds(1), ev)); // Minimal timeout needed for valgrind
204
    EXPECT_FALSE(receiver.next_event(std::chrono::milliseconds(1), ev)); // Minimal timeout needed for valgrind
35
205
}
205
}
36
206
206
37
207
TEST_F(AndroidInputReceiverSetup, slow_raw_input_doesnt_cause_frameskipping)
38
208
{   // Regression test for LP: #1372300
39
209
    using namespace testing;
40
210
    using namespace std::chrono;
41
211
42
212
    nsecs_t t = 0;
43
213
44
214
    mircva::InputReceiver receiver(
45
215
        client_fd, std::make_shared<mircv::NullInputReceiverReport>(),
46
216
        [&t](int) { return t; }
47
217
        );
48
218
    TestingInputProducer producer(server_fd);
49
219
50
220
    nsecs_t const one_millisecond = 1000000ULL;
51
221
    nsecs_t const one_second = 1000 * one_millisecond;
52
222
    nsecs_t const one_frame = one_second / 60;
53
223
54
224
    MirEvent ev;
55
225
56
226
    producer.produce_a_motion_event(123, 456, t);
57
227
    producer.produce_a_key_event();
58
228
    flush_channels();
59
229
60
230
    std::chrono::milliseconds const max_timeout(1000);
61
231
62
232
    // Key events don't get resampled. Will be reported first.
63
233
    ASSERT_TRUE(receiver.next_event(max_timeout, ev));
64
234
    ASSERT_EQ(mir_event_type_key, ev.type);
65
235
66
236
    // The motion is still too new. Won't be reported yet, but is batched.
67
237
    auto start = high_resolution_clock::now();
68
238
    ASSERT_FALSE(receiver.next_event(max_timeout, ev));
69
239
    auto end = high_resolution_clock::now();
70
240
    auto duration = end - start;
71
241
72
242
    // Verify we timed out in under a frame (LP: #1372300)
73
243
    // Sadly using real time as droidinput::Looper doesn't use a mocked clock.
74
244
    ASSERT_LT(duration_cast<nanoseconds>(duration).count(), one_frame);
75
245
76
246
    // But later in a frame or so, the motion will be reported:
77
247
    t += one_frame;
78
248
    ASSERT_TRUE(receiver.next_event(max_timeout, ev));
79
249
    ASSERT_EQ(mir_event_type_motion, ev.type);
80
250
}
81
251
82
207
TEST_F(AndroidInputReceiverSetup, rendering_does_not_lag_behind_input)
252
TEST_F(AndroidInputReceiverSetup, rendering_does_not_lag_behind_input)
83
208
{
253
{
84
209
    using namespace testing;
254
    using namespace testing;
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-09-25
Alexandros Frantzis (community)		2014-09-23	Approve on 2014-09-24
Review via email: mp+235573@code.launchpad.net