일단 iocp는 완성한 듯 윈도우에서만 되면 될 듯

impl/Socket/IOCP.cpp

@@ -5,13 +5,22 @@
 
 namespace Chattr {
 
-void IOCP::registerSocket(SOCKET sock) {
+void IOCP::registerSocket(Chattr::IOCPPASSINDATA* data) {
 #ifdef _WIN32
-	HANDLE returnData = ::CreateIoCompletionPort((HANDLE)sock, completionPort_, sock, 0);
+	HANDLE returnData = ::CreateIoCompletionPort((HANDLE)data->socket.sock, completionPort_, data->socket.sock, 0);
 	if (returnData == 0)
 		completionPort_ = returnData;
 #elif __linux__
+	// int flags = ::fcntl(data->socket.sock, F_GETFL);
+	// flags |= O_NONBLOCK;
+	// fcntl(data->socket.sock, F_SETFL, flags);
 
+	struct epoll_event ev;
+	ev.events = EPOLLIN | EPOLLONESHOT;
+	ev.data.ptr = data;
+	int rc = epoll_ctl(epollfd_, EPOLL_CTL_ADD, data->socket.sock, &ev);
+	if (rc < 0)
+		log::critical("epoll_ctl()");
 #endif
 }
 
@@ -20,7 +29,10 @@ int IOCP::recv(Chattr::IOCPPASSINDATA* data) {
 	DWORD recvbytes = 0, flags = 0;
 	return ::WSARecv(data->socket.sock, &data->wsabuf, 1, &recvbytes, &flags, &data->overlapped, NULL);
 #elif __linux__
-	return -1;
+	struct epoll_event ev;
+	ev.events = EPOLLIN | EPOLLONESHOT;
+	ev.data.ptr = data;
+	return ::epoll_ctl(epollfd_, EPOLL_CTL_MOD, data->socket.sock, &ev);
 #endif
 }
 
@@ -29,7 +41,10 @@ int IOCP::send(Chattr::IOCPPASSINDATA* data, int __flags) {
 	DWORD sendbytes = 0;
 	return ::WSASend(data->socket.sock, &data->wsabuf, 1, &sendbytes, __flags, &data->overlapped, NULL);
 #elif __linux__
-	return -1;
+	struct epoll_event ev;
+	ev.events = EPOLLOUT | EPOLLONESHOT;
+	ev.data.ptr = data;
+	return ::epoll_ctl(epollfd_, EPOLL_CTL_MOD, data->socket.sock, &ev);
 #endif
 }
 

impl/Utils/Thread.cpp

@@ -4,10 +4,12 @@ namespace Chattr {
 
 Thread::Thread(Thread&& other) noexcept {
 	other.detach();
+	memcpy(this, &other, sizeof(Thread));
 }
 
 Thread& Thread::operator=(Thread&& other) noexcept {
 	other.detach();
+	memcpy(this, &other, sizeof(Thread));
 	return *this;
 }
 
@@ -16,8 +18,6 @@ Thread::~Thread() {
 		spdlog::critical("There is not joined thread");
 		std::exit(EXIT_FAILURE);
 	}
-	if (returnValuePtr != nullptr)
-		delete returnValuePtr;
 }
 
 void Thread::detach() {

impl/Utils/ThreadPool.cpp

@@ -63,11 +63,16 @@ void* ThreadPool::Worker() {
 #elif __linux__
 	pthread_t pid = pthread_self();
 #endif
+	spdlog::debug("ThreadPool Worker : {} up", pid);
 	while (!terminate_) {
 		std::unique_lock<std::mutex> lock(jobQueueMutex);
 		jobQueueCV_.wait(lock, [this]() { return !this->jobs_.empty() || terminate_; });
-		if (this->jobs_.empty())
+		if (this->jobs_.empty() || terminate_) {
+			jobs_ = std::queue<std::packaged_task<void()>>();
 			break;
+		}
+		if (this->jobs_.empty())
+			continue;
 
 		auto job = std::move(jobs_.front());
 		jobs_.pop();
@@ -76,6 +81,7 @@ void* ThreadPool::Worker() {
 		spdlog::debug("ThreadPool Worker : {} Executing a job", pid);
 		job();
 	}
+	spdlog::debug("ThreadPool Worker : {} down", pid);
 
 	return nullptr;
 }