Skip to content

Commit 51d1af9

Browse files
authored
[Core] Cover cpplint for ray/src/ray/raylet (#51399)
Ensure all `.h` and `.cc` files in `src/ray/raylet` comply with cpplint rules. Note: `scheduling` folder is not included Closes: #50687 --------- Signed-off-by: 400Ping <43886578+400Ping@users.noreply.github.com> Signed-off-by: Ping <43886578+400Ping@users.noreply.github.com>
1 parent f927e0f commit 51d1af9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+192
-30
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ repos:
4747
hooks:
4848
- id: cpplint
4949
args: ["--filter=-whitespace/braces,-whitespace/line_length,-build/c++11,-build/c++14,-build/c++17,-readability/braces,-whitespace/indent_namespace,-runtime/int,-runtime/references,-build/include_order"]
50-
files: ^src/ray/(util|raylet_client|internal|scheduling|pubsub|object_manager|gcs|rpc(?:/.*)?)/.*\.(h|cc)$
50+
files: ^src/ray/(util|raylet_client|internal|scheduling|pubsub|object_manager|rpc(?:/.*)?|raylet)/.*\.(h|cc)$
51+
exclude: ^src/ray/raylet/scheduling/.*\.(h|cc)$
5152

5253
- repo: https://github.com/keith/pre-commit-buildifier
5354
rev: 8.0.1

src/ray/raylet/agent_manager.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414

1515
#include "ray/raylet/agent_manager.h"
1616

17+
#include <memory>
18+
#include <string>
1719
#include <thread>
20+
#include <vector>
1821

1922
#include "ray/common/ray_config.h"
2023
#include "ray/util/event.h"

src/ray/raylet/agent_manager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <atomic>
1818
#include <boost/asio/deadline_timer.hpp>
1919
#include <csignal>
20+
#include <memory>
2021
#include <string>
2122
#include <utility>
2223
#include <vector>

src/ray/raylet/dependency_manager.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414

1515
#include "ray/raylet/dependency_manager.h"
1616

17+
#include <memory>
18+
#include <string>
19+
#include <utility>
20+
#include <vector>
21+
1722
namespace ray {
1823

1924
namespace raylet {

src/ray/raylet/dependency_manager.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414

1515
#pragma once
1616

17+
#include <memory>
18+
#include <string>
19+
#include <unordered_set>
20+
#include <utility>
21+
#include <vector>
22+
1723
#include "ray/common/common_protocol.h"
1824
#include "ray/common/id.h"
1925
#include "ray/common/task/task.h"
@@ -49,7 +55,7 @@ class TaskDependencyManagerInterface {
4955
class DependencyManager : public TaskDependencyManagerInterface {
5056
public:
5157
/// Create a task dependency manager.
52-
DependencyManager(ObjectManagerInterface &object_manager)
58+
explicit DependencyManager(ObjectManagerInterface &object_manager)
5359
: object_manager_(object_manager) {
5460
waiting_tasks_counter_.SetOnChangeCallback(
5561
[this](std::pair<std::string, bool> key) mutable {
@@ -200,7 +206,7 @@ class DependencyManager : public TaskDependencyManagerInterface {
200206
/// Metadata for an object that is needed by at least one executing worker
201207
/// and/or one queued task.
202208
struct ObjectDependencies {
203-
ObjectDependencies(const rpc::ObjectReference &ref)
209+
explicit ObjectDependencies(const rpc::ObjectReference &ref)
204210
: owner_address(ref.owner_address()) {}
205211
/// The tasks that depend on this object, either because the object is a task argument
206212
/// or because the task called `ray.get` on the object.

src/ray/raylet/dependency_manager_test.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
#include "ray/raylet/dependency_manager.h"
1616

1717
#include <list>
18+
#include <string>
19+
#include <unordered_set>
20+
#include <utility>
21+
#include <vector>
1822

1923
#include "gmock/gmock.h"
2024
#include "gtest/gtest.h"
@@ -82,7 +86,7 @@ class DependencyManagerTest : public ::testing::Test {
8286
ASSERT_TRUE(dependency_manager_.queued_task_requests_.empty());
8387
ASSERT_TRUE(dependency_manager_.get_requests_.empty());
8488
ASSERT_TRUE(dependency_manager_.wait_requests_.empty());
85-
ASSERT_TRUE(dependency_manager_.waiting_tasks_counter_.Total() == 0);
89+
ASSERT_EQ(dependency_manager_.waiting_tasks_counter_.Total(), 0);
8690
// All pull requests are canceled.
8791
ASSERT_TRUE(object_manager_mock_.active_task_requests.empty());
8892
ASSERT_TRUE(object_manager_mock_.active_get_requests.empty());

src/ray/raylet/local_object_manager.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414

1515
#include "ray/raylet/local_object_manager.h"
1616

17+
#include <algorithm>
18+
#include <memory>
19+
#include <string>
20+
#include <utility>
21+
#include <vector>
22+
1723
#include "ray/common/asio/instrumented_io_context.h"
1824
#include "ray/stats/metric_defs.h"
1925
#include "ray/util/util.h"

src/ray/raylet/local_object_manager.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
#include <google/protobuf/repeated_field.h>
1818

1919
#include <functional>
20+
#include <memory>
21+
#include <queue>
22+
#include <string>
23+
#include <vector>
2024

2125
#include "ray/common/id.h"
2226
#include "ray/common/ray_object.h"

src/ray/raylet/local_task_manager.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616

1717
#include <google/protobuf/map.h>
1818

19+
#include <algorithm>
1920
#include <boost/range/join.hpp>
21+
#include <limits>
22+
#include <memory>
23+
#include <string>
24+
#include <utility>
25+
#include <vector>
2026

2127
#include "ray/stats/metric_defs.h"
2228
#include "ray/util/logging.h"

src/ray/raylet/local_task_manager.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414

1515
#pragma once
1616

17+
#include <deque>
18+
#include <list>
19+
#include <memory>
20+
#include <string>
21+
#include <utility>
22+
#include <vector>
23+
1724
#include "absl/container/flat_hash_map.h"
1825
#include "absl/container/flat_hash_set.h"
1926
#include "ray/common/ray_object.h"
@@ -87,7 +94,7 @@ class LocalTaskManager : public ILocalTaskManager {
8794
get_task_arguments,
8895
size_t max_pinned_task_arguments_bytes,
8996
std::function<int64_t(void)> get_time_ms =
90-
[]() { return (int64_t)(absl::GetCurrentTimeNanos() / 1e6); },
97+
[]() { return static_cast<int64_t>(absl::GetCurrentTimeNanos() / 1e6); },
9198
int64_t sched_cls_cap_interval_ms =
9299
RayConfig::instance().worker_cap_initial_backoff_delay_ms());
93100

@@ -292,7 +299,7 @@ class LocalTaskManager : public ILocalTaskManager {
292299
/// class. This information is used to place a cap on the number of running
293300
/// running tasks per scheduling class.
294301
struct SchedulingClassInfo {
295-
SchedulingClassInfo(int64_t cap)
302+
explicit SchedulingClassInfo(int64_t cap)
296303
: running_tasks(),
297304
capacity(cap),
298305
next_update_time(std::numeric_limits<int64_t>::max()) {}

0 commit comments

Comments
 (0)