HappyTanuki/Np_Term
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

todo: iocp recv안되는 문제 해결하기

Browse Source
This commit is contained in:
HappyTanuki
2025-06-04 02:33:00 +09:00
parent 3f052a5f7f
commit c0e0279e5c
15 changed files with 363 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
impl/socket/iocp.cpp
View File

@@ -4,6 +4,11 @@
namespace Network {
IOCP::IOCP() {
gen_ = std::mt19937(rd_());
jitterDist_ = std::uniform_int_distribution<int>(-10, 10);
}
IOCP::~IOCP() { destruct(); }
void IOCP::destruct() {
@@ -22,15 +27,16 @@ void IOCP::registerSocket(IOCPPASSINDATA* data) {
DWORD recvbytes = 0, flags = 0;
::WSARecv(data->socket->sock, &data->wsabuf, 1, &recvbytes, &flags,
&data->overlapped, NULL);
#endif
}
int IOCP::recv(IOCPPASSINDATA& data) {
SOCKET sock = data.socket->sock;
int IOCP::recv(IOCPPASSINDATA* data) {
SOCKET sock = data->socket->sock;
std::lock_guard lock(*GetRecvQueueMutex_(sock));
auto queue = GetRecvQueue_(sock);
std::uint32_t left_data = data.wsabuf.len;
std::uint32_t left_data = data->wsabuf.len;
std::uint32_t copied = 0;
while (!queue->empty() && left_data != 0) {
@@ -41,7 +47,7 @@ int IOCP::recv(IOCPPASSINDATA& data) {
std::uint32_t available = front.first.size() - offset;
std::uint32_t to_copy = (left_data < available) ? left_data : available;
::memcpy(data.wsabuf.buf + copied, front.first.data() + offset, to_copy);
::memcpy(data->wsabuf.buf + copied, front.first.data() + offset, to_copy);
copied += to_copy;
left_data -= to_copy;
offset += to_copy;
@@ -56,11 +62,13 @@ int IOCP::recv(IOCPPASSINDATA& data) {
return copied;
}
int IOCP::send(SOCKET sock, std::vector<IOCPPASSINDATA>& data) {
std::lock_guard lock(*send_queue_mutex_[sock]);
for (auto it : data) {
it.event = IOCPEVENT::WRITE;
send_queue_[sock]->push_back(it);
int IOCP::send(SOCKET sock, std::vector<IOCPPASSINDATA*>* data) {
auto lk = GetSendQueueMutex_(sock);
auto queue = GetSendQueue_(sock);
std::lock_guard lock(*lk);
for (auto& it : *data) {
it->event = IOCPEVENT::WRITE;
queue->push_back(it);
}
IOCPThread_->enqueueJob(
@@ -71,11 +79,11 @@ int IOCP::send(SOCKET sock, std::vector<IOCPPASSINDATA>& data) {
return 0;
}
std::shared_ptr<std::list<IOCPPASSINDATA>> IOCP::GetSendQueue_(SOCKET sock) {
std::shared_ptr<std::list<IOCPPASSINDATA*>> IOCP::GetSendQueue_(SOCKET sock) {
std::lock_guard lock(socket_mod_mutex_);
if (send_queue_.find(sock) == send_queue_.end()) {
send_queue_[sock] = std::make_shared<std::list<IOCPPASSINDATA>>(
std::list<IOCPPASSINDATA>());
send_queue_[sock] = std::make_shared<std::list<IOCPPASSINDATA*>>(
std::list<IOCPPASSINDATA*>());
}
return send_queue_[sock];
}
@@ -118,14 +126,14 @@ void IOCP::packet_sender_(SOCKET sock) {
while (!queue->empty()) {
auto front = queue->front();
queue->pop_front();
front.event = IOCPEVENT::WRITE;
front->event = IOCPEVENT::WRITE;
int data_len = 0;
if (proto_ == SessionProtocol::TLS || proto_ == SessionProtocol::QUIC) {
int ret = ::SSL_write(front.ssl, front.wsabuf.buf, front.wsabuf.len);
int ret = ::SSL_write(front->ssl, front->wsabuf.buf, front->wsabuf.len);
if (ret <= 0) {
int err = ::SSL_get_error(front.ssl, ret);
int err = ::SSL_get_error(front->ssl, ret);
if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
queue->push_front(front);
break;
@@ -135,7 +143,7 @@ void IOCP::packet_sender_(SOCKET sock) {
break;
}
while ((data_len = ::BIO_read(wbio_, buf.data(), buf.size())) > 0) {
while ((data_len = ::BIO_read(front->wbio, buf.data(), buf.size())) > 0) {
wsabuf.buf = buf.data();
wsabuf.len = data_len;
@@ -143,8 +151,8 @@ void IOCP::packet_sender_(SOCKET sock) {
}
} else {
data_len = front.wsabuf.len;
wsabuf.buf = front.wsabuf.buf;
data_len = front->wsabuf.len;
wsabuf.buf = front->wsabuf.buf;
wsabuf.len = data_len;
::WSASend(sock, &wsabuf, 1, &sendbytes, 0, nullptr, nullptr);
}