Mir

Merge lp:~vanvugt/mir/remove-dead-code-nbuffers-opt into lp:mir

  1. remove-dead-code-nbuffers-opt
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Cemil Azizoglu
Approved revision: no longer in the source branch.
Merged at revision: 4126
Proposed branch: lp:~vanvugt/mir/remove-dead-code-nbuffers-opt
Merge into: lp:mir
Diff against target: 23 lines (+0/-2)
2 files modified
src/include/platform/mir/options/configuration.h (+0/-1)
src/platform/symbols.map (+0/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/remove-dead-code-nbuffers-opt
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Cemil Azizoglu (community) Approve
Alan Griffiths Approve
Kevin DuBois (community) Approve
Review via email: mp+321256@code.launchpad.net

Commit message

Remove dead code in the server - mir::options::nbuffers_opt

Description of the change

It was replaced some time ago by MIR_CLIENT_NBUFFERS.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4124
https://mir-jenkins.ubuntu.com/job/mir-ci/3278/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4419
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4511
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4501
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4501
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4501
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4451
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4451/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4451
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4451/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4451
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4451/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4451
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4451/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4451
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4451/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4451
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4451/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3278/rebuild

review: Approve (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) :
review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Sure

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1246/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4421/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1315/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4513
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4503
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4503
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4503
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4453/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4453/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4453/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4453/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4453/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4453/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

11:41:20 [ 52%] Linking CXX executable ../../../../bin/mir_demo_standalone_render_overlays.bin
11:41:20 cd /<<BUILDDIR>>/mir-0.26.1+17.04.20170209.1+zesty4503bzr4124/obj-x86_64-linux-gnu/src/platforms/android/utils && /usr/bin/cmake -E cmake_link_script CMakeFiles/mir_demo_standalone_render_overlays.dir/link.txt --verbose=1
11:41:20 /usr/lib/ccache/c++ -g -O2 -fdebug-prefix-map=/<<BUILDDIR>>/mir-0.26.1+17.04.20170209.1+zesty4503bzr4124=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -pthread -g -std=c++14 -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC -flto -ffat-lto-objects -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,--as-needed -Wl,--no-undefined CMakeFiles/mir_demo_standalone_render_overlays.dir/render_overlays.cpp.o -o ../../../../bin/mir_demo_standalone_render_overlays.bin -rdynamic ../../../../lib/libmirplatform.so.16 ../../../../lib/libmircommon.so.7 ../../../capnproto/libmircapnproto.a -lkj -lcapnp ../../../../lib/libmircore.so.1 -lboost_date_time -lboost_system -lboost_program_options -lboost_filesystem -ldl -lEGL -lGLESv2 -lGLESv2 -L/lib/x86_64-linux-gnu -ludev -ludev
11:41:21 //usr/lib/x86_64-linux-gnu/libmirclient.so.9: undefined reference to `MirInputDeviceStateEvent::device_pressed_keys_for_index(unsigned long, unsigned long) const@MIR_COMMON_0.25_PRIVATE'
11:41:21 //usr/lib/x86_64-linux-gnu/libmirclient.so.9: undefined reference to `MirPointerEvent::set_x(float)@MIR_COMMON_0.25_PRIVATE'
11:41:21 //usr/lib/x86_64-linux-gnu/libmirclient.so.9: undefined reference to `MirTouchEvent::pressure(unsigned long) const@MIR_COMMON_0.25_PRIVATE'

Hmm, not sure why this is suddenly happening, but the fix is:

    lp:~alan-griffiths/mir/add-missing-link-library/+merge/321276

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Logged as lp:1677239

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

ok

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/include/platform/mir/options/configuration.h'
2--- src/include/platform/mir/options/configuration.h 2017-03-08 19:27:56 +0000
3+++ src/include/platform/mir/options/configuration.h 2017-03-29 08:53:54 +0000
4@@ -49,7 +49,6 @@
5 extern char const* const touchspots_opt;
6 extern char const* const fatal_except_opt;
7 extern char const* const debug_opt;
8-extern char const* const nbuffers_opt;
9 extern char const* const composite_delay_opt;
10 extern char const* const enable_key_repeat_opt;
11
12
13=== modified file 'src/platform/symbols.map'
14--- src/platform/symbols.map 2017-03-14 05:30:56 +0000
15+++ src/platform/symbols.map 2017-03-29 08:53:54 +0000
16@@ -43,7 +43,6 @@
17 mir::options::DefaultConfiguration::the_options*;
18 mir::options::display_report_opt*;
19 mir::options::debug_opt*;
20- mir::options::nbuffers_opt*;
21 mir::options::enable_input_opt*;
22 mir::options::enable_key_repeat_opt*;
23 mir::options::fatal_except_opt*;

Subscribers

People subscribed via source and target branches