Replaced select() with poll() in EHS

Author: ccw808

Server/dbconmy/StdInc.h

@@ -2,7 +2,6 @@
 #pragma message("Compiling precompiled header.\n")
 
 #include <windows.h>
-#include <winsock.h>
 #include <mmsystem.h>
 #endif
 

Server/mods/deathmatch/StdInc.h

@@ -1,8 +1,8 @@
 #ifdef WIN32
 #pragma message("Compiling precompiled header.\n")
 
+#include <winsock2.h>
 #include <windows.h>
-#include <winsock.h>
 #include <mmsystem.h>
 #endif
 
@@ -305,4 +305,4 @@ struct SAclRequest;
 #include "../../version.h"
 
 extern CNetServer* g_pRealNetServer;
-extern CGame* g_pGame;
+extern CGame* g_pGame;

Server/mods/deathmatch/logic/ASE.h

@@ -20,7 +20,6 @@ class ASE;
 
 #ifdef WIN32
     #include <conio.h>
-    #include <winsock.h>
     #define sockclose closesocket
 #else
     #include <sys/socket.h>

Server/mods/deathmatch/logic/CLanBroadcast.h

@@ -22,7 +22,6 @@ class CLanBroadcastDLL;
 
 #ifdef WIN32
     #include <conio.h>
-    #include <winsock.h>
 #else
     #include <sys/socket.h>
     #include <sys/stat.h>

vendor/ehs/CPollFdSet.h

