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

읽기/쓰기 socket 비동기 구현 완료

Browse Source
This commit is contained in:
HappyTanuki
2025-06-05 02:12:50 +09:00
parent c0e0279e5c
commit 6428db9d31
3 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Client/src/asteroid/main.cpp
View File

@@ -4,6 +4,7 @@
#include "glfw/glfw_window.h" #include "glfw/glfw_window.h"
#include "socket/iocp.h" #include "socket/iocp.h"
#include "socket/tcp_socket.h" #include "socket/tcp_socket.h"
#include "socket/udp_socket.h"
#include "socket/wsa_manager.h" #include "socket/wsa_manager.h"
#include "utils/log.h" #include "utils/log.h"
#include "vulkan_engine/vulkan/engine.h" #include "vulkan_engine/vulkan/engine.h"
@@ -17,7 +18,7 @@
#endif #endif
utils::ThreadPool tp(0); utils::ThreadPool tp(0);
Network::IOCP iocp; Network::IOCP iocp;
iocp.init(&tp, SessionProtocol::TCP); iocp.init(&tp, SessionProtocol::TLS);
Network::Address addr; Network::Address addr;
in6_addr in6addr; in6_addr in6addr;
@@ -45,12 +46,12 @@
send_data.push_back(data); send_data.push_back(data);
iocp.send(sock.sock, &send_data); iocp.send(sock.sock, &send_data);
Sleep(10000);
Network::IOCPPASSINDATA* recv_data = new Network::IOCPPASSINDATA(16 * 1024); Network::IOCPPASSINDATA* recv_data = new Network::IOCPPASSINDATA(16 * 1024);
recv_data->socket = std::make_shared<Network::TCPSocket>(sock); recv_data->socket = std::make_shared<Network::TCPSocket>(sock);
recv_data->IOCPInstance = &iocp; recv_data->IOCPInstance = &iocp;
iocp.recv(recv_data); while (!iocp.recv(recv_data)); // 어떤 데이터를 읽는걸 보장받고 싶다면 그냥 스린락 걸어버리기.
spdlog::info("recv_data: {}", recv_data->wsabuf.buf);
const veng::GlfwInitialization _glfw; const veng::GlfwInitialization _glfw;

21
impl/socket/iocp.cpp
View File

