~alan-griffiths/mir/fix-1332011

Viewing changes to src/client/mir_wait_handle.cpp

Committer: Tarmac
Author(s): Alan Griffiths
Date: 2014-06-16 11:16:52 UTC
mfrom: (1691.1.3 mir5)
Revision ID: tarmac-20140616111652-ewiiv9x93rv2z34i

client: MirWaitHandle was being abused to wait for results without setting corresponding expectations of results.

Approved by Alexandros Frantzis, Kevin DuBois, Cemil Azizoglu, PS Jenkins bot.

files modified:
src/client/mir_connection.cpp

src/client/mir_screencast.cpp

src/client/mir_surface.cpp

src/client/mir_wait_handle.cpp

tests/unit-tests/client/test_wait_handle.cpp

Show diffs side-by-side

added added

removed removed

src/client/mir_wait_handle.cpp

{

std::unique_lock<std::mutex> lock(guard);

// TODO this condition ought to be "received == expecting" but some

// TODO client code seems to not call expect_result() and tests break.

wait_condition.wait(lock,

[&]{ return (expecting || received) && (received >= expecting); });

wait_condition.wait(lock, [&]{ return received == expecting; });

received = 0;

expecting = 0;

wait_condition.wait(lock, [&]{ return received != 0; });

received--;

if (expecting > 0)

expecting--;

--received;

--expecting;

}

Older »