1
=== modified file 'src/client/mir_connection_api.cpp'
2
--- src/client/mir_connection_api.cpp	2015-07-25 08:10:48 +0000
3
+++ src/client/mir_connection_api.cpp	2015-09-30 21:06:13 +0000
4
@@ -64,7 +64,7 @@
5
64
                if (socket_env)
64
                if (socket_env)
6
65
                    sock = socket_env;
65
                    sock = socket_env;
7
66
                else
66
                else
9
67
                    sock = mir::default_server_socket;
67
                    sock = mir::default_server_socket();
10
68
            }
68
            }
11
69
69
12
70
            auto const conf = configuration(sock);
70
            auto const conf = configuration(sock);
13
71
71
14
=== modified file 'src/common/env/default_configuration.cpp'
15
--- src/common/env/default_configuration.cpp	2013-12-12 07:51:12 +0000
16
+++ src/common/env/default_configuration.cpp	2015-09-30 21:06:13 +0000
17
@@ -21,9 +21,7 @@
18
21
#include <cstdlib>
21
#include <cstdlib>
19
22
#include <sstream>
22
#include <sstream>
20
23
23
24
24
namespace
24
std::string mir::default_server_socket()
22
25
{
23
26
const char* init()
25
27
{
25
{
26
28
    std::ostringstream formatter;
26
    std::ostringstream formatter;
27
29
27
28
@@ -32,10 +30,5 @@
29
32
30
30
33
    formatter << dir << "/mir_socket";
31
    formatter << dir << "/mir_socket";
31
34
32
39
35
    static auto result = formatter.str();
33
    return formatter.str();
40
36
    return result.c_str();
34
}
34
37
}
35
38
}
36
39
37
40
const char *const mir::default_server_socket = init();
38
41
41
42
35
42
=== modified file 'src/common/symbols.map'
43
--- src/common/symbols.map	2015-09-17 06:06:28 +0000
44
+++ src/common/symbols.map	2015-09-30 21:06:13 +0000
45
@@ -105,7 +105,6 @@
46
105
    
105
    
47
106
    # These symbols are supposed to be "private" (they're under src/include)
106
    # These symbols are supposed to be "private" (they're under src/include)
48
107
    # but they are used by libmirplatform, libmirclient or libmirserver
107
    # but they are used by libmirplatform, libmirclient or libmirserver
49
108
    mir::default_server_socket;
50
109
    mir::libraries_for_path*;
108
    mir::libraries_for_path*;
51
110
    mir::logging::input_timestamp*;
109
    mir::logging::input_timestamp*;
52
111
    mir::logging::log*;
110
    mir::logging::log*;
53
@@ -199,6 +198,10 @@
54
199
      mir::dispatch::ReadableFd::dispatch*;
198
      mir::dispatch::ReadableFd::dispatch*;
55
200
      mir::dispatch::ReadableFd::relevant_events*;
199
      mir::dispatch::ReadableFd::relevant_events*;
56
201
      mir::logger::Logger::log*;
200
      mir::logger::Logger::log*;
57
201
58
202
      # These symbols are supposed to be "private" (they're under src/include)
59
203
      # but they are used by libmirplatform, libmirclient or libmirserver
60
204
      mir::default_server_socket*;
61
202
    };
205
    };
62
203
  local: *;
206
  local: *;
63
204
} MIR_COMMON_5;
207
} MIR_COMMON_5;
64
205
208
65
=== modified file 'src/include/common/mir/default_configuration.h'
66
--- src/include/common/mir/default_configuration.h	2015-02-22 07:46:25 +0000
67
+++ src/include/common/mir/default_configuration.h	2015-09-30 21:06:13 +0000
68
@@ -21,9 +21,11 @@
69
21
#ifndef MIR_DEFAULT_CONFIGURATION_
21
#ifndef MIR_DEFAULT_CONFIGURATION_
70
22
#define MIR_DEFAULT_CONFIGURATION_
22
#define MIR_DEFAULT_CONFIGURATION_
71
23
23
72
24
#include <string>
73
25
74
24
namespace mir
26
namespace mir
75
25
{
27
{
77
26
extern const char *const default_server_socket;
28
extern std::string default_server_socket();
78
27
}
29
}
79
28
30
80
29
#endif
31
#endif
81
30
32
82
=== modified file 'src/platform/options/default_configuration.cpp'
83
--- src/platform/options/default_configuration.cpp	2015-09-24 15:42:21 +0000
84
+++ src/platform/options/default_configuration.cpp	2015-09-30 21:06:13 +0000
85
@@ -139,7 +139,7 @@
86
139
    add_options()
139
    add_options()
87
140
        (host_socket_opt, po::value<std::string>(),
140
        (host_socket_opt, po::value<std::string>(),
88
141
            "Host socket filename")
141
            "Host socket filename")
90
142
        (server_socket_opt, po::value<std::string>()->default_value(::mir::default_server_socket),
142
        (server_socket_opt, po::value<std::string>()->default_value(::mir::default_server_socket()),
91
143
            "Socket filename [string:default=$XDG_RUNTIME_DIR/mir_socket or /tmp/mir_socket]")
143
            "Socket filename [string:default=$XDG_RUNTIME_DIR/mir_socket or /tmp/mir_socket]")
92
144
        (no_server_socket_opt, "Do not provide a socket filename for client connections")
144
        (no_server_socket_opt, "Do not provide a socket filename for client connections")
93
145
        (arw_server_socket_opt, "Make socket filename globally rw (equivalent to chmod a=rw)")
145
        (arw_server_socket_opt, "Make socket filename globally rw (equivalent to chmod a=rw)")
Status:	Rejected
Rejected by:	Brandon Schaefer on 2015-10-05
Proposed branch:	lp:~mir-team/mir/remove-global-constructor-socket
Merge into:	lp:mir
Diff against target:	93 lines (+12/-14) 5 files modified src/client/mir_connection_api.cpp (+1/-1) src/common/env/default_configuration.cpp (+3/-10) src/common/symbols.map (+4/-1) src/include/common/mir/default_configuration.h (+3/-1) src/platform/options/default_configuration.cpp (+1/-1)
To merge this branch:	bzr merge lp:~mir-team/mir/remove-global-constructor-socket
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alan Griffiths			Needs Fixing on 2015-10-01
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-10-01
Andreas Pokorny (community)		2015-09-30	Approve on 2015-09-30
Review via email: mp+272952@code.launchpad.net