mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Start a TCP server in the debugger thread.

Browse source
This commit is contained in:
Cheng Zhao 2014-09-04 22:08:42 +08:00
parent a584ca3678
commit 20f21b707b
2 changed files with 45 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
atom/browser/node_debugger.cc
View file

@ -10,8 +10,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
#include "net/socket/stream_socket.h"
#include "net/socket/tcp_server_socket.h"
#include "net/socket/tcp_listen_socket.h"
#include "v8/include/v8-debug.h"
namespace atom {
@ -39,23 +38,19 @@ NodeDebugger::NodeDebugger()
if (!port_str.empty())
base::StringToInt(port_str, &port);
if (!thread_.Start()) {
// Start a new IO thread.
base::Thread::Options options;
options.message_loop_type = base::MessageLoop::TYPE_IO;
if (!thread_.StartWithOptions(options)) {
LOG(ERROR) << "Unable to start debugger thread";
return;
}
net::IPAddressNumber ip_number;
if (!net::ParseIPLiteralToNumber("127.0.0.1", &ip_number)) {
LOG(ERROR) << "Unable to convert ip address";
return;
}
server_socket_.reset(new net::TCPServerSocket(NULL, net::NetLog::Source()));
server_socket_->Listen(net::IPEndPoint(ip_number, port), 1);
// Start the server in new IO thread.
thread_.message_loop()->PostTask(
FROM_HERE,
base::Bind(&NodeDebugger::DoAcceptLoop, weak_factory_.GetWeakPtr()));
base::Bind(&NodeDebugger::StartServer, weak_factory_.GetWeakPtr(),
port));
}
}
@ -63,7 +58,30 @@ NodeDebugger::~NodeDebugger() {
thread_.Stop();
}
void NodeDebugger::DoAcceptLoop() {
void NodeDebugger::StartServer(int port) {
server_ = net::TCPListenSocket::CreateAndListen("127.0.0.1", port, this);
if (!server_) {
LOG(ERROR) << "Cannot start debugger server";
return;
}
}
void NodeDebugger::DidAccept(net::StreamListenSocket* server,
scoped_ptr<net::StreamListenSocket> socket) {
// Only accept one session.
if (accepted_socket_)
return;
accepted_socket_ = socket.Pass();
}
void NodeDebugger::DidRead(net::StreamListenSocket* socket,
const char* data,
int len) {
}
void NodeDebugger::DidClose(net::StreamListenSocket* socket) {
accepted_socket_.reset();
}
} // namespace atom

22
atom/browser/node_debugger.h
View file

@ -8,26 +8,30 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread.h"
namespace net {
class StreamSocket;
class TCPServerSocket;
}
#include "net/socket/stream_listen_socket.h"
namespace atom {
// Add support for node's "--debug" switch.
class NodeDebugger {
class NodeDebugger : public net::StreamListenSocket::Delegate {
public:
NodeDebugger();
virtual ~NodeDebugger();
private:
void DoAcceptLoop();
void StartServer(int port);
// net::StreamListenSocket::Delegate:
virtual void DidAccept(net::StreamListenSocket* server,
scoped_ptr<net::StreamListenSocket> socket) OVERRIDE;
virtual void DidRead(net::StreamListenSocket* socket,
const char* data,
int len) OVERRIDE;
virtual void DidClose(net::StreamListenSocket* socket) OVERRIDE;
base::Thread thread_;
scoped_ptr<net::TCPServerSocket> server_socket_;
scoped_ptr<net::StreamSocket> accepted_socket_;
scoped_ptr<net::StreamListenSocket> server_;
scoped_ptr<net::StreamListenSocket> accepted_socket_;
base::WeakPtrFactory<NodeDebugger> weak_factory_;