Skip to content

Commit ad74f34

Browse files
committed
fix more warnings
1 parent fe25d7c commit ad74f34

39 files changed

Lines changed: 293 additions & 361 deletions

‎.clang-tidy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
Checks: '-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,misc-*,modernize-*,performance-*,portability-*,readability-*,-modernize-use-trailing-return-type,-readability-identifier-length,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-readability-magic-numbers,-bugprone-easily-swappable-parameters,-performance-avoid-endl,-cert-err58-cpp,-modernize-use-emplace,-misc-no-recursion,-misc-include-cleaner,-misc-use-internal-linkage'
2+
Checks: '-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,misc-*,modernize-*,performance-*,portability-*,readability-*,-modernize-use-trailing-return-type,-readability-identifier-length,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-readability-magic-numbers,-bugprone-easily-swappable-parameters,-performance-avoid-endl,-cert-err58-cpp,-modernize-use-emplace,-misc-no-recursion,-misc-include-cleaner,-misc-use-internal-linkage,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-noexcept-move-operations,-performance-noexcept-move-constructor,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-bugprone-exception-escape,-cert-oop54-cpp,-modernize-use-designated-initializers,-cppcoreguidelines-prefer-member-initializer,-cppcoreguidelines-macro-usage,-cppcoreguidelines-avoid-c-arrays,-modernize-avoid-c-arrays,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-special-member-functions,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-avoid-const-or-ref-data-members,-bugprone-branch-clone,-cppcoreguidelines-pro-type-member-init,-cert-err33-c,-bugprone-narrowing-conversions,-cppcoreguidelines-narrowing-conversions,-clang-analyzer-optin.cplusplus.VirtualCall,-cppcoreguidelines-use-default-member-init,-modernize-use-default-member-init,-cppcoreguidelines-init-variables,-cert-msc32-c,-cert-msc51-cpp,-bugprone-reserved-identifier,-cert-dcl37-c,-cert-dcl51-cpp,-cppcoreguidelines-pro-type-vararg'
33

44

5-
WarningsAsErrors: '-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,misc-*,portability-*,readability-implicit-bool-conversion,-concurrency-mt-unsafe'
5+
WarningsAsErrors: '-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,misc-*,portability-*,readability-implicit-bool-conversion,-concurrency-mt-unsafe,-readability-function-cognitive-complexity'
66

77
CheckOptions:
88
# ignore macros when computing the cyclomatic complexity. problem caused by RCLCPP LOG macros

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ CMakeUserPresets.json
1919

