-
-
Notifications
You must be signed in to change notification settings - Fork 74
/
Copy pathros-noetic-rosconsole.patch
630 lines (555 loc) · 25.3 KB
/
ros-noetic-rosconsole.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
From 9f930c007dd40aa7ede771b8859b529e024d7bfb Mon Sep 17 00:00:00 2001
From: Daniel Reuter <[email protected]>
Date: Wed, 11 May 2022 15:28:23 +0200
Subject: [PATCH 1/4] be compatible with `log4cxx` `0.11` and `0.12`/`0.13`
[`log4cxx` uses `std::shared_ptr`](https://issues.apache.org/jira/browse/LOGCXX-486)
since [version `0.12`](https://logging.apache.org/log4cxx/latest_stable/changelog.html)
Unfortunately Ubuntu 22.04 ships with
[`0.12`](https://packages.ubuntu.com/jammy/liblog4cxx12), which means
that rosconsole with the `log4cxx` backend wouldn't compile. This is
also a problem on other distros such as Arch or Gentoo.
I have carefully applied explicit construction/conversion and `&*`
instead of `.get()` to make the code compile with both versions of
`log4cxx`.
---
src/rosconsole/impl/rosconsole_log4cxx.cpp | 19 +++--
test/thread_test.cpp | 3 +-
test/utest.cpp | 84 +++++++++++-----------
3 files changed, 54 insertions(+), 52 deletions(-)
diff --git a/src/rosconsole/impl/rosconsole_log4cxx.cpp b/src/rosconsole/impl/rosconsole_log4cxx.cpp
index 901831265..4c3b26eab 100644
--- a/src/rosconsole/impl/rosconsole_log4cxx.cpp
+++ b/src/rosconsole/impl/rosconsole_log4cxx.cpp
@@ -166,7 +166,7 @@ void initialize()
}
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME);
- logger->addAppender(new ROSConsoleStdioAppender);
+ logger->addAppender(log4cxx::AppenderPtr(new ROSConsoleStdioAppender));
#ifdef _MSC_VER
if ( ros_root_cstr != NULL ) {
free(ros_root_cstr);
@@ -200,7 +200,7 @@ bool isEnabledFor(void* handle, ::ros::console::Level level)
void* getHandle(const std::string& name)
{
- return log4cxx::Logger::getLogger(name);
+ return &*log4cxx::Logger::getLogger(name);
}
std::string getName(void* handle)
@@ -216,7 +216,7 @@ std::string getName(void* handle)
bool get_loggers(std::map<std::string, levels::Level>& loggers)
{
- log4cxx::spi::LoggerRepositoryPtr repo = log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME)->getLoggerRepository();
+ auto repo = log4cxx::spi::LoggerRepositoryPtr(log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME)->getLoggerRepository());
log4cxx::LoggerList current_loggers = repo->getCurrentLoggers();
log4cxx::LoggerList::iterator it = current_loggers.begin();
@@ -352,22 +352,21 @@ class Log4cxxAppender : public log4cxx::AppenderSkeleton
ros::console::LogAppender* appender_;
};
-Log4cxxAppender* g_log4cxx_appender = 0;
+log4cxx::AppenderPtr g_log4cxx_appender = {};
void register_appender(LogAppender* appender)
{
- g_log4cxx_appender = new Log4cxxAppender(appender);
+ g_log4cxx_appender = log4cxx::AppenderPtr( new Log4cxxAppender(appender));
const log4cxx::LoggerPtr& logger = log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME);
logger->addAppender(g_log4cxx_appender);
}
void deregister_appender(LogAppender* appender){
- if(g_log4cxx_appender->getAppender() == appender)
+ if(dynamic_cast<Log4cxxAppender*>(&*g_log4cxx_appender)->getAppender() == appender)
{
const log4cxx::LoggerPtr& logger = log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME);
logger->removeAppender(g_log4cxx_appender);
- delete g_log4cxx_appender;
- g_log4cxx_appender = 0;
+ g_log4cxx_appender = log4cxx::AppenderPtr();
}
}
void shutdown()
@@ -376,14 +375,14 @@ void shutdown()
{
const log4cxx::LoggerPtr& logger = log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME);
logger->removeAppender(g_log4cxx_appender);
- g_log4cxx_appender = 0;
+ g_log4cxx_appender = log4cxx::AppenderPtr();
}
// reset this so that the logger doesn't get crashily destroyed
// again during global destruction.
//
// See https://code.ros.org/trac/ros/ticket/3271
//
- log4cxx::Logger::getRootLogger()->getLoggerRepository()->shutdown();
+ static_cast<log4cxx::spi::LoggerRepositoryPtr>(log4cxx::Logger::getRootLogger()->getLoggerRepository())->shutdown();
}
} // namespace impl
diff --git a/test/thread_test.cpp b/test/thread_test.cpp
index 908edaef7..a7ac0375e 100644
--- a/test/thread_test.cpp
+++ b/test/thread_test.cpp
@@ -83,6 +83,7 @@ class TestAppender : public log4cxx::AppenderSkeleton
return false;
}
};
+LOG4CXX_PTR_DEF(TestAppender);
void threadFunc(boost::barrier* b)
{
@@ -95,7 +96,7 @@ TEST(Rosconsole, threadedCalls)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender( appender );
boost::thread_group tg;
diff --git a/test/utest.cpp b/test/utest.cpp
index 0357a8a3f..7ac8f7090 100644
--- a/test/utest.cpp
+++ b/test/utest.cpp
@@ -85,6 +85,7 @@ class TestAppender : public log4cxx::AppenderSkeleton
return false;
}
};
+LOG4CXX_PTR_DEF(TestAppender);
class TestAppenderWithThrow : public log4cxx::AppenderSkeleton
{
@@ -113,13 +114,14 @@ struct BasicFilter : public ros::console::FilterBase
bool enabled_;
};
+LOG4CXX_PTR_DEF(TestAppenderWithThrow);
BasicFilter g_filter(true);
#define DEFINE_COND_TESTS(name, macro_base, level, log4cxx_level) \
TEST(RosConsole, name##Cond) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_COND(true, "Testing %d %d %d", 1, 2, 3); \
macro_base##_COND(false, "Testing %d %d %d", 1, 2, 3); \
@@ -130,7 +132,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##NamedCond) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_COND_NAMED(true, "test", "Testing %d %d %d", 1, 2, 3); \
macro_base##_COND_NAMED(false, "test", "Testing %d %d %d", 1, 2, 3); \
@@ -142,7 +144,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamCond) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_COND(true, "Testing " << 1 << " " << 2 << " " << 3); \
macro_base##_STREAM_COND(false, "Testing " << 1 << " " << 2 << " " << 3); \
@@ -153,7 +155,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamCondNamed) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_COND_NAMED(true, "test", "Testing " << 1 << " " << 2 << " " << 3); \
macro_base##_STREAM_COND_NAMED(false, "test", "Testing " << 1 << " " << 2 << " " << 3); \
@@ -167,7 +169,7 @@ BasicFilter g_filter(true);
#define DEFINE_ONCE_TESTS(name, macro_base, level, log4cxx_level) \
TEST(RosConsole, name##Once) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_ONCE("Testing %d %d %d", 1, 2, 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -177,7 +179,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##NamedOnce) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_ONCE_NAMED("test", "Testing %d %d %d", 1, 2, 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -188,7 +190,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamOnce) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_ONCE("Testing " << 1 << " " << 2 << " " << 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -198,7 +200,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamOnceNamed) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_ONCE_NAMED("test", "Testing " << 1 << " " << 2 << " " << 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -211,7 +213,7 @@ BasicFilter g_filter(true);
#define DEFINE_THROTTLE_TESTS(name, macro_base, level, log4cxx_level) \
TEST(RosConsole, name##Throttle) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_THROTTLE(0.5, "Testing %d %d %d", 1, 2, 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -221,7 +223,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##NamedThrottle) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_THROTTLE_NAMED(0.5, "test", "Testing %d %d %d", 1, 2, 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -232,7 +234,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamThrottle) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_THROTTLE(0.5, "Testing " << 1 << " " << 2 << " " << 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -242,7 +244,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamThrottleNamed) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_THROTTLE_NAMED(0.5, "test", "Testing " << 1 << " " << 2 << " " << 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -255,7 +257,7 @@ BasicFilter g_filter(true);
#define DEFINE_FILTER_TESTS(name, macro_base, level, log4cxx_level) \
TEST(RosConsole, name##Filter) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_FILTER(&g_filter, "Testing %d %d %d", 1, 2, 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -265,7 +267,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##NamedFilter) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_FILTER_NAMED(&g_filter, "test", "Testing %d %d %d", 1, 2, 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -276,7 +278,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamFilter) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_FILTER(&g_filter, "Testing " << 1 << " " << 2 << " " << 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -286,7 +288,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamFilterNamed) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_FILTER_NAMED(&g_filter, "test", "Testing " << 1 << " " << 2 << " " << 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -299,7 +301,7 @@ BasicFilter g_filter(true);
#define DEFINE_LEVEL_TESTS(name, macro_base, level, log4cxx_level) \
TEST(RosConsole, name) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base("Testing %d %d %d", 1, 2, 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -309,7 +311,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##Named) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_NAMED("test", "Testing %d %d %d", 1, 2, 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -320,7 +322,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##Stream) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM("Testing " << 1 << " " << 2 << " " << 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -330,7 +332,7 @@ BasicFilter g_filter(true);
} \
TEST(RosConsole, name##StreamNamed) \
{ \
- TestAppender* appender = new TestAppender; \
+ auto appender = TestAppenderPtr(new TestAppender); \
log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME)->addAppender( appender ); \
macro_base##_STREAM_NAMED("test", "Testing " << 1 << " " << 2 << " " << 3); \
ASSERT_EQ((int)appender->info_.size(), 1); \
@@ -354,7 +356,7 @@ TEST(RosConsole, loggingLevels)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender( appender );
int pre_count = 0;
@@ -575,7 +577,7 @@ TEST(RosConsole, changingLevel)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender( appender );
logger->setLevel( log4cxx::Level::getError() );
@@ -595,7 +597,7 @@ TEST(RosConsole, changingLoggerLevel)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender( appender );
logger->setLevel(log4cxx::Level::getDebug());
@@ -629,7 +631,7 @@ TEST(RosConsole, longPrintfStyleOutput)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender( appender );
std::stringstream ss;
@@ -652,7 +654,7 @@ TEST(RosConsole, throwingAppender)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppenderWithThrow* appender = new TestAppenderWithThrow;
+ auto appender = TestAppenderWithThrowPtr(new TestAppenderWithThrow);
logger->addAppender( appender );
try
@@ -677,7 +679,7 @@ TEST(RosConsole, once)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
onceFunc();
@@ -697,7 +699,7 @@ TEST(RosConsole, throttle)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
ros::Time start = ros::Time::now();
@@ -728,7 +730,7 @@ TEST(RosConsole, delayedThrottle)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
ros::Time start = ros::Time::now();
@@ -765,7 +767,7 @@ TEST(RosConsole, onceStream)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
onceStreamFunc();
@@ -785,7 +787,7 @@ TEST(RosConsole, throttleStream)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
ros::Time start = ros::Time::now();
@@ -816,7 +818,7 @@ TEST(RosConsole, delayedStreamThrottle)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
ros::Time start = ros::Time::now();
@@ -847,7 +849,7 @@ TEST(RosConsole, basicFilter)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
BasicFilter trueFilter(true), falseFilter(false);
@@ -864,7 +866,7 @@ TEST(RosConsole, basicFilterStream)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
BasicFilter trueFilter(true), falseFilter(false);
@@ -900,7 +902,7 @@ TEST(RosConsole, advancedFilter)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
AdvancedFilter trueFilter(true), falseFilter(false);
@@ -919,7 +921,7 @@ TEST(RosConsole, advancedFilterStream)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
AdvancedFilter trueFilter(true), falseFilter(false);
@@ -949,7 +951,7 @@ TEST(RosConsole, changeFilter)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
ChangeFilter filter;
@@ -966,7 +968,7 @@ TEST(RosConsole, changeFilterStream)
{
log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(ROSCONSOLE_DEFAULT_NAME);
- TestAppender* appender = new TestAppender;
+ auto appender = TestAppenderPtr(new TestAppender);
logger->addAppender(appender);
ChangeFilter filter;
@@ -1022,7 +1024,7 @@ TEST(RosConsole, formatter)
ros::console::g_formatter.init(format_string.c_str());
result = ros::console::g_formatter.getTokenStrings(
- log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME), level, str,
+ &*log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME), level, str,
file, function, 0);
boost::regex expr("([0-9]+)\\.([0-9]+)");
@@ -1037,7 +1039,7 @@ TEST(RosConsole, formatter)
ros::console::g_formatter.init(format_string.c_str());
result = ros::console::g_formatter.getTokenStrings(
- log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME), level, str,
+ &*log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME), level, str,
file, function, 0);
boost::regex expr("([0-9]{4}) ([0-9]{2}:[0-9]{2}:[0-9]{2})");
@@ -1052,7 +1054,7 @@ TEST(RosConsole, formatter)
ros::console::g_formatter.init(format_string.c_str());
result = ros::console::g_formatter.getTokenStrings(
- log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME), level, str,
+ &*log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME), level, str,
file, function, 0);
boost::regex expr("([0-9]+)\\.([0-9]+)");
@@ -1067,7 +1069,7 @@ TEST(RosConsole, formatter)
ros::console::g_formatter.init(format_string.c_str());
result = ros::console::g_formatter.getTokenStrings(
- log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME), level, str,
+ &*log4cxx::Logger::getLogger(ROSCONSOLE_ROOT_LOGGER_NAME), level, str,
file, function, 0);
boost::regex expr("([0-9]{4}) ([0-9]{2}:[0-9]{2}:[0-9]{2})");
From deaf674ae09c5255919a99d9efdeafe0f89ffbd1 Mon Sep 17 00:00:00 2001
From: Andrey Vukolov <[email protected]>
Date: Mon, 14 Nov 2022 19:15:07 +0100
Subject: [PATCH 2/4] Compatibility for liblog4cxx v0.11-0.13
- Partially implements changes suggested both in #54 and
orphaned commit e3753eec58bf4e76012d019fd307349f94d1d0be
- Tested on liblog4cxx v0.12 and 0.13
- Sets up pointer-level compatibility with both new and old
log4cxx versions
- Adds a workaround for API breaking changes in liblog4cxx
- Testing needed
Signed-off-by: Andrey Vukolov <[email protected]>
---
src/rosconsole/impl/rosconsole_log4cxx.cpp | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/rosconsole/impl/rosconsole_log4cxx.cpp b/src/rosconsole/impl/rosconsole_log4cxx.cpp
index 4c3b26eab..d1b6c4952 100644
--- a/src/rosconsole/impl/rosconsole_log4cxx.cpp
+++ b/src/rosconsole/impl/rosconsole_log4cxx.cpp
@@ -181,10 +181,12 @@ void initialize()
void print(void* handle, ::ros::console::Level level, const char* str, const char* file, const char* function, int line)
{
+ std::string filename(file);
+ std::string short_filename = filename.substr(filename.find_last_of("/\\") + 1);
log4cxx::Logger* logger = (log4cxx::Logger*)handle;
try
{
- logger->forcedLog(g_level_lookup[level], str, log4cxx::spi::LocationInfo(file, function, line));
+ logger->forcedLog(g_level_lookup[level], str, log4cxx::spi::LocationInfo(file, short_filename.c_str(), function, line));
}
catch (std::exception& e)
{
@@ -369,6 +371,18 @@ void deregister_appender(LogAppender* appender){
g_log4cxx_appender = log4cxx::AppenderPtr();
}
}
+
+namespace {
+// log4cxx 0.11 and 0.13+ use types with operator->
+template <typename L> void shutdown_logger_repository(L l){
+ l->shutdown();
+}
+// log4cxx 0.12 uses a weakptr
+template <typename L> void shutdown_logger_repository(std::weak_ptr<L> l){
+ l.lock()->shutdown();
+}
+}
+
void shutdown()
{
if(g_log4cxx_appender)
@@ -382,7 +396,8 @@ void shutdown()
//
// See https://code.ros.org/trac/ros/ticket/3271
//
- static_cast<log4cxx::spi::LoggerRepositoryPtr>(log4cxx::Logger::getRootLogger()->getLoggerRepository())->shutdown();
+ // static_cast<log4cxx::spi::LoggerRepositoryPtr>(log4cxx::Logger::getRootLogger()->getLoggerRepository())->shutdown();
+ shutdown_logger_repository(log4cxx::Logger::getRootLogger()->getLoggerRepository());
}
} // namespace impl
From d8a41f09b64d83dc5532b40fc0f16d69708f76d6 Mon Sep 17 00:00:00 2001
From: Andrey Vukolov <[email protected]>
Date: Mon, 14 Nov 2022 19:57:10 +0100
Subject: [PATCH 3/4] Added liblog4cxx version handler
Signed-off-by: Andrey Vukolov <[email protected]>
---
src/rosconsole/impl/rosconsole_log4cxx.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/rosconsole/impl/rosconsole_log4cxx.cpp b/src/rosconsole/impl/rosconsole_log4cxx.cpp
index d1b6c4952..70504b928 100644
--- a/src/rosconsole/impl/rosconsole_log4cxx.cpp
+++ b/src/rosconsole/impl/rosconsole_log4cxx.cpp
@@ -181,12 +181,18 @@ void initialize()
void print(void* handle, ::ros::console::Level level, const char* str, const char* file, const char* function, int line)
{
+ log4cxx::Logger* logger = (log4cxx::Logger*)handle;
+#if (LOG4CXX_VERSION_MAJOR == 0) && (LOG4CXX_VERSION_MINOR > 11)
std::string filename(file);
std::string short_filename = filename.substr(filename.find_last_of("/\\") + 1);
- log4cxx::Logger* logger = (log4cxx::Logger*)handle;
try
{
logger->forcedLog(g_level_lookup[level], str, log4cxx::spi::LocationInfo(file, short_filename.c_str(), function, line));
+#else
+ try
+ {
+ logger->forcedLog(g_level_lookup[level], str, log4cxx::spi::LocationInfo(file, function, line));
+#endif
}
catch (std::exception& e)
{
From 300693deac5747b70ed19af27c36b2b90d10c80d Mon Sep 17 00:00:00 2001
From: Andrei Vukolov <[email protected]>
Date: Tue, 10 Jan 2023 19:44:27 +0100
Subject: [PATCH 4/4] Fixed compilation condition for Ubuntu LTS 22.04
---
src/rosconsole/impl/rosconsole_log4cxx.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/rosconsole/impl/rosconsole_log4cxx.cpp b/src/rosconsole/impl/rosconsole_log4cxx.cpp
index 70504b928..89403594d 100644
--- a/src/rosconsole/impl/rosconsole_log4cxx.cpp
+++ b/src/rosconsole/impl/rosconsole_log4cxx.cpp
@@ -182,7 +182,7 @@ void initialize()
void print(void* handle, ::ros::console::Level level, const char* str, const char* file, const char* function, int line)
{
log4cxx::Logger* logger = (log4cxx::Logger*)handle;
-#if (LOG4CXX_VERSION_MAJOR == 0) && (LOG4CXX_VERSION_MINOR > 11)
+#if (LOG4CXX_VERSION_MAJOR > 0) || ( (LOG4CXX_VERSION_MAJOR == 0) && (LOG4CXX_VERSION_MINOR > 11) )
std::string filename(file);
std::string short_filename = filename.substr(filename.find_last_of("/\\") + 1);
try