Removed separate HTTPServer thread

RamseyK · RamseyK · commit ef0975e8968b · 2012-05-14T12:38:38.000-04:00
diff --git a/HTTPServer.cpp b/HTTPServer.cpp
@@ -24,7 +24,6 @@
  */
 HTTPServer::HTTPServer() {
 	canRun = false;
-	thread = NULL;
 	
     listenSocket = INVALID_SOCKET;
     memset(&serverAddr, 0, sizeof(serverAddr)); // clear the struct
@@ -48,9 +47,6 @@ HTTPServer::~HTTPServer() {
 	if(listenSocket != INVALID_SOCKET)
     	closeSockets();
     delete clientMap;
-
-	if(thread != NULL)
-		delete thread;
 }
 
 /**
@@ -77,7 +73,7 @@ void HTTPServer::start(int port) {
 	serverAddr.sin_addr.s_addr = INADDR_ANY; // Let OS intelligently select the server's host address
     
 	// Bind: Assign the address to the socket
-	if(bind(listenSocket, (sockaddr*)&serverAddr, sizeof(serverAddr)) != 0) {
+	if(bind(listenSocket, (struct sockaddr*)&serverAddr, sizeof(serverAddr)) != 0) {
 		cout << "Failed to bind to the address!" << endl;
 		return;
 	}
@@ -99,22 +95,17 @@ void HTTPServer::start(int port) {
 
 	cout << "Server started. Listening on port " << port << "..." << endl;
 
-	// Spawn thread
+	// Start processing
 	canRun = true;
-	thread = new boost::thread(boost::ref(*this));
+	process();
 }
 
 /**
  * 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();
 
     // Safely shutdown the server and close all open connections and sockets
     closeSockets();
@@ -183,16 +174,10 @@ void HTTPServer::acceptConnection() {
  * Main server processing function that checks for any new connections or data to read on
  * the listening socket
  */
-void HTTPServer::operator() () {
-	bool run = true;
+void HTTPServer::process() {
 	int sret = 0;
 	
-	while(run) {
-		// Update the running state
-		runMutex.lock();
-		run = canRun;
-		runMutex.unlock();
-		
+	while(canRun) {
 		// Copy master set into fd_read for processing
 		fd_read = fd_master;
 
@@ -218,8 +203,7 @@ void HTTPServer::operator() () {
 			cout << "Select failed!" << endl;
 			break;
 		} else { // Timeout
-			// Yield rest of time slice to CPU
-			boost::this_thread::yield();
+			usleep(100);
 		}
 	}
 }
diff --git a/HTTPServer.h b/HTTPServer.h
@@ -21,7 +21,6 @@
 
 #include <map>
 #include <string>
-#include <boost/thread.hpp>
 
 #include <time.h>
 #include <unistd.h>
@@ -42,6 +41,8 @@
 #define INVALID_SOCKET -1
 
 class HTTPServer {
+	bool canRun;
+	
 	// Network
     SOCKET listenSocket; // Descriptor for the listening socket
     struct sockaddr_in serverAddr; // Structure for the server address
@@ -53,13 +54,9 @@ class HTTPServer {
 
 	// Resources / File System
 	ResourceManager *resMgr;
-	
-	// Threading
-	bool canRun;
-	boost::thread* thread;
-	boost::mutex runMutex;
     
     // Private methods
+	void process();
     void acceptConnection();
 	Client *getClient(SOCKET clfd);
 	void closeSockets();
@@ -79,7 +76,6 @@ class HTTPServer {
 
 	void start(int port);
 	void stop();
-	void operator() ();
 };
 
 #endif
diff --git a/Makefile b/Makefile
@@ -4,15 +4,15 @@
 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
+DEBUGFLAGS = -g -O0 -Wall
 # Production Flags
 PRODFLAGS = -Wall -O3
 # Active Flags
-FLAGS = -Iinclude/ $(DEBUGFLAGS)
-LINK = -lpthread -lboost_thread-mt
+FLAGS = -Iinclude/ $(DEBUGFLAGS)
+# LINK = -lpthread -lboost_thread-mt
 
 all: $(OBJS)
-	$(CC) $(FLAGS) *.o -o bin/httpserver $(LINK)
+	$(CC) $(FLAGS) *.o -o bin/httpserver
 
 ByteBuffer.o: ByteBuffer.cpp
 	$(CC) $(FLAGS) -c ByteBuffer.cpp -o $@
diff --git a/bin/htdocs/test.html b/bin/htdocs/test.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title>Test Title</title>
+</head>
+
+<body>
+Hello World!<br />
+</body>
+</html>
+
diff --git a/main.cpp b/main.cpp
@@ -50,18 +50,6 @@ int main (int argc, const char * argv[])
 	svr = new HTTPServer();
 	svr->start(8080);
 	
-	// Input loop
-	std::string input;
-	while(true) {
-		cin >> input;
-		
-		if(input == "quit") {
-			break;
-		} else {
-			cout << "Unknown command: " << input << endl;
-		}
-	}
-	
 	// Stop the server thread
 	svr->stop();
 	delete svr;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,10 @@ @@
 +<html>
 +<head>
 +<title>Test Title</title>
 +</head>
++
 +<body>
 +Hello World!<br />
 +</body>
 +</html>
++