breeze/CppNet
1
0
Fork 0
mirror of https://github.com/caozhiyi/CppNet.git synced 2026-01-19 00:05:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

debug kqueue on macos.

Browse Source
This commit is contained in:
caozhiyi
2021-03-22 21:06:51 +08:00
parent 7584d54645
commit 61e307fcd8
11 changed files with 105 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cppnet/socket/rw_socket.cpp
View File

@@ -15,9 +15,16 @@
#include "common/alloter/alloter_interface.h"
namespace cppnet {
RWSocket::RWSocket(std::shared_ptr<AlloterWrap> alloter):
Socket(alloter) {
RWSocket::RWSocket(std::shared_ptr<AlloterWrap> alloter):
_alloter(alloter) {
_block_pool = _alloter->PoolNewSharePtr<BlockMemoryPool>(__mem_block_size, __mem_block_add_step);
_write_buffer = _alloter->PoolNewSharePtr<BufferQueue>(_block_pool, _alloter);
_read_buffer = _alloter->PoolNewSharePtr<BufferQueue>(_block_pool, _alloter);
}
RWSocket::RWSocket(uint64_t sock, std::shared_ptr<AlloterWrap> alloter):
Socket(sock, alloter) {
_block_pool = _alloter->PoolNewSharePtr<BlockMemoryPool>(__mem_block_size, __mem_block_add_step);
_write_buffer = _alloter->PoolNewSharePtr<BufferQueue>(_block_pool, _alloter);
@@ -25,15 +32,7 @@ RWSocket::RWSocket(std::shared_ptr<AlloterWrap> alloter):
}
RWSocket::~RWSocket() {
if (!_event) {
_event = _alloter->PoolNewSharePtr<Event>();
_event->SetSocket(shared_from_this());
}
auto actions = GetEventActions();
if (actions) {
actions->DelEvent(_event);
}
}
bool RWSocket::GetAddress(std::string& ip, uint16_t& port) {
@@ -48,7 +47,7 @@ bool RWSocket::GetAddress(std::string& ip, uint16_t& port) {
}
bool RWSocket::Close() {
__all_socket_map.erase(_sock);
Disconnect();
return true;
}
@@ -173,11 +172,16 @@ void RWSocket::OnConnect(uint16_t err) {
void RWSocket::OnDisConnect(uint16_t err) {
auto sock = shared_from_this();
__all_socket_map.erase(_sock);
auto cppnet_base = _cppnet_base.lock();
if (cppnet_base) {
cppnet_base->OnDisConnect(sock, err);
}
// not active disconnection
if (_event && !(_event->GetType() & ET_DISCONNECT)) {
OsHandle::Close(_sock);
}
}
bool RWSocket::Recv() {
@@ -207,14 +211,16 @@ bool RWSocket::Recv() {
off_set += ret._return_value;
break;
} else if (errno == EBADMSG || errno == ECONNRESET) {
cppnet_base->OnDisConnect(shared_from_this(), CEC_CONNECT_BREAK);
} else if (errno == EBADMSG) {
OnDisConnect(CEC_CONNECT_BREAK);
return false;
} else {
cppnet_base->OnDisConnect(shared_from_this(), CEC_CLOSED);
return false;
}
} else if (ret._return_value == 0) {
OnDisConnect(CEC_CLOSED);
return false;
} else {
_read_buffer->MoveWritePt(ret._return_value);
@@ -256,11 +262,11 @@ bool RWSocket::Send() {
}
} else if (errno == EBADMSG) {
cppnet_base->OnDisConnect(shared_from_this(), CEC_CONNECT_BREAK);
OnDisConnect(CEC_CONNECT_BREAK);
return false;
} else {
cppnet_base->OnDisConnect(shared_from_this(), CEC_CLOSED);
OnDisConnect(CEC_CLOSED);
return false;
}
}