HTTPServer is now on separate thread. Fixed issues with select blocking.

RamseyK · RamseyK · commit 6e0a92aa3ccd · 2012-05-13T16:12:23.000-04:00
diff --git a/HTTPServer.cpp b/HTTPServer.cpp
@@ -5,9 +5,11 @@
  * Initialize state and server variables
  */
 HTTPServer::HTTPServer() {
+	canRun = false;
+	thread = NULL;
+	
     listenSocket = INVALID_SOCKET;
     memset(&serverAddr, 0, sizeof(serverAddr)); // clear the struct
-    keepRunning = false;
 
 	// Create a resource manager managing the VIRTUAL base path ./
     resMgr = new ResourceManager("./", true);
@@ -28,22 +30,28 @@ HTTPServer::~HTTPServer() {
 	if(listenSocket != INVALID_SOCKET)
     	closeSockets();
     delete clientMap;
+
+	if(thread != NULL)
+		delete thread;
 }
 
 /**
- * Init Socket
+ * Start Server
  * Initialize the Server Socket by requesting a socket handle, binding, and going into a listening state
  *
  * @param port Port to listen on
  * @return True if initialization succeeded. False if otherwise
  */
-bool HTTPServer::initSocket(int port) {    
+void HTTPServer::start(int port) {    
 	// Create a handle for the listening socket, TCP
 	listenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if(listenSocket == INVALID_SOCKET) {
 		cout << "Could not create socket!" << endl;
-        return false;
+		return;
 	}
+	
+	// Set socket as non blocking
+	fcntl(listenSocket, F_SETFL, O_NONBLOCK);
     
 	// Populate the server address structure
 	serverAddr.sin_family = AF_INET; // Family: IP protocol
@@ -53,23 +61,47 @@ bool HTTPServer::initSocket(int port) {
 	// Bind: Assign the address to the socket
 	if(bind(listenSocket, (sockaddr*)&serverAddr, sizeof(serverAddr)) != 0) {
 		cout << "Failed to bind to the address!" << endl;
-        return false;
+		return;
 	}
     
 	// Listen: Put the socket in a listening state, ready to accept connections
 	// Accept a backlog of the OS Maximum connections in the queue
 	if(listen(listenSocket, SOMAXCONN) != 0) {
 		cout << "Failed to put the socket in a listening state" << endl;
-        return false;
+		return;
 	}
     
     // Add the listening socket to the master set and the largest FD is now the listening socket
     FD_SET(listenSocket, &fd_master);
     fdmax = listenSocket;
 
-	keepRunning = true;
+	// Set select to timeout at 50 microseconds
+	timeout.tv_sec = 0;
+	timeout.tv_usec = 50;
+
+	cout << "Server started. Listening on port " << port << "..." << endl;
+
+	// Spawn thread
+	canRun = true;
+	thread = new boost::thread(boost::ref(*this));
+}
+
+/**
+ * Stop
+ * Signal the server thread to stop running and shut down
+ */
+void HTTPServer::stop() {
+	runMutex.lock();
+	canRun = false;
+	runMutex.unlock();
+	
+	if(thread != NULL)
+		thread->join();
 
-    return true;
+    // Safely shutdown the server and close all open connections and sockets
+    closeSockets();
+
+	cout << "Server shutdown!" << endl;
 }
 
 /**
@@ -107,6 +139,9 @@ void HTTPServer::acceptConnection() {
     clfd = accept(listenSocket, (sockaddr*)&clientAddr, (socklen_t*)&clientAddrLen);
     if(clfd == INVALID_SOCKET)
         return;
+
+	// Set socket as non blocking
+	fcntl(clfd, F_SETFL, O_NONBLOCK);
     
     // Instance Client object
     Client *cl = new Client(clfd, clientAddr);
@@ -126,50 +161,49 @@ void HTTPServer::acceptConnection() {
 }
 
 /**
- * Run Server
- * Main server loop where the socket is initialized and the loop is started, checking for new messages or clients to be read with select()
- * and handling them appropriately
+ * Server Process
+ * Main server processing function that checks for any new connections or data to read on
+ * the listening socket
  */
-void HTTPServer::runServer(int port) {
-    // Initialize the socket and put it into a listening state
-    if(!initSocket(port)) {
-		cout << "Failed to start server." << endl;
-        return;
-    }
-
-	cout << "Server started. Listening on port " << port << "..." << endl;
-    
-    // Processing loop
-    while(keepRunning) {
-		usleep(1000);
+void HTTPServer::operator() () {
+	bool run = true;
+	int sret = 0;
+	
+	while(run) {
+		// Update the running state
+		runMutex.lock();
+		run = canRun;
+		runMutex.unlock();
 		
-        // Copy master set into fd_read for processing
-        fd_read = fd_master;
-        
-        // Populate read_fd set with client descriptors that are ready to be read
-        if(select(fdmax+1, &fd_read, NULL, NULL, NULL) < 0) {
-            //printf("select failed!");
-            continue;
-        }
-        
-        // Loop through all descriptors in the read_fd set and check to see if data needs to be processed
-        for(int i = 0; i <= fdmax; i++) {
-            // Socket i isn't ready to be read (not in the read set), continue
-            if(!FD_ISSET(i, &fd_read))
-               continue;
-            
-            // A new client is waiting to be accepted on the listenSocket
-            if(listenSocket == i) {
-                acceptConnection();
-            } else { // The descriptor is a client
-                Client *cl = getClient(i);
-                handleClient(cl);
-            }
-        }
-    }
-    
-    // Safely shutdown the server and close all open connections and sockets
-    closeSockets();
+		// Copy master set into fd_read for processing
+		fd_read = fd_master;
+
+		// Populate read_fd set with client descriptors that are ready to be read
+		// return values: -1 = unsuccessful, 0 = timeout, > 0 - # of sockets that need to be read
+		sret = select(fdmax+1, &fd_read, NULL, NULL, &timeout);
+		if(sret > 0) {
+			// Loop through all descriptors in the read_fd set and check to see if data needs to be processed
+			for(int i = 0; i <= fdmax; i++) {
+				// Socket i isn't ready to be read (not in the read set), continue
+				if(!FD_ISSET(i, &fd_read))
+					continue;
+
+				// A new client is waiting to be accepted on the listenSocket
+				if(listenSocket == i) {
+					acceptConnection();
+				} else { // The descriptor is a client
+					Client *cl = getClient(i);
+					handleClient(cl);
+				}
+			}
+		} else if(sret < 0) {
+			cout << "Select failed!" << endl;
+			break;
+		} else { // Timeout
+			// Yield rest of time slice to CPU
+			boost::this_thread::yield();
+		}
+	}
 }
 
 /**
diff --git a/HTTPServer.h b/HTTPServer.h
@@ -3,14 +3,17 @@
 
 #include <map>
 #include <string>
+#include <boost/thread.hpp>
 
 #include <time.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <fcntl.h>
 
 #include "Client.h"
 #include "HTTPRequest.h"
@@ -21,29 +24,24 @@
 #define INVALID_SOCKET -1
 
 class HTTPServer {
-    // Private variables
+	// Network
     SOCKET listenSocket; // Descriptor for the listening socket
-    bool keepRunning; // Flag when true will keep the main loop of the server running
     struct sockaddr_in serverAddr; // Structure for the server address
     fd_set fd_master; // Master FD set (listening socket + client sockets)
     fd_set fd_read; // FD set of sockets being read / operated on
+	struct timeval timeout; // Select timeout
     int fdmax; // Max FD number (max sockets hanlde)
     map<SOCKET, Client*> *clientMap; // Client map, maps Socket descriptor to Client object
 
+	// Resources / File System
 	ResourceManager *resMgr;
+	
+	// Threading
+	bool canRun;
+	boost::thread* thread;
+	boost::mutex runMutex;
     
     // Private methods
-    bool initSocket(int port = 80);
-    void closeSockets();
-    
-public:
-    HTTPServer();
-    ~HTTPServer();
-    void runServer(int port=80);
-	void stopServer() {
-		keepRunning = false;
-	}
-    
     void acceptConnection();
 	Client *getClient(SOCKET clfd);
     void disconnectClient(Client* cl);
@@ -54,6 +52,15 @@ class HTTPServer {
     void handleRequest(Client* cl, HTTPRequest* req);
     HTTPResponse* handleHead(Client* cl, HTTPRequest *req);
     HTTPResponse* handleGet(Client* cl, HTTPRequest *req);
+    void closeSockets();
+    
+public:
+    HTTPServer();
+    ~HTTPServer();
+
+	void start(int port);
+	void stop();
+	void operator() ();
 };
 
 #endif
diff --git a/Makefile b/Makefile
@@ -1,47 +1,48 @@
 # Makefile for httpserver
 # (C) Ramsey Kant 2011-2012
 
-CC = g++
+CC = g++
 OBJS = ByteBuffer.o Client.o HTTPMessage.o HTTPRequest.o HTTPResponse.o HTTPServer.o  main.o Resource.o ResourceManager.o
 # Debug Flags
 DEBUGFLAGS = -g -O0 -fpermissive -Wall
 # Production Flags
-PRODFLAGS = -Wall -O3
-# Active Flags
-FLAGS = $(DEBUGFLAGS)
+PRODFLAGS = -Wall -O3
+# Active Flags
+FLAGS = -Iinclude/ $(DEBUGFLAGS)
+LINK = -lpthread -lboost_thread-mt
 
 all: $(OBJS)
-	$(CC) $(FLAGS) *.o -o bin/httpserver
-
+	$(CC) $(FLAGS) *.o -o bin/httpserver $(LINK)
+
 ByteBuffer.o: ByteBuffer.cpp
-	$(CC) $(FLAGS) -c ByteBuffer.cpp -o $@
-
+	$(CC) $(FLAGS) -c ByteBuffer.cpp -o $@
+
 Client.o: Client.cpp
-	$(CC) $(FLAGS) -c Client.cpp -o $@
-
+	$(CC) $(FLAGS) -c Client.cpp -o $@
+
 HTTPMessage.o: HTTPMessage.cpp
-	$(CC) $(FLAGS) -c HTTPMessage.cpp -o $@
-
+	$(CC) $(FLAGS) -c HTTPMessage.cpp -o $@
+
 HTTPRequest.o: HTTPRequest.cpp
-	$(CC) $(FLAGS) -c HTTPRequest.cpp -o $@
-
+	$(CC) $(FLAGS) -c HTTPRequest.cpp -o $@
+
 HTTPResponse.o: HTTPResponse.cpp
-	$(CC) $(FLAGS) -c HTTPResponse.cpp -o $@
-
+	$(CC) $(FLAGS) -c HTTPResponse.cpp -o $@
+
 HTTPServer.o: HTTPServer.cpp
-	$(CC) $(FLAGS) -c HTTPServer.cpp -o $@
-
+	$(CC) $(FLAGS) -c HTTPServer.cpp -o $@
+
 main.o: Testers.h main.cpp
-	$(CC) $(FLAGS) -c main.cpp -o $@
-
+	$(CC) $(FLAGS) -c main.cpp -o $@
+
 Resource.o: Resource.cpp
-	$(CC) $(FLAGS) -c Resource.cpp -o $@
-
+	$(CC) $(FLAGS) -c Resource.cpp -o $@
+
 ResourceManager.o: ResourceManager.cpp
 	$(CC) $(FLAGS) -c ResourceManager.cpp -o $@
 
 .PHONY: clean
 clean:
 	rm -f bin/httpserver
-	rm -f bin/*.o
+	rm -f *.o
 
diff --git a/main.cpp b/main.cpp
