1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-03-28 09:50:09 +0000
3
+++ CMakeLists.txt	2013-03-29 10:46:21 +0000
4
@@ -120,6 +120,7 @@
5
120
find_package(EGL REQUIRED)
120
find_package(EGL REQUIRED)
6
121
find_package(GLESv2 REQUIRED)
121
find_package(GLESv2 REQUIRED)
7
122
find_package(Protobuf REQUIRED )
122
find_package(Protobuf REQUIRED )
8
123
find_package(GLog REQUIRED)
9
123
124
10
124
include_directories (${GLESv2_INCLUDE_DIRS})                                    
125
include_directories (${GLESv2_INCLUDE_DIRS})                                    
11
125
include_directories (${EGL_INCLUDE_DIRS})
126
include_directories (${EGL_INCLUDE_DIRS})
12
126
127
13
=== added file 'cmake/FindGLog.cmake'
14
--- cmake/FindGLog.cmake	1970-01-01 00:00:00 +0000
15
+++ cmake/FindGLog.cmake	2013-03-29 10:46:21 +0000
16
@@ -0,0 +1,14 @@
17
1
if (GLog_INCLUDE_DIR)
18
2
  # Already in cache, be silent
19
3
  set(GLog_FIND_QUIETLY TRUE)
20
4
endif ()
21
5
22
6
find_path(GLog_INCLUDE_DIR glog/logging.h)
23
7
24
8
find_library(GLog_LIBRARY libglog.so
25
9
             HINTS /usr/lib/arm-linux-gnueabihf/)
26
10
27
11
include(FindPackageHandleStandardArgs)
28
12
find_package_handle_standard_args(GLog DEFAULT_MSG GLog_LIBRARY GLog_INCLUDE_DIR)
29
13
30
14
mark_as_advanced(GLog_LIBRARY GLog_INCLUDE_DIR)
31
0
15
32
=== modified file 'cmake/FindLibHardware.cmake'
33
--- cmake/FindLibHardware.cmake	2013-03-13 04:54:15 +0000
34
+++ cmake/FindLibHardware.cmake	2013-03-29 10:46:21 +0000
35
@@ -19,7 +19,8 @@
36
19
find_library(LIBHARDWARE_LIBRARY
19
find_library(LIBHARDWARE_LIBRARY
37
20
   NAMES         libhardware.so.1 
20
   NAMES         libhardware.so.1 
38
21
                 libhardware.so 
21
                 libhardware.so 
40
22
   )
22
   HINTS /usr/lib/arm-linux-gnueabihf/
41
23
)
42
23
24
43
24
set(LIBHARDWARE_LIBRARIES ${LIBHARDWARE_LIBRARY})
25
set(LIBHARDWARE_LIBRARIES ${LIBHARDWARE_LIBRARY})
44
25
set(LIBHARDWARE_INCLUDE_DIRS ${LIBHARDWARE_INCLUDE_DIR})
26
set(LIBHARDWARE_INCLUDE_DIRS ${LIBHARDWARE_INCLUDE_DIR})
45
26
27
46
=== modified file 'cmake/LinuxCrossCompile.cmake'
47
--- cmake/LinuxCrossCompile.cmake	2013-03-13 04:54:15 +0000
48
+++ cmake/LinuxCrossCompile.cmake	2013-03-29 10:46:21 +0000
49
@@ -15,11 +15,6 @@
50
15
include_directories(SYSTEM ${MIR_NDK_PATH}/usr/include)
15
include_directories(SYSTEM ${MIR_NDK_PATH}/usr/include)
51
16
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${MIR_NDK_PATH}/usr/include")
16
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${MIR_NDK_PATH}/usr/include")
52
17
17
53
18
#add directories from the chroot to search for libraries
54
19
link_directories(${MIR_NDK_PATH}/lib/
55
20
               ${MIR_ARM_EABI}/usr/lib
56
21
               ${MIR_NDK_PATH}/usr/lib/${MIR_ARM_EABI})
