]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/socketengine_iocp.cpp
We were already sending FMODE +nt after each channel creation to keep services happy...
[user/henk/code/inspircd.git] / src / socketengine_iocp.cpp
index 947b518b67a3d164a8d3fa1e09a497a644ab10c9..1ec70d2893a4afd3ce36819b8a533a86b1266681 100644 (file)
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
- */\r
-\r
-#include "socketengine_iocp.h"\r
-#include <mswsock.h>\r
-#include <assert.h>\r
-\r
-IOCPEngine::IOCPEngine(InspIRCd * Instance) : SocketEngine(Instance)\r
-{\r
-       // Create completion port\r
-       m_completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, (ULONG_PTR)0, 0);\r
-\r
-       // Null variables out.\r
-       CurrentSetSize = 0;\r
-       EngineHandle = 0;\r
-       memset(ref, 0, sizeof(EventHandler*) * MAX_DESCRIPTORS);\r
-}\r
-\r
-IOCPEngine::~IOCPEngine()\r
-{\r
-       CloseHandle(m_completionPort);\r
-};\r
-\r
-bool IOCPEngine::AddFd(EventHandler* eh)\r
-{\r
-       int fake_fd = GenerateFd();\r
-       int is_accept = 0;\r
-       int opt_len = sizeof(int);\r
-       if(fake_fd < 0)\r
-               return false;\r
-\r
-       // are we a listen socket?\r
-       getsockopt(eh->GetFd(), SOL_SOCKET, SO_ACCEPTCONN, (char*)&is_accept, &opt_len);\r
-\r
-       // set up the read event so the socket can actually receive data :P\r
-       eh->m_internalFd = fake_fd;\r
-       eh->m_writeEvent = 0;\r
-       eh->m_acceptEvent = 0;\r
-\r
-       // assign the socket to the completion port\r
-       if(!CreateIoCompletionPort((HANDLE)eh->GetFd(), m_completionPort, (ULONG_PTR)eh->m_internalFd, 0))\r
-               return false;\r
-\r
-       // set up binding, increase set size\r
-       ref[fake_fd] = eh;\r
-       ++CurrentSetSize;\r
-\r
-       // setup initial events\r
-       if(is_accept)\r
-               PostAcceptEvent(eh);\r
-       else\r
-               PostReadEvent(eh);\r
-\r
-       // log message\r
-       ServerInstance->Log(DEBUG, "New fake fd: %u, real fd: %u, address 0x%p", fake_fd, eh->GetFd(), eh);\r
-\r
-       // post a write event if there is data to be written\r
-       if(eh->Writeable())\r
-               WantWrite(eh);\r
-\r
-       // we're all good =)\r
-       m_binding.insert( map<int, EventHandler*>::value_type( eh->GetFd(), eh ) );\r
-       return true;\r
-}\r
-\r
-bool IOCPEngine::DelFd(EventHandler* eh, bool force /* = false */)\r
-{\r
-       int fake_fd = eh->m_internalFd;\r
-       int fd = eh->GetFd();\r
-       \r
-       if(ref[fake_fd] == 0)\r
-               return false;\r
-\r
-       ServerInstance->Log(DEBUG, "Removing fake fd %u, real fd %u, address 0x%p", fake_fd, eh->GetFd(), eh);\r
-\r
-       // Cancel pending i/o operations.\r
-       assert(CancelIo((HANDLE)fd) == TRUE);\r
-\r
-       // Free the buffer, and delete the event.\r
-       if(eh->m_readEvent != 0)\r
-               delete ((Overlapped*)eh->m_readEvent);\r
-\r
-       if(eh->m_writeEvent != 0)\r
-               delete ((Overlapped*)eh->m_writeEvent);\r
-\r
-       if(eh->m_acceptEvent != 0)\r
-       {\r
-               delete ((accept_overlap*)((Overlapped*)eh->m_acceptEvent)->m_params);\r
-               delete ((Overlapped*)eh->m_acceptEvent);\r
-       }\r
-\r
-       // Clear binding\r
-       ref[fake_fd] = 0;\r
-       m_binding.erase(eh->GetFd());\r
-\r
-       // decrement set size\r
-       --CurrentSetSize;\r
-       \r
-       // success\r
-       return true;\r
-}\r
-\r
-void IOCPEngine::WantWrite(EventHandler* eh)\r
-{\r
-       // Post event - write begin\r
-       if(!eh->m_writeEvent)\r
-       {\r
-               Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_WRITE_READY, 0);\r
-               eh->m_writeEvent = (void*)ov;\r
-               PostQueuedCompletionStatus(m_completionPort, 0, (ULONG_PTR)eh->m_internalFd, &ov->m_overlap);\r
-       }\r
-}\r
-\r
-bool IOCPEngine::PostCompletionEvent(EventHandler * eh, SocketIOEvent type, int param)\r
-{\r
-       Overlapped * ov = new Overlapped(type, param);\r
-       return PostQueuedCompletionStatus(m_completionPort, 0, (ULONG_PTR)eh->m_internalFd, &ov->m_overlap);\r
-}\r
-\r
-void IOCPEngine::PostReadEvent(EventHandler * eh)\r
-{\r
-       Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_READ_READY, 0);\r
-       DWORD flags = 0;\r
-       DWORD r_length = 0;\r
-       WSABUF buf;\r
-\r
-       // by passing a null buffer pointer, we can have this working in the same way as epoll..\r
-       // its slower, but it saves modifying all network code.\r
-       buf.buf = 0;\r
-       buf.len = 0;\r
-\r
-       // determine socket type.\r
-       DWORD sock_type;\r
-       int sock_len = sizeof(DWORD);\r
-       if(getsockopt(eh->GetFd(), SOL_SOCKET, SO_TYPE, (char*)&sock_type, &sock_len) == -1)\r
-       {\r
-               // wtfhax?\r
-               PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, 0);\r
-               delete ov;\r
-               return;\r
-       }\r
-       switch(sock_type)\r
-       {\r
-       case SOCK_DGRAM:                        // UDP Socket\r
-               {\r
-                       if(WSARecvFrom(eh->GetFd(), &buf, 1, &r_length, &flags, 0, 0, &ov->m_overlap, 0))\r
-                       {\r
-                               int err = WSAGetLastError();\r
-                               if(WSAGetLastError() != WSA_IO_PENDING)\r
-                               {\r
-                                       delete ov;\r
-                                       PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, 0);\r
-                                       return;\r
-                               }\r
-                       }\r
-               }break;\r
-\r
-       case SOCK_STREAM:                       // TCP Socket\r
-               {\r
-                       if(WSARecv(eh->GetFd(), &buf, 1, &r_length, &flags, &ov->m_overlap, 0) == SOCKET_ERROR)\r
-                       {\r
-                               if(WSAGetLastError() != WSA_IO_PENDING)\r
-                               {\r
-                                       delete ov;\r
-                                       PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, 0);\r
-                                       return;\r
-                               }\r
-                       }\r
-               }break;\r
-\r
-       default:\r
-               {\r
-                       printf("unknwon socket type: %u\n", sock_type);\r
-                       assert(false);\r
-               }break;\r
-       }\r
-       eh->m_readEvent = (void*)ov;\r
-}\r
-\r
-int IOCPEngine::DispatchEvents()\r
-{\r
-       DWORD len;\r
-       LPOVERLAPPED overlap;\r
-       Overlapped * ov;\r
-       EventHandler * eh;\r
-       int intfd;\r
-       int ret;\r
-       unsigned long bytes_recv;\r
-\r
-       while(GetQueuedCompletionStatus(m_completionPort, &len, (PULONG_PTR)&intfd, &overlap, 100))\r
-       {\r
-               // woot, we got an event on a socket :P\r
-               eh = ref[intfd];\r
-               ov = CONTAINING_RECORD(overlap, Overlapped, m_overlap);\r
-               if(eh == 0) continue;\r
-               switch(ov->m_event)\r
-               {\r
-               case SOCKET_IO_EVENT_WRITE_READY:\r
-                       {\r
-                               eh->m_writeEvent = 0;\r
-                               eh->HandleEvent(EVENT_WRITE, 0);\r
-                       }break;\r
-\r
-               case SOCKET_IO_EVENT_READ_READY:\r
-                       {\r
-                               ret = ioctlsocket(eh->GetFd(), FIONREAD, &bytes_recv);\r
-                               eh->m_readEvent = 0;\r
-                               if(ret != 0 || bytes_recv == 0)\r
-                               {\r
-                                       // end of file\r
-                                       PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, EIO);\r
-                               }\r
-                               else\r
-                               {\r
-                                       eh->HandleEvent(EVENT_READ, 0);\r
-                                       PostReadEvent(eh);\r
-                               }\r
-                       }break;\r
-               \r
-               case SOCKET_IO_EVENT_ACCEPT:\r
-                       {\r
-                               /* this is kinda messy.. :/ */\r
-                               eh->HandleEvent(EVENT_READ, ov->m_params);\r
-                               delete ((accept_overlap*)ov->m_params);\r
-                               eh->m_acceptEvent = 0;\r
-                               PostAcceptEvent(eh);\r
-                       }break;\r
-\r
-               case SOCKET_IO_EVENT_ERROR:\r
-                       {\r
-                               eh->HandleEvent(EVENT_ERROR, ov->m_params);\r
-                       }break;\r
-               }\r
-               \r
-               delete ov;\r
-       }\r
-\r
-       return 0;\r
-}\r
-\r
-void IOCPEngine::PostAcceptEvent(EventHandler * eh)\r
-{\r
-       int fd = WSASocket(AF_INET, SOCK_STREAM, 0, 0, 0, WSA_FLAG_OVERLAPPED);\r
-       int len = sizeof(sockaddr_in) + 16;\r
-       DWORD dwBytes;\r
-       accept_overlap * ao = new accept_overlap;\r
-       memset(ao->buf, 0, 1024);\r
-       ao->socket = fd;\r
-\r
-       Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_ACCEPT, (int)ao);\r
-       eh->m_acceptEvent = (void*)ov;\r
-\r
-       if(AcceptEx(eh->GetFd(), fd, ao->buf, 0, len, len, &dwBytes, &ov->m_overlap) == FALSE)\r
-       {\r
-               int err = WSAGetLastError();\r
-               if(err != WSA_IO_PENDING)\r
-               {\r
-                       printf("PostAcceptEvent err: %d\n", err);\r
-               }\r
-       }\r
-}\r
-\r
-\r
-std::string IOCPEngine::GetName()\r
-{\r
-       return "iocp";\r
-}\r
-\r
-int __accept_socket(SOCKET s, sockaddr * addr, int * addrlen, void * acceptevent)\r
-{\r
-       Overlapped * ovl = (Overlapped*)acceptevent;\r
-       accept_overlap * ov = (accept_overlap*)ovl->m_params;
-
-       sockaddr_in * server_address = (sockaddr_in*)&ov->buf[10];
-       sockaddr_in * client_address = (sockaddr_in*)&ov->buf[38];
+ */
+
+#include "socketengine_iocp.h"
+#include <mswsock.h>
+
+IOCPEngine::IOCPEngine(InspIRCd * Instance) : SocketEngine(Instance)
+{
+       /* Create completion port */
+       m_completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, (ULONG_PTR)0, 0);
+
+       /* Null variables out. */
+       CurrentSetSize = 0;
+       EngineHandle = 0;
+       memset(ref, 0, sizeof(EventHandler*) * MAX_DESCRIPTORS);
+}
+
+IOCPEngine::~IOCPEngine()
+{
+       CloseHandle(m_completionPort);
+}
+
+bool IOCPEngine::AddFd(EventHandler* eh)
+{
+       int fake_fd = GenerateFd();
+       int is_accept = 0;
+       int opt_len = sizeof(int);
+       if(fake_fd < 0)
+               return false;
+
+       /* are we a listen socket? */
+       getsockopt(eh->GetFd(), SOL_SOCKET, SO_ACCEPTCONN, (char*)&is_accept, &opt_len);
+
+       /* set up the read event so the socket can actually receive data :P */
+       eh->m_internalFd = fake_fd;
+       eh->m_writeEvent = 0;
+       eh->m_acceptEvent = 0;
+
+       /* assign the socket to the completion port */
+       if(!CreateIoCompletionPort((HANDLE)eh->GetFd(), m_completionPort, (ULONG_PTR)eh->m_internalFd, 0))
+               return false;
+
+       /* set up binding, increase set size */
+       ref[fake_fd] = eh;
+       ++CurrentSetSize;
+
+       /* setup initial events */
+       if(is_accept)
+               PostAcceptEvent(eh);
+       else
+               PostReadEvent(eh);
+
+       /* log message */
+       ServerInstance->Log(DEBUG, "New fake fd: %u, real fd: %u, address 0x%p", fake_fd, eh->GetFd(), eh);
+
+       /* post a write event if there is data to be written */
+       if(eh->Writeable())
+               WantWrite(eh);
+
+       /* we're all good =) */
+       try
+       {
+               m_binding.insert( map<int, EventHandler*>::value_type( eh->GetFd(), eh ) );
+       }
+       catch (...)
+       {
+               /* Ohshi-, map::insert failed :/ */
+               return false;
+       }
+
+       return true;
+}
+
+bool IOCPEngine::DelFd(EventHandler* eh, bool force /* = false */)
+{
+       int fake_fd = eh->m_internalFd;
+       int fd = eh->GetFd();
+       
+       if(ref[fake_fd] == 0)
+               return false;
+
+       ServerInstance->Log(DEBUG, "Removing fake fd %u, real fd %u, address 0x%p", fake_fd, eh->GetFd(), eh);
+
+       /* Cancel pending i/o operations. */
+       if (CancelIo((HANDLE)fd) == FALSE)
+               return false;
+
+       /* Free the buffer, and delete the event. */
+       if(eh->m_readEvent != 0)
+               delete ((Overlapped*)eh->m_readEvent);
+
+       if(eh->m_writeEvent != 0)
+               delete ((Overlapped*)eh->m_writeEvent);
+
+       if(eh->m_acceptEvent != 0)
+       {
+               delete ((accept_overlap*)((Overlapped*)eh->m_acceptEvent)->m_params);
+               delete ((Overlapped*)eh->m_acceptEvent);
+       }
+
+       /* Clear binding */
+       ref[fake_fd] = 0;
+       m_binding.erase(eh->GetFd());
+
+       /* decrement set size */
+       --CurrentSetSize;
+       
+       /* success */
+       return true;
+}
+
+void IOCPEngine::WantWrite(EventHandler* eh)
+{
+       /* Post event - write begin */
+       if(!eh->m_writeEvent)
+       {
+               Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_WRITE_READY, 0);
+               eh->m_writeEvent = (void*)ov;
+               PostQueuedCompletionStatus(m_completionPort, 0, (ULONG_PTR)eh->m_internalFd, &ov->m_overlap);
+       }
+}
+
+bool IOCPEngine::PostCompletionEvent(EventHandler * eh, SocketIOEvent type, int param)
+{
+       Overlapped * ov = new Overlapped(type, param);
+       return PostQueuedCompletionStatus(m_completionPort, 0, (ULONG_PTR)eh->m_internalFd, &ov->m_overlap);
+}
+
+void IOCPEngine::PostReadEvent(EventHandler * eh)
+{
+       Overlapped * ov = new Overlapped(SOCKET_IO_EVENT_READ_READY, 0);
+       DWORD flags = 0;
+       DWORD r_length = 0;
+       WSABUF buf;
+
+       /* by passing a null buffer pointer, we can have this working in the same way as epoll..
+        * its slower, but it saves modifying all network code.
+        */
+       buf.buf = 0;
+       buf.len = 0;
+
+       /* determine socket type. */
+       DWORD sock_type;
+       int sock_len = sizeof(DWORD);
+       if(getsockopt(eh->GetFd(), SOL_SOCKET, SO_TYPE, (char*)&sock_type, &sock_len) == -1)
+       {
+               /* wtfhax? */
+               PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, 0);
+               delete ov;
+               return;
+       }
+       switch(sock_type)
+       {
+               case SOCK_DGRAM:                        /* UDP Socket */
+               {
+                       if(WSARecvFrom(eh->GetFd(), &buf, 1, &r_length, &flags, 0, 0, &ov->m_overlap, 0))
+                       {
+                               int err = WSAGetLastError();
+                               if(WSAGetLastError() != WSA_IO_PENDING)
+                               {
+                                       delete ov;
+                                       PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, 0);
+                                       return;
+                               }
+                       }
+               }
+               break;
+
+               case SOCK_STREAM:                       /* TCP Socket */
+               {
+                       if(WSARecv(eh->GetFd(), &buf, 1, &r_length, &flags, &ov->m_overlap, 0) == SOCKET_ERROR)
+                       {
+                               if(WSAGetLastError() != WSA_IO_PENDING)
+                               {
+                                       delete ov;
+                                       PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, 0);
+                                       return;
+                               }
+                       }
+               }
+               break;
+
+               default:
+               {
+                       printf("unknwon socket type: %u\n", sock_type);
+                       return;
+               }
+               break;
+       }
+       eh->m_readEvent = (void*)ov;
+}
+
+int IOCPEngine::DispatchEvents()
+{
+       DWORD len;
+       LPOVERLAPPED overlap;
+       Overlapped * ov;
+       EventHandler * eh;
+       int intfd;
+       int ret;
+       unsigned long bytes_recv;
+
+       while(GetQueuedCompletionStatus(m_completionPort, &len, (PULONG_PTR)&intfd, &overlap, 100))
+       {
+               // woot, we got an event on a socket :P
+               eh = ref[intfd];
+               ov = CONTAINING_RECORD(overlap, Overlapped, m_overlap);
+               if(eh == 0) continue;
+               switch(ov->m_event)
+               {
+                       case SOCKET_IO_EVENT_WRITE_READY:
+                       {
+                               eh->m_writeEvent = 0;
+                               eh->HandleEvent(EVENT_WRITE, 0);
+                       }
+                       break;
+
+                       case SOCKET_IO_EVENT_READ_READY:
+                       {
+                               ret = ioctlsocket(eh->GetFd(), FIONREAD, &bytes_recv);
+                               eh->m_readEvent = 0;
+                               if(ret != 0 || bytes_recv == 0)
+                               {
+                                       /* end of file */
+                                       PostCompletionEvent(eh, SOCKET_IO_EVENT_ERROR, EIO); /* Old macdonald had an error, EIEIO. */
+                               }
+                               else
+                               {
+                                       eh->HandleEvent(EVENT_READ, 0);
+                                       PostReadEvent(eh);
+                               }
+                       }
+                       break;
+               
+                       case SOCKET_IO_EVENT_ACCEPT:
+                       {
+                               /* this is kinda messy.. :/ */
+                               eh->HandleEvent(EVENT_READ, ov->m_params);
+                               delete ((accept_overlap*)ov->m_params);
+                               eh->m_acceptEvent = 0;
+                               PostAcceptEvent(eh);
+                       }
+                       break;
+
+                       case SOCKET_IO_EVENT_ERROR:
+                       {
+                               eh->HandleEvent(EVENT_ERROR, ov->m_params);
+                       }
+                       break;
+               }
+               
+               delete ov;
+       }
+
+       return 0;
+}
+
+void IOCPEngine::PostAcceptEvent(EventHandler * eh)
+{
+       int fd = WSASocket(AF_INET, SOCK_STREAM, 0, 0, 0, WSA_FLAG_OVERLAPPED);
+       int len = sizeof(sockaddr_in) + 16;
+       DWORD dwBytes;
+       accept_overlap* ao = new accept_overlap;
+       memset(ao->buf, 0, 1024);
+       ao->socket = fd;
+
+       Overlapped* ov = new Overlapped(SOCKET_IO_EVENT_ACCEPT, (int)ao);
+       eh->m_acceptEvent = (void*)ov;
+
+       if(AcceptEx(eh->GetFd(), fd, ao->buf, 0, len, len, &dwBytes, &ov->m_overlap) == FALSE)
+       {
+               int err = WSAGetLastError();
+               if(err != WSA_IO_PENDING)
+               {
+                       printf("PostAcceptEvent err: %d\n", err);
+               }
+       }
+}
+
+
+std::string IOCPEngine::GetName()
+{
+       return "iocp";
+}
+
+int __accept_socket(SOCKET s, sockaddr * addr, int * addrlen, void * acceptevent)
+{
+       Overlapped* ovl = (Overlapped*)acceptevent;
+       accept_overlap* ov = (accept_overlap*)ovl->m_params;
+
+       sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
+       sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
 
        memcpy(addr, client_address, sizeof(sockaddr_in));
        *addrlen = sizeof(sockaddr_in);
@@ -292,11 +309,11 @@ int __accept_socket(SOCKET s, sockaddr * addr, int * addrlen, void * acceptevent
 
 int __getsockname(SOCKET s, sockaddr * name, int * namelen, void * acceptevent)
 {
-       Overlapped * ovl = (Overlapped*)acceptevent;\r
-       accept_overlap * ov = (accept_overlap*)ovl->m_params;
+       Overlapped* ovl = (Overlapped*)acceptevent;
+       accept_overlap* ov = (accept_overlap*)ovl->m_params;
 
-       sockaddr_in * server_address = (sockaddr_in*)&ov->buf[10];
-       sockaddr_in * client_address = (sockaddr_in*)&ov->buf[38];
+       sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
+       sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
 
        memcpy(name, server_address, sizeof(sockaddr_in));
        *namelen = sizeof(sockaddr_in);
@@ -321,3 +338,4 @@ EventHandler * IOCPEngine::GetIntRef(int fd)
                return 0;
        return ref[fd];
 }
+