1
=== modified file 'src/server/shell/CMakeLists.txt'
2
--- src/server/shell/CMakeLists.txt	2017-08-04 10:11:57 +0000
3
+++ src/server/shell/CMakeLists.txt	2017-08-07 13:27:11 +0000
4
@@ -1,11 +1,3 @@
5
1
pkg_check_modules(VALGRIND valgrind)
6
2
7
3
if(VALGRIND_FOUND)
8
4
    add_definitions(-DMIR_WORKAROUND_VALGRIND_COMPLAINT_ABOUT_UUID_GENERATE_RANDOM)
9
5
    include_directories(${VALGRIND_INCLUDE_DIRS})
10
6
endif()
11
7
12
8
13
9
set(
1
set(
14
10
  SHELL_SOURCES
2
  SHELL_SOURCES
15
11
3
16
12
4
17
=== modified file 'src/server/shell/canonical_window_manager.cpp'
18
--- src/server/shell/canonical_window_manager.cpp	2017-08-04 10:11:57 +0000
19
+++ src/server/shell/canonical_window_manager.cpp	2017-08-07 13:27:11 +0000
20
@@ -30,12 +30,6 @@
21
30
30
22
31
#include <climits>
31
#include <climits>
23
32
32
24
33
#ifdef MIR_WORKAROUND_VALGRIND_COMPLAINT_ABOUT_UUID_GENERATE_RANDOM
25
34
    #include "memcheck.h"
26
35
#else
27
36
    #define VALGRIND_MAKE_MEM_DEFINED(addr, len)
28
37
#endif
29
38
30
39
namespace msh = mir::shell;
33
namespace msh = mir::shell;
31
40
namespace ms = mir::scene;
34
namespace ms = mir::scene;
32
41
using namespace mir::geometry;
35
using namespace mir::geometry;
33
@@ -596,7 +590,6 @@
34
596
{
590
{
35
597
    uuid_t uuid;
591
    uuid_t uuid;
36
598
    uuid_generate(uuid);
592
    uuid_generate(uuid);
37
599
    VALGRIND_MAKE_MEM_DEFINED(uuid, sizeof uuid);
38
600
    std::vector<uint8_t> const handle{std::begin(uuid), std::end(uuid)};
593
    std::vector<uint8_t> const handle{std::begin(uuid), std::end(uuid)};
39
601
594
40
602
    surface->start_drag_and_drop(handle);
595
    surface->start_drag_and_drop(handle);
41
603
596
42
=== modified file 'src/server/shell/persistent_surface_store.cpp'
43
--- src/server/shell/persistent_surface_store.cpp	2017-08-04 10:11:57 +0000
44
+++ src/server/shell/persistent_surface_store.cpp	2017-08-07 13:27:11 +0000
45
@@ -20,19 +20,12 @@
46
20
20
47
21
#include <boost/throw_exception.hpp>
21
#include <boost/throw_exception.hpp>
48
22
22
49
23
#ifdef MIR_WORKAROUND_VALGRIND_COMPLAINT_ABOUT_UUID_GENERATE_RANDOM
50
24
    #include "memcheck.h"
51
25
#else
52
26
    #define VALGRIND_MAKE_MEM_DEFINED(addr, len)
53
27
#endif
54
28
55
29
namespace msh = mir::shell;
23
namespace msh = mir::shell;
56
30
using Id = mir::shell::PersistentSurfaceStore::Id;
24
using Id = mir::shell::PersistentSurfaceStore::Id;
57
31
25
58
32
Id::Id()
26
Id::Id()
59
33
{
27
{
60
34
    uuid_generate(uuid);
28
    uuid_generate(uuid);
61
35
    VALGRIND_MAKE_MEM_DEFINED(uuid, sizeof uuid);
62
36
}
29
}
63
37
30
64
38
Id::Id(std::string const& serialized_form)
31
Id::Id(std::string const& serialized_form)
Status:	Merged
Merged at revision:	4233
Proposed branch:	lp:~alan-griffiths/mir/revert-artful-amd64-valgrind-hacking
Merge into:	lp:mir
Diff against target:	64 lines (+0/-22) 3 files modified src/server/shell/CMakeLists.txt (+0/-8) src/server/shell/canonical_window_manager.cpp (+0/-7) src/server/shell/persistent_surface_store.cpp (+0/-7)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/revert-artful-amd64-valgrind-hacking
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-08-23
Brandon Schaefer (community)		2017-08-07	Approve on 2017-08-10
Review via email: mp+328663@code.launchpad.net