Skip to content

Commit 141ec5a

Browse files
islandryuislandryu
committed
format
1 parent d7ea4ac commit 141ec5a

File tree

7 files changed

+98
-94
lines changed

7 files changed

+98
-94
lines changed

‎deps/v8/tools/lldb_commands.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,15 @@ def bta(debugger, *args):
213213
print("%s -> %s %s (%s)\033[0m" % (
214214
color, prefix, match.group(2), match.group(1)))
215215

216-
def setup_source_map_for_relative_paths(debugger):
217-
# Copied from Chromium's tools/lldb/lldbinit.py.
218-
# When relative paths are used for debug symbols, lldb cannot find source
219-
# files. Set up a source map to point to V8's root.
220-
this_dir = os.path.dirname(os.path.abspath(__file__))
221-
source_dir = os.path.join(this_dir, os.pardir)
222-
223-
debugger.HandleCommand(
224-
'settings set target.source-map ../.. ' + source_dir)
216+
# def setup_source_map_for_relative_paths(debugger):
217+
# # Copied from Chromium's tools/lldb/lldbinit.py.
218+
# # When relative paths are used for debug symbols, lldb cannot find source
219+
# # files. Set up a source map to point to V8's root.
220+
# this_dir = os.path.dirname(os.path.abspath(__file__))
221+
# source_dir = os.path.join(this_dir, os.pardir)
222+
223+
# debugger.HandleCommand(
224+
# 'settings set target.source-map ../.. ' + source_dir)
225225

226226

227227
def __lldb_init_module(debugger, dict):

‎src/inspector/node_protocol.pdl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,4 +241,3 @@ experimental domain Target
241241
SessionID sessionId
242242
TargetInfo targetInfo
243243
boolean waitingForDebugger
244-

‎src/inspector/target_agent.cc

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,39 @@
11
#include "target_agent.h"
2-
#include <iostream>
3-
#include <memory>
4-
#include <set>
5-
#include <string>
6-
#include <tuple>
7-
#include <utility>
8-
#include "inspector/node_string.h"
92
#include "inspector/worker_inspector.h"
103
#include "main_thread_interface.h"
114