@@ -0,0 +1,59 @@
+//
+// CPollFdSet.h
+//
+// Array of file descriptors for poll()
+//
+
+class CPollFdSet
+{
+public:
+    // FD_ZERO
+    void Reset( void )
+    {
+        m_uiFdCount = 0;
+    }
+
+    // FD_SET
+    // Assumes the fd has not been added already
+    void Add( int fd, short events )
+    {
+        unsigned int i = m_uiFdCount;
+        if ( i < FD_ARRAY_LENGTH )
+        {
+            m_FdArray[i].fd = fd;
+            m_FdArray[i].events = events;
+            m_FdArray[i].revents = 0;
+            m_uiFdCount = i + 1;
+        }
+    }
+
+    // FD_ISSET
+    // Check if event has been triggered for the fd
+    bool IsSet( int fd, short events ) const
+    {
+        for( unsigned int i = 0 ; i < m_uiFdCount ; i++ )
+        {
+            if ( m_FdArray[i].fd == fd &&
+                (m_FdArray[i].events & events) != 0 )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    unsigned int GetFdCount( void ) const
+    {
+        return m_uiFdCount;
+    }
+
+    pollfd* GetFdArray( void )
+    {
+        return m_FdArray;
+    }
+
+protected:
+    const static int    FD_ARRAY_LENGTH = 2048;
+    unsigned int        m_uiFdCount;
+    pollfd              m_FdArray[FD_ARRAY_LENGTH];
+};

vendor/ehs/ehs.cpp

@@ -40,12 +40,11 @@ static bool MUTEX_TRY_LOCK( MUTEX_TYPE& x )
 int EHSServer::CreateFdSet ( )
 {
     MUTEX_LOCK ( m_oMutex );
-	// don't lock mutex, as it is only called from within a locked section
 
-	FD_ZERO( &m_oReadFds );
+	m_oReadFds.Reset();
 
 	// add the accepting FD	
-	FD_SET( m_poNetworkAbstraction->GetFd ( ), &m_oReadFds );
+	m_oReadFds.Add( m_poNetworkAbstraction->GetFd(), POLLIN );
 
 	int nHighestFd = m_poNetworkAbstraction->GetFd ( );
 
@@ -61,7 +60,7 @@ int EHSServer::CreateFdSet ( )
 
 			EHS_TRACE ( "Adding %d to FD SET\n", nCurrentFd );
 
-			FD_SET ( nCurrentFd, &m_oReadFds );
+			m_oReadFds.Add( nCurrentFd, POLLIN );
 
 			// store the highest FD in the set to return it
 			if ( nCurrentFd > nHighestFd ) {
@@ -889,22 +888,9 @@ void EHSServer::HandleData ( int inTimeoutMilliseconds, ///< milliseconds for ti
 
 			MUTEX_UNLOCK ( m_oMutex );
 
-			// set up the timeout and normalize
-			timeval tv = { 0, inTimeoutMilliseconds * 1000 }; 
-			tv.tv_sec = tv.tv_usec / 1000000;
-			tv.tv_usec %= 1000000;
-
-			// create the FD set for select
-			int nHighestFd = CreateFdSet ( );			
-			
-			// call select
-			//fprintf ( stderr, "##### [%d] Calling select\n", inThreadId );
-			int nSocketCount = select ( nHighestFd + 1,
-										&m_oReadFds,
-										NULL,
-										NULL,
-										&tv );
-			//fprintf ( stderr, "##### [%d] Done calling select\n", inThreadId );
+			// create the FD set for poll
+			CreateFdSet();
+			int nSocketCount = poll( m_oReadFds.GetFdArray(), m_oReadFds.GetFdCount(), inTimeoutMilliseconds );
 
 			// handle select error
 #ifdef _WIN32
@@ -971,7 +957,7 @@ void EHSServer::CheckAcceptSocket ( )
 {
 
 	// see if we got data on this socket
-	if ( FD_ISSET ( m_poNetworkAbstraction->GetFd ( ), &m_oReadFds ) ) {
+	if ( m_oReadFds.IsSet( m_poNetworkAbstraction->GetFd(), POLLIN ) ) {
 
 
         //printf ( "Accept new connection\n");
@@ -1031,7 +1017,7 @@ void EHSServer::CheckClientSockets ( )
 		  i != m_oEHSConnectionList.end ( );
 		  i++ ) {
 
-		if ( FD_ISSET ( (*i)->GetNetworkAbstraction ( )->GetFd ( ), &m_oReadFds ) ) {
+		if ( m_oReadFds.IsSet( (*i)->GetNetworkAbstraction()->GetFd(), POLLIN ) ) {
 
             if ( MUTEX_TRY_LOCK ( (*i)->m_oConnectionMutex ) == false )
                 continue;

vendor/ehs/ehs.h

@@ -49,6 +49,7 @@
 #pragma warning(disable : 4786)
 
 // to use winsock2.h instead of winsock.h
+#include <winsock2.h>
 #include <windows.h>
 
 #include <time.h>
@@ -473,8 +474,7 @@ class EHSServer {
 	int CreateFdSet ( );
 
 	/// this is the read set for sending to select(2)
-	fd_set m_oReadFds;
-	int m_TestPadding[2000];
+	CPollFdSet m_oReadFds;
 
 	/// List of all connections currently attached to the server
 	EHSConnectionList m_oEHSConnectionList;

vendor/ehs/socket.cpp

@@ -42,18 +42,6 @@ Zac Hansen ( xaxxon@slackworks.com )
 #endif
 #endif // sun
 
-#ifdef _WIN32
-    #include <Winsock2.h>
-#endif
-#if !defined(_WIN32) || _WIN32_WINNT >= 0x600
-    #define USE_POLL
-    #pragma message ("EHS Socket using poll()")
-    #ifdef _WIN32
-        #define poll WSAPoll
-    #else
-        #include <sys/poll.h>
-    #endif
-#endif
 
 #include "socket.h"
 
@@ -337,21 +325,10 @@ void Socket::SetReuseAddress( bool bOn )
 
 bool Socket::IsReadable( int inTimeoutMilliseconds )
 {
-#ifndef USE_POLL
-	timeval tv = { 0, inTimeoutMilliseconds * 1000 }; 
-	tv.tv_sec = tv.tv_usec / 1000000;
-	tv.tv_usec %= 1000000;
-    fd_set rfds;
-    FD_ZERO(&rfds);
-    FD_SET(nAcceptSocket, &rfds);
-    // See if socket it writable
-    int ret = select(nAcceptSocket+1, &rfds, NULL, NULL, &tv);
-#else
     pollfd fds[1] = { 0 };
     fds[0].fd = nAcceptSocket;
     fds[0].events = POLLIN;
     int ret = poll(fds, 1, inTimeoutMilliseconds);
-#endif
     if (ret == 0)
         return false;     // Not readable yet
     if (ret == -1)
@@ -362,21 +339,10 @@ bool Socket::IsReadable( int inTimeoutMilliseconds )
 
 bool Socket::IsWritable( int inTimeoutMilliseconds )
 {
-#ifndef USE_POLL
-	timeval tv = { 0, inTimeoutMilliseconds * 1000 }; 
-	tv.tv_sec = tv.tv_usec / 1000000;
-	tv.tv_usec %= 1000000;
-    fd_set wfds;
-    FD_ZERO(&wfds);
-    FD_SET(nAcceptSocket, &wfds);
-    // See if socket it writable
-    int ret = select(nAcceptSocket+1, NULL, &wfds, NULL, &tv);
-#else
     pollfd fds[1] = { 0 };
     fds[0].fd = nAcceptSocket;
     fds[0].events = POLLOUT;
     int ret = poll(fds, 1, inTimeoutMilliseconds);
-#endif
     if (ret == 0)
         return false;     // Not writable yet
     if (ret == -1)
@@ -387,21 +353,10 @@ bool Socket::IsWritable( int inTimeoutMilliseconds )
 
 bool Socket::IsAtError( int inTimeoutMilliseconds )
 {
-#ifndef USE_POLL
-	timeval tv = { 0, inTimeoutMilliseconds * 1000 }; 
-	tv.tv_sec = tv.tv_usec / 1000000;
-	tv.tv_usec %= 1000000;
-    fd_set efds;
-    FD_ZERO(&efds);
-    FD_SET(nAcceptSocket, &efds);
-    // See if socket it writable
-    int ret = select(nAcceptSocket+1, NULL, NULL, &efds, &tv);
-#else
     pollfd fds[1] = { 0 };
     fds[0].fd = nAcceptSocket;
     fds[0].events = POLLERR;
     int ret = poll(fds, 1, inTimeoutMilliseconds);
-#endif
     if (ret == 0)
         return false;     // Not error
     if (ret == -1)

vendor/ehs/socket.h

@@ -38,7 +38,7 @@ Zac Hansen ( xaxxon@slackworks.com )
 #pragma warning(disable : 4786)
 
 // to use winsock2.h instead of winsock.h
-#include <winsock.h>
+#include <winsock2.h>
 #include <windows.h>
 #include <time.h>
 
@@ -58,16 +58,19 @@ Zac Hansen ( xaxxon@slackworks.com )
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <string.h>
+#include <sys/poll.h>
 
 ///////////////////////////////////
 #endif // end platform headers   //
 ///////////////////////////////////
 
+#include "CPollFdSet.h"
 #include "networkabstraction.h"
 
 #ifdef _WIN32
     #define E_WOULDBLOCK WSAEWOULDBLOCK
     #define GetLastSocketError() WSAGetLastError()
+    #define poll(fds,nfds,timeout) WSAPoll(fds,nfds,timeout)
 #else
     #define E_WOULDBLOCK EWOULDBLOCK
     #define GetLastSocketError() errno