2020
tags
2121
/clang_tidy_output.log
22+
/.clang-tidy-venv/*
23+
/llvm.sh

‎include/behaviortree_cpp/actions/pop_from_queue.hpp‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,12 @@ class PopFromQueue : public SyncActionNode
7171
{
7272
return NodeStatus::FAILURE;
7373
}
74-
else
75-
{
76-
T val = items.front();
77-
items.pop_front();
78-
setOutput("popped_item", val);
79-
return NodeStatus::SUCCESS;
80-
}
81-
}
82-
else
83-
{
84-
return NodeStatus::FAILURE;
74+
T val = items.front();
75+
items.pop_front();
76+
setOutput("popped_item", val);
77+
return NodeStatus::SUCCESS;
8578
}
79+
return NodeStatus::FAILURE;
8680
}
8781

8882
static PortsList providedPorts()
@@ -125,11 +119,8 @@ class QueueSize : public SyncActionNode
125119
{
126120
return NodeStatus::FAILURE;
127121
}
128-
else
129-
{
130-
setOutput("size", int(items.size()));
131-
return NodeStatus::SUCCESS;
132-
}
122+
setOutput("size", int(items.size()));
123+
return NodeStatus::SUCCESS;
133124
}
134125
return NodeStatus::FAILURE;
135126
}

‎include/behaviortree_cpp/utils/locked_reference.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class LockedPtr
2525

2626
~LockedPtr()
2727
{
28-
if(mutex_)
28+
if(mutex_ != nullptr)
2929
{
3030
mutex_->unlock();
3131
}
@@ -53,15 +53,15 @@ class LockedPtr
5353

5454
void lock()
5555
{
56-
if(mutex_)
56+
if(mutex_ != nullptr)
5757
{
5858
mutex_->lock();
5959
}
6060
}
6161

6262
void unlock()
6363
{
64-
if(mutex_)
64+
if(mutex_ != nullptr)
6565
{
6666
mutex_->unlock();
6767
}

‎include/behaviortree_cpp/utils/simple_string.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ class SimpleString
9999

100100
bool operator==(const SimpleString& other) const
101101
{
102-
size_t N = size();
102+
const size_t N = size();
103103
return other.size() == N && std::strncmp(data(), other.data(), N) == 0;
104104
}
105105

106106
bool operator!=(const SimpleString& other) const
107107
{
108-
size_t N = size();
108+
const size_t N = size();
109109
return other.size() != N || std::strncmp(data(), other.data(), N) != 0;
110110
}
111111

@@ -131,7 +131,7 @@ class SimpleString
131131

132132
bool isSOO() const
133133
{
134-
return !(_storage.soo.capacity_left & IS_LONG_BIT);
134+
return (_storage.soo.capacity_left & IS_LONG_BIT) == 0;
135135
}
136136

137137
private:

‎include/behaviortree_cpp/utils/wildcards.hpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#pragma once
22

3+
#include <cstddef>
4+
#include <cstdint>
5+
#include <string_view>
6+
#include <vector>
7+
38
/**
49
* @file wildcards.hpp
510
* @brief Simple wildcard matching function supporting '*' and '?'.

‎run_clang_tidy.sh‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,40 @@
33
script_dir=${0%/*}
44
ws_dir=$(realpath "$script_dir")
55

6+
# Check if clangd-21 is available
7+
if ! command -v clangd-21 &> /dev/null; then
8+
echo "Error: clangd-21 is not installed or not in PATH."
9+
echo ""
10+
echo "To install clangd-21 on Ubuntu/Debian, visit:"
11+
echo " https://apt.llvm.org/"
12+
echo ""
13+
echo "Quick install instructions:"
14+
echo " wget https://apt.llvm.org/llvm.sh"
15+
echo " chmod +x llvm.sh"
16+
echo " sudo ./llvm.sh 21"
17+
echo " sudo apt install clangd-21 clangd-tidy-21"
18+
exit 1
19+
fi
20+
621
# Display help message if --help is passed as an argument
722
if [[ "${1:-}" == "--help" ]]; then
823
echo "Usage: $(basename "$0") [source_path] [build_path]"
924
echo "Run clang-tidy on the specified paths."
1025
echo
1126
echo "Arguments:"
12-
echo " source_path Paths to run clang-tidy on (default: src include)"
1327
echo " build_path Path to build directory containing compile_commands.json (default: build)"
1428
exit 0
1529
fi
1630

17-
# Use the first argument as clang_tidy_paths if provided, otherwise default to src and include
18-
if [ -n "${1:-}" ]; then
19-
clang_tidy_paths="$ws_dir/$1"
20-
else
21-
clang_tidy_paths="$ws_dir/src $ws_dir/include"
22-
fi
2331

24-
cmake_build_path="$ws_dir/${2:-build}"
32+
clang_tidy_paths="$ws_dir/src $ws_dir/include"
33+
cmake_build_path="$ws_dir/${1:-build}"
2534
log_file="$ws_dir/clang_tidy_output.log"
2635

2736
skip_list=(
2837
"$ws_dir/3rdparty"
2938
"$ws_dir/include/behaviortree_cpp/contrib"
30-
"$ws_dir/src/shared_library_WIN.cpp"
39+
"$ws_dir/include/behaviortree_cpp/scripting"
3140
)
3241

3342
skip_paths=()
@@ -55,15 +64,17 @@ for path in "${skip_list[@]}"; do
5564
done
5665
echo "-----------------------------------------------------------"
5766

58-
find $clang_tidy_paths \( -name '*.cpp' -o -name '*.hpp' \) "${skip_paths[@]}" -not -name "*_WIN.cpp" -print0 \
67+
find $clang_tidy_paths \( -name '*.cpp' -o -name '*.hpp' \) -not -name '*_WIN.cpp' "${skip_paths[@]}" -print0 \
5968
| xargs -0 -n 1 -P $(nproc) bash -c '
6069
set -o pipefail
6170
echo "$@"
62-
clang-tidy \
63-
--config-file="'"$ws_dir"'/.clang-tidy" \
64-
-p '"$cmake_build_path"' \
65-
"$@" \
66-
2>&1 | tee -a '"$log_file"'
71+
cd "'"$ws_dir"'" && clangd-21 \
72+
--log=error \
73+
--clang-tidy \
74+
--compile-commands-dir="'"$cmake_build_path"'" \
75+
--check-locations=false \
76+
--check="$@" \
77+
2>&1 | sed "s/^/${1//\//\\/}: /" | tee -a '"$log_file"'
6778
' _
6879

6980
echo "-----------------------------------------------------------"

‎src/action_node.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ NodeStatus SimpleActionNode::tick()
3939
prev_status = NodeStatus::RUNNING;
4040
}
4141

42-
NodeStatus status = tick_functor_(*this);
42+
const NodeStatus status = tick_functor_(*this);
4343
if(status != prev_status)
4444
{
4545
setStatus(status);
@@ -80,7 +80,7 @@ CoroActionNode::CoroActionNode(const std::string& name, const NodeConfig& config
8080
: ActionNodeBase(name, config), _p(new Pimpl)
8181
{}
8282

83-
CoroActionNode::~CoroActionNode()
83+
CoroActionNode::~CoroActionNode() // NOLINT(bugprone-exception-escape)
8484
{
8585
destroyCoroutine();
8686
}
@@ -100,7 +100,7 @@ NodeStatus CoroActionNode::executeTick()
100100
_p->desc = mco_desc_init(CoroEntry, 0);
101101
_p->desc.user_data = this;
102102

103-
mco_result res = mco_create(&_p->coro, &_p->desc);
103+
const mco_result res = mco_create(&_p->coro, &_p->desc);
104104
if(res != MCO_SUCCESS)
105105
{
106106
throw RuntimeError("Can't create coroutine");
@@ -134,9 +134,9 @@ void CoroActionNode::halt()
134134

135135
void CoroActionNode::destroyCoroutine()
136136
{
137-
if(_p->coro)
137+
if(_p->coro != nullptr)
138138
{
139-
mco_result res = mco_destroy(_p->coro);
139+
const mco_result res = mco_destroy(_p->coro);
140140
if(res != MCO_SUCCESS)
141141
{
142142
throw RuntimeError("Can't destroy coroutine");
@@ -156,7 +156,7 @@ NodeStatus StatefulActionNode::tick()
156156

157157
if(prev_status == NodeStatus::IDLE)
158158
{
159-
NodeStatus new_status = onStart();
159+
const NodeStatus new_status = onStart();
160160
if(new_status == NodeStatus::IDLE)
161161
{
162162
throw LogicError("StatefulActionNode::onStart() must not return IDLE");
@@ -166,7 +166,7 @@ NodeStatus StatefulActionNode::tick()
166166
//------------------------------------------
167167
if(prev_status == NodeStatus::RUNNING)
168168
{
169-
NodeStatus new_status = onRunning();
169+
const NodeStatus new_status = onRunning();
170170
if(new_status == NodeStatus::IDLE)
171171
{
172172
throw LogicError("StatefulActionNode::onRunning() must not return IDLE");
@@ -210,15 +210,15 @@ NodeStatus BT::ThreadedAction::executeTick()
210210
<< name() << "]\n"
211211
<< std::endl;
212212
// Set the exception pointer and the status atomically.
213-
lock_type l(mutex_);
213+
const lock_type l(mutex_);
214214
exptr_ = std::current_exception();
215215
setStatus(BT::NodeStatus::IDLE);
216216
}
217217
emitWakeUpSignal();
218218
});
219219
}
220220

221-
lock_type l(mutex_);
221+
const lock_type l(mutex_);
222222
if(exptr_)
223223
{
224224
// The official interface of std::exception_ptr does not define any move

‎src/actions/sleep_node.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ NodeStatus SleepNode::onStart()
2525
timer_waiting_ = true;
2626

2727
timer_id_ = timer_.add(std::chrono::milliseconds(msec), [this](bool aborted) {
28-
std::unique_lock<std::mutex> lk(delay_mutex_);
28+
const std::unique_lock<std::mutex> lk(delay_mutex_);
2929
if(!aborted)
3030
{
3131
emitWakeUpSignal();

‎src/actions/updated_action.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ NodeStatus EntryUpdatedAction::tick()
4040
{
4141
if(auto entry = config().blackboard->getEntry(entry_key_))
4242
{
43-
std::unique_lock lk(entry->entry_mutex);
43+
const std::unique_lock lk(entry->entry_mutex);
4444
const uint64_t current_id = entry->sequence_id;
4545
const uint64_t previous_id = sequence_id_;
4646
sequence_id_ = current_id;

0 commit comments

Comments
 (0)