125
namespace node {
136
namespace inspector {
147
namespace protocol {
158

16-
std::unordered_map<int,std::shared_ptr<MainThreadHandle>> TargetAgent::target_session_id_worker_map_ = std::unordered_map<int, std::shared_ptr<MainThreadHandle>>();
17-
9+
std::unordered_map<int, std::shared_ptr<MainThreadHandle>>
10+
TargetAgent::target_session_id_worker_map_ =
11+
std::unordered_map<int, std::shared_ptr<MainThreadHandle>>();
1812

1913
class WorkerTargetDelegate : public WorkerDelegate {
2014
public:
2115
explicit WorkerTargetDelegate(std::shared_ptr<TargetAgent> target_agent)
2216
: target_agent_(target_agent) {}
2317

24-
2518
void WorkerCreated(const std::string& title,
2619
const std::string& url,
2720
bool waiting,
2821
std::shared_ptr<MainThreadHandle> worker) override {
2922
std::string target_id = std::to_string(target_agent_->getNextTargetId());
3023
std::string type = "worker";
31-
24+
3225
target_agent_->targetCreated(target_id, type, title, url);
33-
target_agent_->attachedToTarget(worker,target_id, type, title, url);
26+
target_agent_->attachedToTarget(worker, target_id, type, title, url);
3427
}
3528

3629
private:
3730
const std::shared_ptr<TargetAgent> target_agent_;
3831
};
3932

40-
std::unique_ptr<Target::TargetInfo> createTargetInfo(
41-
const String& target_id,
42-
const String& type,
43-
const String& title,
44-
const String& url) {
33+
std::unique_ptr<Target::TargetInfo> createTargetInfo(const String& target_id,
34+
const String& type,
35+
const String& title,
36+
const String& url) {
4537
return Target::TargetInfo::create()
4638
.setTargetId(target_id)
4739
.setType(type)
@@ -62,7 +54,8 @@ void TargetAgent::listenWorker(std::weak_ptr<WorkerManager> worker_manager) {
6254
if (!manager) {
6355
return;
6456
}
65-
std::unique_ptr<WorkerDelegate> delegate(new WorkerTargetDelegate(shared_from_this()));
57+
std::unique_ptr<WorkerDelegate> delegate(
58+
new WorkerTargetDelegate(shared_from_this()));
6659
worker_event_handle_ = manager->SetAutoAttach(std::move(delegate));
6760
}
6861

@@ -72,7 +65,10 @@ void TargetAgent::reset() {
7265
}
7366
}
7467

75-
void TargetAgent::targetCreated(const std::string &target_id,const std::string &type,const std::string &title,const std::string &url) {
68+
void TargetAgent::targetCreated(const std::string& target_id,
69+
const std::string& type,
70+
const std::string& title,
71+
const std::string& url) {
7672
frontend_->targetCreated(createTargetInfo(target_id, type, title, url));
7773
}
7874

@@ -84,13 +80,19 @@ int TargetAgent::getNextTargetId() {
8480
return next_target_id_++;
8581
}
8682

87-
void TargetAgent::attachedToTarget(std::shared_ptr<MainThreadHandle> worker,const std::string &target_id, const std::string &type,const std::string &title,const std::string &url) {
83+
void TargetAgent::attachedToTarget(std::shared_ptr<MainThreadHandle> worker,
84+
const std::string& target_id,
85+
const std::string& type,
86+
const std::string& title,
87+
const std::string& url) {
8888
int session_id = getNextSessionId();
8989
target_session_id_worker_map_[session_id] = worker;
9090
worker->SetTargetSessionId(session_id);
91-
frontend_->attachedToTarget(std::to_string(session_id), createTargetInfo(target_id, type, title, url), true);
91+
frontend_->attachedToTarget(std::to_string(session_id),
92+
createTargetInfo(target_id, type, title, url),
93+
true);
9294
}
9395

94-
} // namespace protocol
96+
} // namespace protocol
9597
} // namespace inspector
9698
} // namespace node

‎src/inspector/target_agent.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,35 @@
44
#include "inspector/worker_inspector.h"
55
#include "node/inspector/protocol/Target.h"
66

7-
#include <memory>
8-
#include <string>
9-
#include <thread>
10-
#include <unordered_map>
11-
127
namespace node {
138

149
namespace inspector {
1510
class TargetInspector;
1611

1712
namespace protocol {
1813

19-
class TargetAgent : public Target::Backend, public std::enable_shared_from_this<TargetAgent>
20-
{
14+
class TargetAgent : public Target::Backend,
15+
public std::enable_shared_from_this<TargetAgent> {
2116
public:
22-
explicit TargetAgent() {}
23-
2417
void Wire(UberDispatcher* dispatcher);
2518

26-
27-
void targetCreated(const std::string &target_id, const std::string &type,const std::string &title,const std::string &url);
28-
void attachedToTarget(std::shared_ptr<MainThreadHandle> worker,const std::string &target_id, const std::string &type,const std::string &title,const std::string &url);
19+
void targetCreated(const std::string& target_id,
20+
const std::string& type,
21+
const std::string& title,
22+
const std::string& url);
23+
void attachedToTarget(std::shared_ptr<MainThreadHandle> worker,
24+
const std::string& target_id,
25+
const std::string& type,
26+
const std::string& title,
27+
const std::string& url);
2928

3029
int getNextTargetId();
3130

3231
void listenWorker(std::weak_ptr<WorkerManager> worker_manager);
3332
void reset();
34-
static std::unordered_map<int,std::shared_ptr<MainThreadHandle>> target_session_id_worker_map_;
33+
static std::unordered_map<int, std::shared_ptr<MainThreadHandle>>
34+
target_session_id_worker_map_;
35+
3536
private:
3637
int getNextSessionId();
3738
std::shared_ptr<Target::Frontend> frontend_;
@@ -46,4 +47,3 @@ class TargetAgent : public Target::Backend, public std::enable_shared_from_this<
4647
} // namespace node
4748

4849
#endif // SRC_INSPECTOR_TARGET_AGENT_H_
49-

‎src/inspector_agent.cc

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "inspector_agent.h"
2-
#include <string>
32

43
#include "env-inl.h"
54
#include "inspector/main_thread_interface.h"
@@ -20,7 +19,6 @@
2019
#include "permission/permission.h"
2120
#include "timer_wrap-inl.h"
2221
#include "util-inl.h"
23-
#include "util.h"
2422
#include "v8-inspector.h"
2523
#include "v8-platform.h"
2624

@@ -217,11 +215,10 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
217215
const std::unique_ptr<V8Inspector>& inspector,
218216
std::shared_ptr<WorkerManager> worker_manager,
219217
std::unique_ptr<InspectorSessionDelegate> delegate,
220-
std::shared_ptr<MainThreadHandle> main_thread_,
218+
std::shared_ptr<MainThreadHandle> main_thread,
221219
bool prevent_shutdown)
222-
: delegate_(std::move(delegate)), main_thread_(main_thread_),
223-
prevent_shutdown_(prevent_shutdown), retaining_context_(false)
224-
{
220+
: delegate_(std::move(delegate)), main_thread_(main_thread),
221+
prevent_shutdown_(prevent_shutdown), retaining_context_(false) {
225222
session_ = inspector->connect(CONTEXT_GROUP_ID,
226223
this,
227224
StringView(),
@@ -238,7 +235,7 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
238235
runtime_agent_->Wire(node_dispatcher_.get());
239236
network_inspector_ = std::make_unique<NetworkInspector>(env);
240237
network_inspector_->Wire(node_dispatcher_.get());
241-
if(env->options()->experimental_worker_inspection) {
238+
if (env->options()->experimental_worker_inspection) {
242239
target_agent_ = std::make_shared<protocol::TargetAgent>();
243240
target_agent_->Wire(node_dispatcher_.get());
244241
target_agent_->listenWorker(worker_manager);
@@ -256,7 +253,7 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
256253
runtime_agent_.reset(); // Dispose before the dispatchers
257254
network_inspector_->Disable();
258255
network_inspector_.reset(); // Dispose before the dispatchers
259-
if(target_agent_) {
256+
if (target_agent_) {
260257
target_agent_->reset();
261258
}
262259
}
@@ -343,16 +340,17 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
343340
}
344341
std::optional<int> target_session_id = main_thread_->GetTargetSessionId();
345342
if (target_session_id.has_value()) {
346-
std::string raw_message = protocol::StringUtil::StringViewToUtf8(message);
347-
std::unique_ptr<protocol::DictionaryValue> value =
348-
protocol::DictionaryValue::cast(
349-
protocol::StringUtil::parseJSON(raw_message));
350-
std::string target_session_id_str = std::to_string(*target_session_id);
351-
value->setString("sessionId", target_session_id_str);
352-
delegate_->SendMessageToFrontend(Utf8ToStringView(value->serializeToJSON())->string());
343+
std::string raw_message = protocol::StringUtil::StringViewToUtf8(message);
344+
std::unique_ptr<protocol::DictionaryValue> value =
345+
protocol::DictionaryValue::cast(
346+
protocol::StringUtil::parseJSON(raw_message));
347+
std::string target_session_id_str = std::to_string(*target_session_id);
348+
value->setString("sessionId", target_session_id_str);
349+
delegate_->SendMessageToFrontend(
350+
Utf8ToStringView(value->serializeToJSON())->string());
351+
} else {
352+
delegate_->SendMessageToFrontend(message);
353353
}
354-
355-
delegate_->SendMessageToFrontend(message);
356354
}
357355

358356
void sendMessageToFrontend(const std::string& message) {

‎src/inspector_io.cc

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "debug_utils-inl.h"
66
#include "inspector/main_thread_interface.h"
77
#include "inspector/node_string.h"
8+
#include "inspector/target_agent.h"
89
#include "inspector_socket_server.h"
910
#include "ncrypto.h"
1011
#include "node.h"
@@ -13,7 +14,6 @@
1314
#include "util-inl.h"
1415
#include "v8-inspector.h"
1516
#include "zlib.h"
16-
#include "inspector/target_agent.h"
1717

1818
#include <deque>
1919
#include <cstring>
@@ -68,9 +68,9 @@ class RequestToServer {
6868
RequestToServer(TransportAction action,
6969
int session_id,
7070
std::unique_ptr<v8_inspector::StringBuffer> message)
71-
: action_(action),
72-
session_id_(session_id),
73-
message_(std::move(message)) {}
71+
: action_(action),
72+
session_id_(session_id),
73+
message_(std::move(message)) {}
7474

7575
void Dispatch(InspectorSocketServer* server) const {
7676
switch (action_) {
@@ -99,7 +99,7 @@ class RequestQueueData {
9999
using MessageQueue = std::deque<RequestToServer>;
100100

101101
explicit RequestQueueData(uv_loop_t* loop)
102-
: handle_(std::make_shared<RequestQueue>(this)) {
102+
: handle_(std::make_shared<RequestQueue>(this)) {
103103
int err = uv_async_init(loop, &async_, [](uv_async_t* async) {
104104
RequestQueueData* wrapper =
105105
node::ContainerOf(&RequestQueueData::async_, async);
@@ -342,11 +342,11 @@ void InspectorIoDelegate::StartSession(int session_id,
342342
fprintf(stderr, "Debugger attached.\n");
343343
}
344344

345-
std::optional<std::string> InspectorIoDelegate::GetTargetSessionId(const std::string& message) {
345+
std::optional<std::string> InspectorIoDelegate::GetTargetSessionId(
346+
const std::string& message) {
346347
std::string_view view(message.data(), message.size());
347348
std::unique_ptr<protocol::DictionaryValue> value =
348-
protocol::DictionaryValue::cast(
349-
protocol::StringUtil::parseJSON(view));
349+
protocol::DictionaryValue::cast(protocol::StringUtil::parseJSON(view));
350350
protocol::String target_session_id;
351351
protocol::Value* target_session_id_value = value->get("sessionId");
352352
if (target_session_id_value) {
@@ -361,34 +361,39 @@ std::optional<std::string> InspectorIoDelegate::GetTargetSessionId(const std::st
361361

362362
void InspectorIoDelegate::MessageReceived(int session_id,
363363
const std::string& message) {
364-
std::optional<std::string> target_session_id_str = GetTargetSessionId(message);
364+
std::optional<std::string> target_session_id_str =
365+
GetTargetSessionId(message);
365366
std::shared_ptr<MainThreadHandle> worker = nullptr;
366367
int merged_session_id = session_id;
367-
if(!target_session_id_str->empty()) {
368+
if (!target_session_id_str->empty()) {
368369
int target_session_id = std::stoi(*target_session_id_str);
369-
worker = protocol::TargetAgent::target_session_id_worker_map_[target_session_id];
370-
if(worker) {
370+
worker =
371+
protocol::TargetAgent::target_session_id_worker_map_[target_session_id];
372+
if (worker) {
371373
merged_session_id += target_session_id << 16;
372374
}
373375
}
374376

375377
auto session = sessions_.find(merged_session_id);
376378

377-
if(session == sessions_.end()) {
379+
if (session == sessions_.end()) {
378380
std::unique_ptr<InspectorSession> session;
379-
if(worker) {
381+
if (worker) {
380382
session = worker->Connect(
381-
std::unique_ptr<InspectorSessionDelegate>(
382-
new IoSessionDelegate(request_queue_->handle(), session_id)), true);
383+
std::unique_ptr<InspectorSessionDelegate>(
384+
new IoSessionDelegate(request_queue_->handle(), session_id)),
385+
true);
383386
} else {
384387
session = main_thread_->Connect(
385-
std::unique_ptr<InspectorSessionDelegate>(
386-
new IoSessionDelegate(request_queue_->handle(), session_id)), true);
388+
std::unique_ptr<InspectorSessionDelegate>(
389+
new IoSessionDelegate(request_queue_->handle(), session_id)),
390+
true);
387391
}
388392

389393
if (session) {
390394
sessions_[merged_session_id] = std::move(session);
391-
sessions_[merged_session_id]->Dispatch(Utf8ToStringView(message)->string());
395+
sessions_[merged_session_id]->Dispatch(
396+
Utf8ToStringView(message)->string());
392397
} else {
393398
fprintf(stderr, "Failed to connect to inspector session.\n");
394399
}
@@ -419,11 +424,11 @@ void RequestQueueData::CloseAndFree(RequestQueueData* queue) {
419424
queue->handle_.reset();
420425
uv_close(reinterpret_cast<uv_handle_t*>(&queue->async_),
421426
[](uv_handle_t* handle) {
422-
uv_async_t* async = reinterpret_cast<uv_async_t*>(handle);
423-
RequestQueueData* wrapper =
424-
node::ContainerOf(&RequestQueueData::async_, async);
425-
delete wrapper;
426-
});
427+
uv_async_t* async = reinterpret_cast<uv_async_t*>(handle);
428+
RequestQueueData* wrapper =
429+
node::ContainerOf(&RequestQueueData::async_, async);
430+
delete wrapper;
431+
});
427432
}
428433
} // namespace inspector
429434
} // namespace node

0 commit comments

Comments
 (0)