Skip to content

Commit 3f84639

Browse files
TakaHoribevividf
authored andcommittedMay 16, 2024
chore(glog): add initialization check (autowarefoundation#6792)
Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com> Signed-off-by: vividf <yihsiang.fang@tier4.jp>
1 parent 49cd55d commit 3f84639

File tree

22 files changed

+51
-36
lines changed

22 files changed

+51
-36
lines changed
 

‎common/glog_component/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ autoware_package()
88
ament_auto_add_library(glog_component SHARED
99
src/glog_component.cpp
1010
)
11-
target_link_libraries(glog_component glog)
11+
target_link_libraries(glog_component glog::glog)
1212

1313
rclcpp_components_register_node(glog_component
1414
PLUGIN "GlogComponent"

‎common/glog_component/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1414
<buildtool_depend>autoware_cmake</buildtool_depend>
1515

16-
<depend>libgoogle-glog-dev</depend>
16+
<depend>glog</depend>
1717
<depend>rclcpp</depend>
1818
<depend>rclcpp_components</depend>
1919

‎common/glog_component/src/glog_component.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
GlogComponent::GlogComponent(const rclcpp::NodeOptions & node_options)
1818
: Node("glog_component", node_options)
1919
{
20-
google::InitGoogleLogging("glog_component");
21-
google::InstallFailureSignalHandler();
20+
if (!google::IsGoogleLoggingInitialized()) {
21+
google::InitGoogleLogging("glog_component");
22+
google::InstallFailureSignalHandler();
23+
}
2224
}
2325

2426
#include <rclcpp_components/register_node_macro.hpp>

‎evaluator/perception_online_evaluator/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ autoware_package()
66

77
find_package(pluginlib REQUIRED)
88

9-
find_package(glog REQUIRED)
10-
119
ament_auto_add_library(${PROJECT_NAME}_node SHARED
1210
src/metrics_calculator.cpp
1311
src/${PROJECT_NAME}_node.cpp

‎evaluator/perception_online_evaluator/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<depend>diagnostic_msgs</depend>
2222
<depend>eigen</depend>
2323
<depend>geometry_msgs</depend>
24+
<depend>glog</depend>
2425
<depend>lanelet2_extension</depend>
25-
<depend>libgoogle-glog-dev</depend>
2626
<depend>motion_utils</depend>
2727
<depend>nav_msgs</depend>
2828
<depend>object_recognition_utils</depend>

‎evaluator/perception_online_evaluator/src/perception_online_evaluator_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ PerceptionOnlineEvaluatorNode::PerceptionOnlineEvaluatorNode(
4343
{
4444
using std::placeholders::_1;
4545

46-
google::InitGoogleLogging("perception_online_evaluator_node");
47-
google::InstallFailureSignalHandler();
46+
if (!google::IsGoogleLoggingInitialized()) {
47+
google::InitGoogleLogging("perception_online_evaluator_node");
48+
google::InstallFailureSignalHandler();
49+
}
4850

4951
objects_sub_ = create_subscription<PredictedObjects>(
5052
"~/input/objects", 1, std::bind(&PerceptionOnlineEvaluatorNode::onObjects, this, _1));

‎localization/ndt_scan_matcher/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<depend>diagnostic_msgs</depend>
2323
<depend>fmt</depend>
2424
<depend>geometry_msgs</depend>
25-
<depend>libgoogle-glog-dev</depend>
25+
<depend>glog</depend>
2626
<depend>libpcl-all-dev</depend>
2727
<depend>localization_util</depend>
2828
<depend>nav_msgs</depend>

‎localization/ndt_scan_matcher/src/ndt_scan_matcher_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020

2121
int main(int argc, char ** argv)
2222
{
23-
google::InitGoogleLogging(argv[0]); // NOLINT
24-
google::InstallFailureSignalHandler();
23+
if (!google::IsGoogleLoggingInitialized()) {
24+
google::InitGoogleLogging(argv[0]); // NOLINT
25+
google::InstallFailureSignalHandler();
26+
}
2527

2628
rclcpp::init(argc, argv);
2729
auto ndt_scan_matcher = std::make_shared<NDTScanMatcher>();

‎localization/pose_estimator_arbiter/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<depend>autoware_auto_mapping_msgs</depend>
1616
<depend>diagnostic_msgs</depend>
1717
<depend>geometry_msgs</depend>
18+
<depend>glog</depend>
1819
<depend>lanelet2_extension</depend>
19-
<depend>libgoogle-glog-dev</depend>
2020
<depend>magic_enum</depend>
2121
<depend>pcl_conversions</depend>
2222
<depend>pcl_ros</depend>

‎localization/pose_estimator_arbiter/src/pose_estimator_arbiter/pose_estimator_arbiter_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818

1919
int main(int argc, char * argv[])
2020
{
21-
google::InitGoogleLogging(argv[0]);
22-
google::InstallFailureSignalHandler();
21+
if (!google::IsGoogleLoggingInitialized()) {
22+
google::InitGoogleLogging(argv[0]);
23+
google::InstallFailureSignalHandler();
24+
}
2325

2426
rclcpp::init(argc, argv);
2527
auto node = std::make_shared<pose_estimator_arbiter::PoseEstimatorArbiter>();

‎localization/yabloc/yabloc_common/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<depend>autoware_auto_mapping_msgs</depend>
2020
<depend>cv_bridge</depend>
2121
<depend>geometry_msgs</depend>
22+
<depend>glog</depend>
2223
<depend>lanelet2_core</depend>
2324
<depend>lanelet2_extension</depend>
24-
<depend>libgoogle-glog-dev</depend>
2525
<depend>pcl_conversions</depend>
2626
<depend>rclcpp</depend>
2727
<depend>sensor_msgs</depend>

‎localization/yabloc/yabloc_common/src/ground_server/ground_server_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818

1919
int main(int argc, char ** argv)
2020
{
21-
google::InitGoogleLogging(argv[0]);
22-
google::InstallFailureSignalHandler();
21+
if (!google::IsGoogleLoggingInitialized()) {
22+
google::InitGoogleLogging(argv[0]);
23+
google::InstallFailureSignalHandler();
24+
}
2325

2426
rclcpp::init(argc, argv);
2527
rclcpp::spin(std::make_shared<yabloc::ground_server::GroundServer>());

‎localization/yabloc/yabloc_particle_filter/src/camera_corrector/camera_particle_corrector_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818

1919
int main(int argc, char * argv[])
2020
{
21-
google::InitGoogleLogging(argv[0]);
22-
google::InstallFailureSignalHandler();
21+
if (!google::IsGoogleLoggingInitialized()) {
22+
google::InitGoogleLogging(argv[0]);
23+
google::InstallFailureSignalHandler();
24+
}
2325

2426
namespace mpf = yabloc::modularized_particle_filter;
2527
rclcpp::init(argc, argv);

‎perception/map_based_prediction/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
<depend>autoware_auto_perception_msgs</depend>
1919
<depend>autoware_perception_msgs</depend>
20+
<depend>glog</depend>
2021
<depend>interpolation</depend>
2122
<depend>lanelet2_extension</depend>
22-
<depend>libgoogle-glog-dev</depend>
2323
<depend>motion_utils</depend>
2424
<depend>rclcpp</depend>
2525
<depend>rclcpp_components</depend>

‎perception/map_based_prediction/src/map_based_prediction_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -715,8 +715,10 @@ void replaceObjectYawWithLaneletsYaw(
715715
MapBasedPredictionNode::MapBasedPredictionNode(const rclcpp::NodeOptions & node_options)
716716
: Node("map_based_prediction", node_options), debug_accumulated_time_(0.0)
717717
{
718-
google::InitGoogleLogging("map_based_prediction_node");
719-
google::InstallFailureSignalHandler();
718+
if (!google::IsGoogleLoggingInitialized()) {
719+
google::InitGoogleLogging("map_based_prediction_node");
720+
google::InstallFailureSignalHandler();
721+
}
720722
enable_delay_compensation_ = declare_parameter<bool>("enable_delay_compensation");
721723
prediction_time_horizon_ = declare_parameter<double>("prediction_time_horizon");
722724
lateral_control_time_horizon_ =

‎perception/multi_object_tracker/CMakeLists.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,13 @@ ament_auto_add_library(multi_object_tracker_node SHARED
4848

4949
target_link_libraries(multi_object_tracker_node
5050
Eigen3::Eigen
51+
glog::glog
5152
)
5253

5354
ament_auto_add_executable(${PROJECT_NAME}
5455
src/multi_object_tracker_node.cpp
5556
)
5657

57-
target_link_libraries(${PROJECT_NAME}
58-
multi_object_tracker_node glog
59-
)
60-
6158
ament_auto_package(INSTALL_TO_SHARE
6259
launch
6360
config

‎perception/multi_object_tracker/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<depend>autoware_auto_perception_msgs</depend>
1717
<depend>diagnostic_updater</depend>
1818
<depend>eigen</depend>
19+
<depend>glog</depend>
1920
<depend>kalman_filter</depend>
20-
<depend>libgoogle-glog-dev</depend>
2121
<depend>mussp</depend>
2222
<depend>object_recognition_utils</depend>
2323
<depend>rclcpp</depend>

‎perception/multi_object_tracker/src/multi_object_tracker_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020

2121
int main(int argc, char ** argv)
2222
{
23-
google::InitGoogleLogging(argv[0]); // NOLINT
24-
google::InstallFailureSignalHandler();
23+
if (!google::IsGoogleLoggingInitialized()) {
24+
google::InitGoogleLogging(argv[0]); // NOLINT
25+
google::InstallFailureSignalHandler();
26+
}
2527

2628
rclcpp::init(argc, argv);
2729
rclcpp::NodeOptions options;

‎perception/radar_object_tracker/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
<depend>autoware_auto_perception_msgs</depend>
1818
<depend>eigen</depend>
19+
<depend>glog</depend>
1920
<depend>kalman_filter</depend>
2021
<depend>lanelet2_extension</depend>
21-
<depend>libgoogle-glog-dev</depend>
2222
<depend>mussp</depend>
2323
<depend>nlohmann-json-dev</depend>
2424
<depend>object_recognition_utils</depend>

‎perception/radar_object_tracker/src/radar_object_tracker_node/radar_object_tracker_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,10 @@ RadarObjectTrackerNode::RadarObjectTrackerNode(const rclcpp::NodeOptions & node_
196196
tf_listener_(tf_buffer_)
197197
{
198198
// glog for debug
199-
google::InitGoogleLogging("radar_object_tracker");
200-
google::InstallFailureSignalHandler();
199+
if (!google::IsGoogleLoggingInitialized()) {
200+
google::InitGoogleLogging("radar_object_tracker");
201+
google::InstallFailureSignalHandler();
202+
}
201203

202204
// Create publishers and subscribers
203205
detected_object_sub_ = create_subscription<autoware_auto_perception_msgs::msg::DetectedObjects>(

‎perception/tracking_object_merger/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<depend>autoware_auto_perception_msgs</depend>
1717
<depend>eigen</depend>
18-
<depend>libgoogle-glog-dev</depend>
18+
<depend>glog</depend>
1919
<depend>mussp</depend>
2020
<depend>object_recognition_utils</depend>
2121
<depend>rclcpp</depend>

‎perception/tracking_object_merger/src/decorative_tracker_merger.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@ DecorativeTrackerMergerNode::DecorativeTrackerMergerNode(const rclcpp::NodeOptio
8888
tf_listener_(tf_buffer_)
8989
{
9090
// glog for debug
91-
google::InitGoogleLogging("decorative_object_merger_node");
92-
google::InstallFailureSignalHandler();
91+
if (!google::IsGoogleLoggingInitialized()) {
92+
google::InitGoogleLogging("decorative_object_merger_node");
93+
google::InstallFailureSignalHandler();
94+
}
9395

9496
// Subscriber
9597
sub_main_objects_ = create_subscription<TrackedObjects>(

0 commit comments

Comments
 (0)