Mir

Merge lp://qastaging/~vanvugt/mir/sync-api into lp://qastaging/~mir-team/mir/trunk

sync-api
Merge into trunk

Proposed by Daniel van Vugt on 2013-03-19

Status:

Merged

Approved by:

Robert Ancell on 2013-03-19

Approved revision:

no longer in the source branch.

Merged at revision:

516

Proposed branch:

lp://qastaging/~vanvugt/mir/sync-api

Merge into:

lp://qastaging/~mir-team/mir/trunk

Diff against target:

394 lines (+127/-73)

6 files modified

examples/demo_client_accelerated.cpp (+7/-27)
examples/demo_client_unaccelerated.c (+9/-34)
examples/eglapp.c (+2/-11)
include/client/mir_toolkit/mir_client_library.h (+24/-0)
src/client/mir_client_library.cpp (+28/-1)
tests/acceptance-tests/test_client_library.cpp (+57/-0)

To merge this branch:

bzr merge lp://qastaging/~vanvugt/mir/sync-api

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Robert Ancell			Approve on 2013-03-19
Alan Griffiths		2013-03-19	Approve on 2013-03-19
PS Jenkins bot (community)	continuous-integration		Approve on 2013-03-19
Review via email: mp+154015@code.qastaging.launchpad.net

Commit message

Implement remaining functions required for a fully synchronous client API.
(LP: #1112195)

Also use the synchronous functions in all but one example clients.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-19:

PASSED: Continuous integration, rev:518
http://jenkins.qa.ubuntu.com/job/mir-ci/127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/128/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/128/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/127/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2013-03-19:

267 - *context = result;
268 + if (context)
269 + *context = result;

If context is null the idiot deserves a segfault (not a silent failure).

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2013-03-19:

> 267 - *context = result;
> 268 + if (context)
> 269 + *context = result;
>
> If context is null the idiot deserves a segfault (not a silent failure).

On further reading I see this is an artifact of the approach taken - and only our code is involved.

I still don't like this or the non-portable re-interpret cast, but not enough to block.

review: Approve

Revision history for this message

Robert Ancell (robert-ancell) on 2013-03-19:

review: Approve