57
22
58
23
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
18
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
59
24
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
19
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
60
25
set(CMAKE_EXECUTABLE_RUNTIME_C_FLAG "-Wl,-rpath-link,")
20
set(CMAKE_EXECUTABLE_RUNTIME_C_FLAG "-Wl,-rpath-link,")
61
26
21
62
=== added file 'include/server/mir/logging/glog_logger.h'
63
--- include/server/mir/logging/glog_logger.h	1970-01-01 00:00:00 +0000
64
+++ include/server/mir/logging/glog_logger.h	2013-03-29 10:46:21 +0000
65
@@ -0,0 +1,41 @@
66
1
/*
67
2
 * Copyright © 2013 Canonical Ltd.
68
3
 *
69
4
 * This program is free software: you can redistribute it and/or modify
70
5
 * it under the terms of the GNU General Public License version 3 as
71
6
 * published by the Free Software Foundation.
72
7
 *
73
8
 * This program is distributed in the hope that it will be useful,
74
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
75
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
76
11
 * GNU General Public License for more details.
77
12
 *
78
13
 * You should have received a copy of the GNU General Public License
79
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
80
15
 *
81
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
82
17
 */
83
18
84
19
#include "mir/logging/logger.h"
85
20
86
21
namespace mir
87
22
{
88
23
namespace logging
89
24
{
90
25
class GlogLogger : public Logger
91
26
{
92
27
public:
93
28
    GlogLogger(
94
29
        char const* argv0,
95
30
        int stderrthreshold,
96
31
        int minloglevel,
97
32
        std::string const& log_dir);
98
33
99
34
private:
100
35
    virtual void log(
101
36
        Severity severity,
102
37
        const std::string& message,
103
38
        const std::string& component);
104
39
};
105
40
}
106
41
}
107
0
42
108
=== modified file 'include/server/mir/logging/logger.h'
109
--- include/server/mir/logging/logger.h	2013-03-13 04:54:15 +0000
110
+++ include/server/mir/logging/logger.h	2013-03-29 10:46:21 +0000
111
@@ -39,8 +39,6 @@
112
39
        debug = 4
39
        debug = 4
113
40
    };
40
    };
114
41
41
115
42
    virtual ~Logger() {}
116
43
117
44
    template<Severity severity>
42
    template<Severity severity>
118
45
    void log(const std::string& message)
43
    void log(const std::string& message)
