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

모델 업로드 구조 완성

Browse Source
This commit is contained in:
HappyTanuki
2025-06-15 03:42:25 +09:00
parent 93fda88d75
commit 06a1e41dc8
13 changed files with 149 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
impl/socket/iocp.cpp
View File

@@ -40,21 +40,22 @@ void IOCP::destruct() {
#endif
}
void IOCP::registerTCPSocket(IOCPPASSINDATA* data) {
void IOCP::registerTCPSocket(Socket& sock, std::uint32_t bufsize) {
#ifdef _WIN32
HANDLE returnData = ::CreateIoCompletionPort(
(HANDLE)data->socket->sock, completionPort_, data->socket->sock, 0);
HANDLE returnData = ::CreateIoCompletionPort((HANDLE)sock.sock,
completionPort_, sock.sock, 0);
if (returnData == 0) completionPort_ = returnData;
IOCPPASSINDATA* recv_data = new IOCPPASSINDATA(data->bufsize);
IOCPPASSINDATA* recv_data = new IOCPPASSINDATA(bufsize);
recv_data->event = IOCPEVENT::READ;
recv_data->socket = data->socket;
recv_data->socket = std::make_shared<Socket>(sock);
recv_data->IOCPInstance = this;
DWORD recvbytes = 0, flags = 0;
int result = SOCKET_ERROR;
::WSARecv(recv_data->socket->sock, &recv_data->wsabuf, 1, &recvbytes, &flags,
&recv_data->overlapped, NULL);
result = ::WSARecv(recv_data->socket->sock, &recv_data->wsabuf, 1, &recvbytes,
&flags, &recv_data->overlapped, NULL);
if (result == SOCKET_ERROR) {
int err = ::WSAGetLastError();
if (err != WSA_IO_PENDING) {
@@ -94,12 +95,11 @@ void IOCP::registerUDPSocket(IOCPPASSINDATA* data, Address recv_addr) {
#endif
}
int IOCP::recv(IOCPPASSINDATA* data) { // 읽은 바이트수가 무조건 100임? 왜..?
SOCKET sock = data->socket->sock;
std::lock_guard lock(*GetRecvQueueMutex_(sock));
auto queue = GetRecvQueue_(sock);
int IOCP::recv(Socket& sock, std::vector<char>& data) {
std::lock_guard lock(*GetRecvQueueMutex_(sock.sock));
auto queue = GetRecvQueue_(sock.sock);
std::uint32_t left_data = data->wsabuf.len;
std::uint32_t left_data = data.size();
std::uint32_t copied = 0;
while (!queue->empty() && left_data != 0) {
@@ -110,7 +110,7 @@ int IOCP::recv(IOCPPASSINDATA* data) { // 읽은 바이트수가 무조건 100
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.data() + copied, front.first.data() + offset, to_copy);
copied += to_copy;
left_data -= to_copy;
offset += to_copy;
@@ -125,17 +125,21 @@ int IOCP::recv(IOCPPASSINDATA* data) { // 읽은 바이트수가 무조건 100
return copied;
}
int IOCP::send(SOCKET sock, std::vector<IOCPPASSINDATA*>* data) {
auto lk = GetSendQueueMutex_(sock);
auto queue = GetSendQueue_(sock);
int IOCP::send(Socket& sock, std::vector<char>& data) {
auto lk = GetSendQueueMutex_(sock.sock);
auto queue = GetSendQueue_(sock.sock);
std::lock_guard lock(*lk);
for (auto& it : *data) {
it->event = IOCPEVENT::WRITE;
queue->push_back(it);
}
Network::IOCPPASSINDATA* packet = new Network::IOCPPASSINDATA(data.size());
packet->event = IOCPEVENT::WRITE;
packet->socket = std::make_shared<Network::Socket>(sock);
packet->IOCPInstance = this;
::memcpy(packet->wsabuf.buf, data.data(), data.size());
packet->wsabuf.len = data.size();
queue->push_back(packet);
IOCPThread_->enqueueJob(
[this, sock](utils::ThreadPool* th, std::uint8_t __) {
[this, sock = sock.sock](utils::ThreadPool* th, std::uint8_t __) {
packet_sender_(sock);
},
0);
@@ -143,8 +147,8 @@ int IOCP::send(SOCKET sock, std::vector<IOCPPASSINDATA*>* data) {
}
int IOCP::GetRecvedBytes(SOCKET sock) {
std::lock_guard lock(socket_mod_mutex_);
auto queue = GetRecvQueue_(sock);
std::lock_guard lock(socket_mod_mutex_);
int bytes = 0;
for (auto it : *queue) {
@@ -175,6 +179,10 @@ void IOCP::iocpWatcher_(utils::ThreadPool* IOCPThread) {
spdlog::debug("Disconnected. [{}]",
(std::string)(data->socket->remoteAddr));
delete data;
IOCPThread->enqueueJob(
[this](utils::ThreadPool* th, std::uint8_t __) { iocpWatcher_(th); },
0);
return;
} else {
data->transferredbytes = cbTransfrred;
}