@@ -23,10 +23,19 @@ void IOCP::registerSocket(IOCPPASSINDATA* data) {
(HANDLE)data->socket->sock, completionPort_, data->socket->sock, 0); (HANDLE)data->socket->sock, completionPort_, data->socket->sock, 0);
if (returnData == 0) completionPort_ = returnData; if (returnData == 0) completionPort_ = returnData;
data->event = IOCPEVENT::READ; IOCPPASSINDATA* recv_data = new IOCPPASSINDATA(data->bufsize);
recv_data->event = IOCPEVENT::READ;
recv_data->socket = data->socket;
DWORD recvbytes = 0, flags = 0; DWORD recvbytes = 0, flags = 0;
::WSARecv(data->socket->sock, &data->wsabuf, 1, &recvbytes, &flags, int result = ::WSARecv(recv_data->socket->sock, &recv_data->wsabuf, 1,
&data->overlapped, NULL); &recvbytes, &flags, &recv_data->overlapped, NULL);
if (result == SOCKET_ERROR) {
int err = ::WSAGetLastError();
if (err != WSA_IO_PENDING) {
spdlog::error("WSARecv failed: {}", err);
// 반드시 여기서 리턴하거나 처리해야 합니다.
}
}
#endif #endif
} }
@@ -131,9 +140,9 @@ void IOCP::packet_sender_(SOCKET sock) {
int data_len = 0; int data_len = 0;
if (proto_ == SessionProtocol::TLS || proto_ == SessionProtocol::QUIC) { 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.get(), front->wsabuf.buf, front->wsabuf.len);
if (ret <= 0) { if (ret <= 0) {
int err = ::SSL_get_error(front->ssl, ret); int err = ::SSL_get_error(front->ssl.get(), ret);
if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) { if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
queue->push_front(front); queue->push_front(front);
break; break;
@@ -143,7 +152,7 @@ void IOCP::packet_sender_(SOCKET sock) {
break; break;
} }
while ((data_len = ::BIO_read(front->wbio, buf.data(), buf.size())) > 0) { while ((data_len = ::BIO_read(::SSL_get_wbio(front->ssl.get()), buf.data(), buf.size())) > 0) {
wsabuf.buf = buf.data(); wsabuf.buf = buf.data();
wsabuf.len = data_len; wsabuf.len = data_len;

37
include/socket/iocp.h
View File

@@ -5,8 +5,8 @@
#include <functional> #include <functional>
#include <queue> #include <queue>
#include <vector>
#include <random> #include <random>
#include <vector>
#include "socket.h" #include "socket.h"
#include "utils/thread_pool.h" #include "utils/thread_pool.h"
@@ -31,13 +31,11 @@ class IOCP;
enum class IOCPEVENT { QUIT, READ, WRITE }; enum class IOCPEVENT { QUIT, READ, WRITE };
struct IOCPPASSINDATA { // 얘 double free 문제 있음.. struct IOCPPASSINDATA {
OVERLAPPED overlapped; OVERLAPPED overlapped;
IOCPEVENT event; IOCPEVENT event;
std::shared_ptr<Socket> socket; std::shared_ptr<Socket> socket;
SSL* ssl; std::shared_ptr<SSL> ssl;
BIO* rbio; // bio는 ssl별로 달라야 하므로 분리해야 함..
BIO* wbio;
std::uint32_t transferredbytes; std::uint32_t transferredbytes;
WSABUF wsabuf; WSABUF wsabuf;
std::uint32_t bufsize; std::uint32_t bufsize;
@@ -50,8 +48,7 @@ struct IOCPPASSINDATA { // 얘 double free 문제 있음..
std::memset(&overlapped, 0, sizeof(overlapped)); std::memset(&overlapped, 0, sizeof(overlapped));
event = IOCPEVENT::QUIT; event = IOCPEVENT::QUIT;
socket = nullptr; socket = nullptr;
rbio = nullptr; ssl = nullptr;
wbio = nullptr;
transferredbytes = 0; transferredbytes = 0;
this->bufsize = bufsize; this->bufsize = bufsize;
IOCPInstance = nullptr; IOCPInstance = nullptr;
@@ -63,10 +60,9 @@ struct IOCPPASSINDATA { // 얘 double free 문제 있음..
std::memset(&overlapped, 0, sizeof(overlapped)); std::memset(&overlapped, 0, sizeof(overlapped));
event = IOCPEVENT::QUIT; event = IOCPEVENT::QUIT;
socket = nullptr; socket = nullptr;
ssl = ::SSL_new(ctx); ssl = std::make_shared<SSL>(::SSL_new(ctx), ::SSL_free);
rbio = ::BIO_new(::BIO_s_mem()); ::SSL_set_bio(ssl.get(), ::BIO_new(::BIO_s_mem()),
wbio = ::BIO_new(::BIO_s_mem()); ::BIO_new(::BIO_s_mem()));
::SSL_set_bio(ssl, rbio, wbio);
transferredbytes = 0; transferredbytes = 0;
this->bufsize = bufsize; this->bufsize = bufsize;
IOCPInstance = nullptr; IOCPInstance = nullptr;
@@ -80,8 +76,6 @@ struct IOCPPASSINDATA { // 얘 double free 문제 있음..
std::memset(&overlapped, 0, sizeof(overlapped)); std::memset(&overlapped, 0, sizeof(overlapped));
event = other.event; event = other.event;
socket = other.socket; socket = other.socket;
rbio = other.rbio;
wbio = other.wbio;
transferredbytes = other.transferredbytes; transferredbytes = other.transferredbytes;
bufsize = other.bufsize; bufsize = other.bufsize;
IOCPInstance = other.IOCPInstance; IOCPInstance = other.IOCPInstance;
@@ -104,8 +98,6 @@ struct IOCPPASSINDATA { // 얘 double free 문제 있음..
std::memset(&overlapped, 0, sizeof(overlapped)); std::memset(&overlapped, 0, sizeof(overlapped));
event = other.event; event = other.event;
socket = other.socket; socket = other.socket;
rbio = other.rbio;
wbio = other.wbio;
transferredbytes = other.transferredbytes; transferredbytes = other.transferredbytes;
bufsize = other.bufsize; bufsize = other.bufsize;
IOCPInstance = other.IOCPInstance; IOCPInstance = other.IOCPInstance;
@@ -190,9 +182,11 @@ class IOCP {
auto queue_list = GetRecvQueue_(data->socket->sock); auto queue_list = GetRecvQueue_(data->socket->sock);
if (data->event == IOCPEVENT::READ) { if (data->event == IOCPEVENT::READ) {
if (proto_ == SessionProtocol::TLS || proto_ == SessionProtocol::QUIC) { if (proto_ == SessionProtocol::TLS || proto_ == SessionProtocol::QUIC) {
::BIO_write(data->rbio, data->wsabuf.buf, cbTransfrred); ::BIO_write(::SSL_get_rbio(data->ssl.get()), data->wsabuf.buf,
cbTransfrred);
while ((red_data = ::SSL_read(data->ssl, buf.data(), buf.size())) > 0) { while ((red_data =
::SSL_read(data->ssl.get(), buf.data(), buf.size())) > 0) {
queue_list->emplace_back(std::make_pair( queue_list->emplace_back(std::make_pair(
std::vector<char>(buf.begin(), buf.begin() + red_data), 0)); std::vector<char>(buf.begin(), buf.begin() + red_data), 0));
} }
@@ -204,8 +198,13 @@ class IOCP {
0)); 0));
} }
DWORD recvbytes = 0, flags = 0; DWORD recvbytes = 0, flags = 0;
::WSARecv(data->socket->sock, &data->wsabuf, 1, &recvbytes, &flags,
&data->overlapped, NULL); IOCPPASSINDATA* recv_data = new IOCPPASSINDATA(data->bufsize);
recv_data->socket = data->socket;
delete data;
::WSARecv(recv_data->socket->sock, &recv_data->wsabuf, 1, &recvbytes,
&flags, &recv_data->overlapped, NULL);
} else { // WRITE 시, 무시한다. } else { // WRITE 시, 무시한다.
delete data; delete data;
} }