119
46
    {
44
    {
120
@@ -56,6 +54,7 @@
121
56
54
122
57
protected:
55
protected:
123
58
    Logger() {}
56
    Logger() {}
124
57
    virtual ~Logger() = default;
125
59
    Logger(const Logger&) = delete;
58
    Logger(const Logger&) = delete;
126
60
    Logger& operator=(const Logger&) = delete;
59
    Logger& operator=(const Logger&) = delete;
127
61
60
128
62
61
129
=== modified file 'src/server/CMakeLists.txt'
130
--- src/server/CMakeLists.txt	2013-03-28 12:13:18 +0000
131
+++ src/server/CMakeLists.txt	2013-03-29 10:46:21 +0000
132
@@ -20,6 +20,9 @@
133
20
  ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
20
  ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
134
21
)
21
)
135
22
22
136
23
MESSAGE(STATUS "GLog_LIBRARY=" ${GLog_LIBRARY})
137
24
MESSAGE(STATUS "GLog_LIBRARY=" ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
138
25
139
23
set(
26
set(
140
24
  SRCS
27
  SRCS
141
25
  run_mir.cpp
28
  run_mir.cpp
142
@@ -57,6 +60,7 @@
143
57
  mirprotobuf
60
  mirprotobuf
144
58
  3rd_party
61
  3rd_party
145
59
  ${Boost_LIBRARIES}
62
  ${Boost_LIBRARIES}
146
63
  ${GLog_LIBRARY}
147
60
)
64
)
148
61
65
149
62
if(${MIRSERVER_LINKAGE} STREQUAL SHARED)
66
if(${MIRSERVER_LINKAGE} STREQUAL SHARED)
150
63
67
151
=== modified file 'src/server/default_server_configuration.cpp'
152
--- src/server/default_server_configuration.cpp	2013-03-28 09:47:22 +0000
153
+++ src/server/default_server_configuration.cpp	2013-03-29 10:46:21 +0000
154
@@ -46,6 +46,7 @@
155
46
#include "mir/input/input_manager.h"
46
#include "mir/input/input_manager.h"
156
47
#include "mir/logging/logger.h"
47
#include "mir/logging/logger.h"
157
48
#include "mir/logging/dumb_console_logger.h"
48
#include "mir/logging/dumb_console_logger.h"
158
49
#include "mir/logging/glog_logger.h"
159
49
#include "mir/logging/session_mediator_report.h"
50
#include "mir/logging/session_mediator_report.h"
160
50
#include "mir/logging/message_processor_report.h"
51
#include "mir/logging/message_processor_report.h"
161
51
#include "mir/logging/display_report.h"
52
#include "mir/logging/display_report.h"
162
@@ -125,6 +126,11 @@
163
125
char const* const log_msg_processor = "log-msg-processor";
126
char const* const log_msg_processor = "log-msg-processor";
164
126
char const* const log_display      = "log-display";
127
char const* const log_display      = "log-display";
165
127
128
166
129
char const* const glog                 = "glog";
167
130
char const* const glog_stderrthreshold = "glog-stderrthreshold";
168
131
char const* const glog_minloglevel     = "glog-minloglevel";
169
132
char const* const glog_log_dir         = "glog-log-dir";
170
133
171
128
boost::program_options::options_description program_options()
134
boost::program_options::options_description program_options()
172
129
{
135
{
173
130
    namespace po = boost::program_options;
136
    namespace po = boost::program_options;
174
@@ -133,13 +139,26 @@
175
133
        "Command-line options.\n"
139
        "Command-line options.\n"
176
134
        "Environment variables capitalise long form with prefix \"MIR_SERVER_\" and \"_\" in place of \"-\"");
140
        "Environment variables capitalise long form with prefix \"MIR_SERVER_\" and \"_\" in place of \"-\"");
177
135
    desc.add_options()
141
    desc.add_options()
182
136
        ("file,f", po::value<std::string>(), "socket filename")
142
        ("file,f", po::value<std::string>(),    "Socket filename")
183
137
        ("ipc-thread-pool,i", po::value<int>(), "threads in frontend thread pool")
143
        (log_display, po::value<bool>(),        "Log the Display report. [bool:default=false]")
184
138
        (log_display, po::value<bool>(), "log the Display report")
144
        (log_app_mediator, po::value<bool>(),   "Log the ApplicationMediator report. [bool:default=false]")
181
139
        (log_app_mediator, po::value<bool>(), "log the ApplicationMediator report")
185
140
        (log_msg_processor, po::value<bool>(), "log the MessageProcessor report")
145
        (log_msg_processor, po::value<bool>(), "log the MessageProcessor report")
188
141
        ("tests-use-real-graphics", po::value<bool>(), "use real graphics in tests")
146
        (glog,                                  "Use google::GLog for logging")
189
142
        ("tests-use-real-input", po::value<bool>(), "use real input in tests");
147
        (glog_stderrthreshold, po::value<int>(),"Copy log messages at or above this level "
190
148
                                                "to stderr in addition to logfiles. The numbers "
191
149
                                                "of severity levels INFO, WARNING, ERROR, and "
192
150
                                                "FATAL are 0, 1, 2, and 3, respectively."
193
151
                                                " [int:default=2]")
194
152
        (glog_minloglevel, po::value<int>(),    "Log messages at or above this level. The numbers "
195
153
                                                "of severity levels INFO, WARNING, ERROR, and "
196
154
                                                "FATAL are 0, 1, 2, and 3, respectively."
197
155
                                                " [int:default=0]")
198
156
        (glog_log_dir, po::value<std::string>(),"If specified, logfiles are written into this "
199
157
                                                "directory instead of the default logging directory."
200
158
                                                " [string:default=\"\"]")
201
159
        ("ipc-thread-pool,i", po::value<int>(), "threads in frontend thread pool. [int:default=10]")
202
160
        ("tests-use-real-graphics", po::value<bool>(), "Use real graphics in tests. [bool:default=false]")
203
161
        ("tests-use-real-input", po::value<bool>(), "Use real input in tests. [bool:default=false]");
204
143
162
205
144
    return desc;
163
    return desc;
206
145
}
164
}
207
@@ -456,10 +475,20 @@
208
456
std::shared_ptr<ml::Logger> mir::DefaultServerConfiguration::the_logger()
475
std::shared_ptr<ml::Logger> mir::DefaultServerConfiguration::the_logger()
209
457
{
476
{
210
458
    return logger(
477
    return logger(
212
459
        [this]()
478
        [this]() -> std::shared_ptr<ml::Logger>
213
460
        {
479
        {
216
461
            // TODO use the_options() to configure logging
480
            if (the_options()->is_set(glog))
217
462
            return std::make_shared<ml::DumbConsoleLogger>();
481
            {
218
482
                return std::make_shared<ml::GlogLogger>(
219
483
                    "mir",
220
484
                    the_options()->get(glog_stderrthreshold, 2),
221
485
                    the_options()->get(glog_minloglevel, 0),
222
486
                    the_options()->get(glog_log_dir, ""));
223
487
            }
224
488
            else
225
489
            {
226
490
                return std::make_shared<ml::DumbConsoleLogger>();
227
491
            }
228
463
        });
492
        });
229
464
}
493
}
230
465
494
231
466
495
232
=== modified file 'src/server/logging/CMakeLists.txt'
233
--- src/server/logging/CMakeLists.txt	2013-03-25 15:15:53 +0000
234
+++ src/server/logging/CMakeLists.txt	2013-03-29 10:46:21 +0000
235
@@ -2,6 +2,7 @@
236
2
  LOGGING_SOURCES
