Skip to content

Commit 587569d

Browse files
IronsDuIronsDu
committed
rename some code
1 parent 2d342eb commit 587569d

36 files changed

Lines changed: 453 additions & 549 deletions

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib")
2929
set(net_src_list
3030
${PROJECT_SOURCE_DIR}/src/brynet/net/EventLoop.cpp
3131
${PROJECT_SOURCE_DIR}/src/brynet/net/CurrentThread.cpp
32-
${PROJECT_SOURCE_DIR}/src/brynet/net/DataSocket.cpp
32+
${PROJECT_SOURCE_DIR}/src/brynet/net/TcpConnection.cpp
3333
${PROJECT_SOURCE_DIR}/src/brynet/net/SocketLibFunction.cpp
3434
${PROJECT_SOURCE_DIR}/src/brynet/net/TCPService.cpp
3535
${PROJECT_SOURCE_DIR}/src/brynet/net/Connector.cpp

‎docs/datasocket.zh-cn.md‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎docs/merge_send.zh-cn.md‎

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

33
当上层需要发送消息时，是投递一个`std::function`投递到`EventLoop`中。
44

5-
在`std::function`执行时会将消息放入`DataSocket`的待发送队列中，见[DataSocket::sendPacket](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/DataSocket.cpp#L132)。
5+
在`std::function`执行时会将消息放入`TcpConnection`的待发送队列中，见[TcpConnection::sendPacket](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/TcpConnection.cpp#L132)。
66

7-
在此异步回调函数中又会继续投递(有且仅有)一个延迟函数[DataSocket::runAfterFlush](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/DataSocket.cpp#L199)，延迟函数均在`EventLoop::loop`调用结束之前被调用。
7+
在此异步回调函数中又会继续投递(有且仅有)一个延迟函数[TcpConnection::runAfterFlush](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/TcpConnection.cpp#L199)，延迟函数均在`EventLoop::loop`调用结束之前被调用。
88

9-
这个延迟函数就负责将待发送队列里的数据尝试一次性批量发送(Linux下使用writev，Windwos下回进行合并)，见[DataSocket::quickFlush](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/DataSocket.cpp#L449)和[DataSocket::normalFlush](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/DataSocket.cpp#L336)。
9+
这个延迟函数就负责将待发送队列里的数据尝试一次性批量发送(Linux下使用writev，Windwos下回进行合并)，见[TcpConnection::quickFlush](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/TcpConnection.cpp#L449)和[TcpConnection::normalFlush](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/TcpConnection.cpp#L336)。

‎docs/tcp_service.zh-cn.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# 概述
2-
`TCPService`是`brynet`中对`DataSocket`和`EventLoop`的封装组合。
2+
`TCPService`是`brynet`中对`TcpConnection`和`EventLoop`的封装组合。
33
源代码见:[TCPService.h](https://github.com/IronsDu/brynet/blob/master/src/brynet/net/TCPService.h).</br>
44

55
# 接口
@@ -15,9 +15,9 @@
1515
(线程安全)开启工作线程，每一个工作线程有一个`EventLoop`负责事件检测。
1616

1717

18-
- `TcpService::addDataSocket(TcpSocket::PTR socket, Options...)`
18+
- `TcpService::addTcpConnection(TcpSocket::PTR socket, Options...)`
1919

20-
(线程安全),将一个DataSocket交给TcpService管理,其中Options请查阅`AddSocketOption的WithXXX系列函数`。
20+
(线程安全),将一个TcpConnection交给TcpService管理,其中Options请查阅`AddSocketOption的WithXXX系列函数`。
2121

2222

2323
## 示例
@@ -27,7 +27,7 @@ auto service = TcpService::Create();
2727
auto fd = ox_socket_connect(false, ip, port);
2828
auto socket = TcpSocket::Create(fd, false);
2929

30-
service->addDataSocket(socket, AddSocketOption::WithMaxRecvBufferSize(1024*1024));
30+
service->addTcpConnection(socket, AddSocketOption::WithMaxRecvBufferSize(1024*1024));
3131

3232
std::this_thread::sleep_for(2s);
3333
```

‎examples/BenchWebsocket.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using namespace brynet::utils;
1717

1818
std::atomic<int32_t> count;
1919

20-
static void sendPacket(HttpSession::PTR session, const char* data, size_t len)
20+
static void sendPacket(HttpSession::Ptr session, const char* data, size_t len)
2121
{
2222
char buff[1024];
2323
BasePacketWriter bw(buff, sizeof(buff), true, true);
@@ -61,8 +61,8 @@ int main(int argc, char **argv)
6161
auto socket = TcpSocket::Create(fd, false);
6262
brynet::net::base::SocketNodelay(fd);
6363

64-
auto enterCallback = [host](const DataSocket::PTR& session) {
65-
HttpService::setup(session, [host](const HttpSession::PTR& httpSession) {
64+
auto enterCallback = [host](const TcpConnection::Ptr& session) {
65+
HttpService::setup(session, [host](const HttpSession::Ptr& httpSession) {
6666
HttpRequest request;
6767
request.setMethod(HttpRequest::HTTP_METHOD::HTTP_METHOD_GET);
6868
request.setUrl("/ws");
@@ -75,14 +75,14 @@ int main(int argc, char **argv)
7575
std::string requestStr = request.getResult();
7676
httpSession->send(requestStr.c_str(), requestStr.size());
7777

78-
httpSession->setWSConnected([](const HttpSession::PTR& session, const HTTPParser&) {
78+
httpSession->setWSConnected([](const HttpSession::Ptr& session, const HTTPParser&) {
7979
for (int i = 0; i < 200; i++)
8080
{
8181
sendPacket(session, "hello, world!", 13);
8282
}
8383
});
8484

85-
httpSession->setWSCallback([](const HttpSession::PTR& session,
85+
httpSession->setWSCallback([](const HttpSession::Ptr& session,
8686
WebSocketFormat::WebSocketFrameType, const std::string& payload) {
8787
std::cout << payload << std::endl;
8888
sendPacket(session, "hello, world!", 13);
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
9191
});
9292
};
9393

94-
service->addDataSocket(std::move(socket),
94+
service->addTcpConnection(std::move(socket),
9595
brynet::net::TcpService::AddSocketOption::WithEnterCallback(enterCallback),
9696
brynet::net::TcpService::AddSocketOption::WithMaxRecvBufferSize(1024*1024));
9797
}

‎examples/BroadCastClient.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <brynet/net/SocketLibFunction.h>
1515

1616
#include <brynet/net/EventLoop.h>
17-
#include <brynet/net/DataSocket.h>
17+
#include <brynet/net/TcpConnection.h>
1818
#include <brynet/timer/Timer.h>
1919

2020
using namespace std;
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
4949
brynet::net::base::SocketSetRecvSize(fd, 32 * 1024);
5050
brynet::net::base::SocketNodelay(fd);
5151

52-
auto enterCallback = [packetLen](DataSocket::PTR datasSocket) {
52+
auto enterCallback = [packetLen](TcpConnection::Ptr datasSocket) {
5353
static_assert(sizeof(datasSocket.get()) <= sizeof(int64_t), "");
5454

5555
auto HEAD_LEN = sizeof(uint32_t) + sizeof(uint16_t);
@@ -111,15 +111,15 @@ int main(int argc, char** argv)
111111
return totalProcLen;
112112
});
113113

114-
datasSocket->setDisConnectCallback([](DataSocket::PTR datasSocket) {
114+
datasSocket->setDisConnectCallback([](TcpConnection::Ptr datasSocket) {
115115
});
116116
};
117-
DataSocket::PTR datasSocket = DataSocket::Create(TcpSocket::Create(fd, false),
117+
auto tcpConnection = TcpConnection::Create(TcpSocket::Create(fd, false),
118118
1024 * 1024,
119119
enterCallback,
120120
clientEventLoop);
121-
clientEventLoop->pushAsyncProc([clientEventLoop, datasSocket]() {
122-
datasSocket->onEnterEventLoop();
121+
clientEventLoop->pushAsyncFunctor([clientEventLoop, tcpConnection]() {
122+
tcpConnection->onEnterEventLoop();
123123
});
124124
}
125125

‎examples/BroadCastServer.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <brynet/net/SocketLibFunction.h>
1313

1414
#include <brynet/net/EventLoop.h>
15-
#include <brynet/net/DataSocket.h>
15+
#include <brynet/net/TcpConnection.h>
1616
#include <brynet/net/TCPService.h>
1717
#include <brynet/net/ListenThread.h>
1818

@@ -26,15 +26,15 @@ std::atomic_llong TotalRecvLen = ATOMIC_VAR_INIT(0);
2626
std::atomic_llong SendPacketNum = ATOMIC_VAR_INIT(0);
2727
std::atomic_llong RecvPacketNum = ATOMIC_VAR_INIT(0);
2828

29-
std::vector<DataSocket::PTR> clients;
30-
TcpService::PTR service;
29+
std::vector<TcpConnection::Ptr> clients;
30+
TcpService::Ptr service;
3131

32-
static void addClientID(const DataSocket::PTR& session)
32+
static void addClientID(const TcpConnection::Ptr& session)
3333
{
3434
clients.push_back(session);
3535
}
3636

37-
static void removeClientID(const DataSocket::PTR& session)
37+
static void removeClientID(const TcpConnection::Ptr& session)
3838
{
3939
for (auto it = clients.begin(); it != clients.end(); ++it)
4040
{
@@ -51,7 +51,7 @@ static size_t getClientNum()
5151
return clients.size();
5252
}
5353

54-
static void broadCastPacket(const DataSocket::PACKET_PTR& packet)
54+
static void broadCastPacket(const TcpConnection::PacketPtr& packet)
5555
{
5656
auto packetLen = packet->size();
5757
RecvPacketNum++;
@@ -81,18 +81,18 @@ int main(int argc, char** argv)
8181
auto mainLoop = std::make_shared<EventLoop>();
8282
auto listenThrean = ListenThread::Create();
8383

84-
listenThrean->startListen(false, "0.0.0.0", port, [mainLoop, listenThrean](TcpSocket::PTR socket) {
85-
socket->SocketNodelay();
86-
socket->SetSendSize(32 * 1024);
87-
socket->SetRecvSize(32 * 1024);
84+
listenThrean->startListen(false, "0.0.0.0", port, [mainLoop, listenThrean](TcpSocket::Ptr socket) {
85+
socket->setNodelay();
86+
socket->setSendSize(32 * 1024);
87+
socket->setRecvSize(32 * 1024);
8888

89-
auto enterCallback = [mainLoop](const DataSocket::PTR& session) {
90-
mainLoop->pushAsyncProc([session]() {
89+
auto enterCallback = [mainLoop](const TcpConnection::Ptr& session) {
90+
mainLoop->pushAsyncFunctor([session]() {
9191
addClientID(session);
9292
});
9393

94-
session->setDisConnectCallback([mainLoop](const DataSocket::PTR& session) {
95-
mainLoop->pushAsyncProc([session]() {
94+
session->setDisConnectCallback([mainLoop](const TcpConnection::Ptr& session) {
95+
mainLoop->pushAsyncFunctor([session]() {
9696
removeClientID(session);
9797
});
9898
});
@@ -112,8 +112,8 @@ int main(int argc, char** argv)
112112
auto packet_len = rp.readUINT32();
113113
if (leftLen >= packet_len && packet_len >= HEAD_LEN)
114114
{
115-
auto packet = DataSocket::makePacket(parseStr, packet_len);
116-
mainLoop->pushAsyncProc([packet]() {
115+
auto packet = TcpConnection::makePacket(parseStr, packet_len);
116+
mainLoop->pushAsyncFunctor([packet]() {
117117
broadCastPacket(packet);
118118
});
119119

@@ -134,7 +134,7 @@ int main(int argc, char** argv)
134134
return totalProcLen;
135135
});
136136
};
137-
service->addDataSocket(std::move(socket),
137+
service->addTcpConnection(std::move(socket),
138138
brynet::net::TcpService::AddSocketOption::WithEnterCallback(enterCallback),
139139
brynet::net::TcpService::AddSocketOption::WithMaxRecvBufferSize(1024 * 1024));
140140
});

‎examples/PingPongClient.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ int main(int argc, char **argv)
2828
{
2929
try
3030
{
31-
connector->asyncConnect(argv[1], atoi(argv[2]), std::chrono::seconds(10), [server, tmp](TcpSocket::PTR socket) {
31+
connector->asyncConnect(argv[1], atoi(argv[2]), std::chrono::seconds(10), [server, tmp](TcpSocket::Ptr socket) {
3232
std::cout << "connect success" << std::endl;
33-
socket->SocketNodelay();
33+
socket->setNodelay();
3434

35-
auto enterCallback = [tmp](const DataSocket::PTR& session) {
35+
auto enterCallback = [tmp](const TcpConnection::Ptr& session) {
3636
session->setDataCallback([session](const char* buffer, size_t len) {
3737
session->send(buffer, len);
3838
return len;
3939
});
4040
session->send(tmp.c_str(), tmp.size());
4141
};
4242

43-
server->addDataSocket(std::move(socket),
43+
server->addTcpConnection(std::move(socket),
4444
brynet::net::TcpService::AddSocketOption::WithEnterCallback(enterCallback),
4545
brynet::net::TcpService::AddSocketOption::WithMaxRecvBufferSize(1024 * 1024));
4646
}, []() {

‎examples/PingPongServer.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ int main(int argc, char **argv)
2626
auto server = TcpService::Create();
2727
auto listenThread = ListenThread::Create();
2828

29-
listenThread->startListen(false, "0.0.0.0", atoi(argv[1]), [=](TcpSocket::PTR socket){
30-
socket->SocketNodelay();
29+
listenThread->startListen(false, "0.0.0.0", atoi(argv[1]), [=](TcpSocket::Ptr socket){
30+
socket->setNodelay();
3131

32-
auto enterCallback = [](const DataSocket::PTR& session) {
32+
auto enterCallback = [](const TcpConnection::Ptr& session) {
3333
total_client_num++;
3434

3535
session->setDataCallback([session](const char* buffer, size_t len) {
@@ -39,12 +39,12 @@ int main(int argc, char **argv)
3939
return len;
4040
});
4141

42-
session->setDisConnectCallback([](const DataSocket::PTR& session) {
42+
session->setDisConnectCallback([](const TcpConnection::Ptr& session) {
4343
total_client_num--;
4444
});
4545
};
4646

47-
server->addDataSocket(std::move(socket),
47+
server->addTcpConnection(std::move(socket),
4848
brynet::net::TcpService::AddSocketOption::WithEnterCallback(enterCallback),
4949
brynet::net::TcpService::AddSocketOption::WithMaxRecvBufferSize(1024 * 1024));
5050
});

0 commit comments

Comments
 (0)