2
  LOGGING_SOURCES
237
3
3
238
4
  dumb_console_logger.cpp
4
  dumb_console_logger.cpp
239
5
  glog_logger.cpp
240
5
  session_mediator_report.cpp
6
  session_mediator_report.cpp
241
6
  message_processor_report.cpp
7
  message_processor_report.cpp
242
7
  display_report.cpp
8
  display_report.cpp
243
8
9
244
=== added file 'src/server/logging/glog_logger.cpp'
245
--- src/server/logging/glog_logger.cpp	1970-01-01 00:00:00 +0000
246
+++ src/server/logging/glog_logger.cpp	2013-03-29 10:46:21 +0000
247
@@ -0,0 +1,55 @@
248
1
/*
249
2
 * Copyright © 2013 Canonical Ltd.
250
3
 *
251
4
 * This program is free software: you can redistribute it and/or modify
252
5
 * it under the terms of the GNU General Public License version 3 as
253
6
 * published by the Free Software Foundation.
254
7
 *
255
8
 * This program is distributed in the hope that it will be useful,
256
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
257
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
258
11
 * GNU General Public License for more details.
259
12
 *
260
13
 * You should have received a copy of the GNU General Public License
261
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
262
15
 *
263
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
264
17
 */
265
18
266
19
#include "mir/logging/glog_logger.h"
267
20
268
21
#include <glog/logging.h>
269
22
270
23
#include <mutex>
271
24
#include <cstdlib>
272
25
273
26
mir::logging::GlogLogger::GlogLogger(
274
27
    const char* argv0,
275
28
    int stderrthreshold,
276
29
    int minloglevel,
277
30
    std::string const& log_dir)
278
31
{
279
32
    FLAGS_stderrthreshold = stderrthreshold;
280
33
    FLAGS_minloglevel     = minloglevel;
281
34
    FLAGS_log_dir         = log_dir;
282
35
283
36
    static std::once_flag init_flag;
284
37
285
38
    std::call_once(init_flag, [=]() { google::InitGoogleLogging(argv0); });
286
39
}
287
40
288
41
void mir::logging::GlogLogger::log(Severity severity, const std::string& message, const std::string& component)
289
42
{
290
43
    static int glog_level[] =
291
44
    {
292
45
        google::GLOG_FATAL,     // critical = 0,
293
46
        google::GLOG_ERROR,     // error = 1,
294
47
        google::GLOG_WARNING,   // warning = 2,
295
48
        google::GLOG_INFO,      // informational = 3,
296
49
        google::GLOG_INFO,      // debug = 4
297
50
    };
298
51
299
52
    // Since we're not collecting __FILE__ or __LINE__ this is misleading
300
53
    google::LogMessage(__FILE__, __LINE__, glog_level[severity]).stream()
301
54
        << '[' << component << "] " << message;
302
55
}
303
0
56
304
=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display.cpp'
305
--- tests/unit-tests/graphics/gbm/test_gbm_display.cpp	2013-03-13 08:09:52 +0000
306
+++ tests/unit-tests/graphics/gbm/test_gbm_display.cpp	2013-03-29 10:46:21 +0000
307
@@ -44,6 +44,8 @@
308
44
{
44
{
309
45
    MOCK_METHOD3(log,
45
    MOCK_METHOD3(log,
310
46
                 void(ml::Logger::Severity, const std::string&, const std::string&));
46
                 void(ml::Logger::Severity, const std::string&, const std::string&));
311
47
312
48
    ~MockLogger() noexcept(true) {}
313
47
};
49
};
314
48
50
315
49
class GBMDisplayTest : public ::testing::Test
51
class GBMDisplayTest : public ::testing::Test
316
50
52
317
=== modified file 'tests/unit-tests/logging/message_processor_report.cpp'
318
--- tests/unit-tests/logging/message_processor_report.cpp	2013-03-27 17:18:33 +0000
319
+++ tests/unit-tests/logging/message_processor_report.cpp	2013-03-29 10:46:21 +0000
320
@@ -40,6 +40,7 @@
321
40
{
40
{
322
41
public:
41
public:
323
42
    MOCK_METHOD3(log, void(Severity severity, const std::string& message, const std::string& component));
42
    MOCK_METHOD3(log, void(Severity severity, const std::string& message, const std::string& component));
324
43
    ~MockLogger() noexcept(true) {}
325
43
};
44
};
326
44
45
327
45
struct MessageProcessorReport : public Test
46
struct MessageProcessorReport : public Test
328
46
47
329
=== modified file 'tools/setup-partial-armhf-chroot.sh'
330
--- tools/setup-partial-armhf-chroot.sh	2013-03-26 15:55:51 +0000
331
+++ tools/setup-partial-armhf-chroot.sh	2013-03-29 10:46:21 +0000
332
@@ -86,6 +86,12 @@
333
86
    if [ ! -f libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb ]; then
86
    if [ ! -f libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb ]; then
334
87
        wget "http://launchpadlibrarian.net/134086853/libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb"
87
        wget "http://launchpadlibrarian.net/134086853/libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb"
335
88
    fi
88
    fi
336
89
337
90
    if [ ! -f libgflags-dev_2.0-1_armhf.deb ]; then
338
91
        wget "http://launchpadlibrarian.net/106868249/libgflags-dev_2.0-1_armhf.deb"
339
92
    fi
340
93
341
94
    dpkg -x libgflags-dev_2.0-1_armhf.deb .
342
89
    dpkg -x libgflags2_2.0-1_armhf.deb .
95
    dpkg -x libgflags2_2.0-1_armhf.deb .
343
90
    dpkg -x libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb .
96
    dpkg -x libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb .
344
91
    dpkg -x libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb .
97
    dpkg -x libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb .
Status:	Merged
Approved by:	Alan Griffiths on 2013-03-29
Approved revision:	no longer in the source branch.
Merged at revision:	546
Proposed branch:	lp:~alan-griffiths/mir/add-glog-logging
Merge into:	lp:~mir-team/mir/trunk
Diff against target:	344 lines (+166/-17) 13 files modified CMakeLists.txt (+1/-0) cmake/FindGLog.cmake (+14/-0) cmake/FindLibHardware.cmake (+2/-1) cmake/LinuxCrossCompile.cmake (+0/-5) include/server/mir/logging/glog_logger.h (+41/-0) include/server/mir/logging/logger.h (+1/-2) src/server/CMakeLists.txt (+4/-0) src/server/default_server_configuration.cpp (+38/-9) src/server/logging/CMakeLists.txt (+1/-0) src/server/logging/glog_logger.cpp (+55/-0) tests/unit-tests/graphics/gbm/test_gbm_display.cpp (+2/-0) tests/unit-tests/logging/message_processor_report.cpp (+1/-0) tools/setup-partial-armhf-chroot.sh (+6/-0)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/add-glog-logging
Related bugs:	Link a bug report
Related blueprints:	Mir on the Phone (iteration 0) (Undefined)
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2013-03-15	Approve on 2013-03-29
Alexandros Frantzis (community)			Approve on 2013-03-29
Kevin DuBois (community)		2013-03-15	Approve on 2013-03-29
Alan Griffiths			Pending
Review via email: mp+153568@code.launchpad.net