.gitignore

@@ -34,4 +34,4 @@
 
 # Extras
 build
-test/web_server
+test/page/web_server

src/CMakeLists.txt

@@ -3,6 +3,8 @@ add_executable(web_server
 )
 
 add_executable(proxy
-    ./proxy.cpp
+    ./multi_threads.cpp
 )
 
+target_include_directories(web_server PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+

src/mt_web_server.cpp

@@ -36,7 +36,6 @@
 #include <string.h>         // Needed for strcpy() and strlen()
 #include <fcntl.h>          // Needed for file i/o constants
 #include <sys/stat.h>       // Needed for file i/o constants  
-#include <future>
 
 /* FOR BSD UNIX/LINUX  ---------------------------------------------------- */
 #ifdef UNIX 
@@ -53,14 +52,10 @@
 #include <stddef.h>         // Needed for _threadid
 #include <process.h>        // Needed for _beginthread() and _endthread()
 #include <io.h>             // Needed for open(), close(), and eof()
-#include <winsock2.h>
 #include <windows.h>        // Needed for all Winsock stuff
-// Lazy struct fixes
-typedef int32_t socklen_t;
 #endif
 /* ------------------------------------------------------------------------ */
 
-
 //----- HTTP response messages ----------------------------------------------
 #define OK_IMAGE    "HTTP/1.0 200 OK\nContent-Type:image/gif\n\n"
 #define OK_TEXT     "HTTP/1.0 200 OK\nContent-Type:text/html\n\n"
@@ -72,7 +67,6 @@ typedef int32_t socklen_t;
 #define PORT_NUM            7080     // Port number for a Web server
 
 //----- Function prototypes -------------------------------------------------
-void ClientRequest(int server_s, int client_s);
 /* FOR WIN --------------------------------------------------------------- */
 #ifdef WIN
 void handle_get(void *in_arg);       // Thread function to handle GET
@@ -117,40 +111,27 @@ int main(void)
 
 	// Create a socket, fill-in address information, and then bind it
 	server_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (server_s == -1)
-    {
-        printf("ERROR - Unable to create socket on server\n");
-        exit(1);
-    }
 	server_addr.sin_family = AF_INET;
 	server_addr.sin_port = htons(PORT_NUM);
 	server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	int bindRet = bind(server_s, (struct sockaddr *)&server_addr, sizeof(server_addr));
+	bind(server_s, (struct sockaddr *)&server_addr, sizeof(server_addr));
-    if (bindRet == -1)
-    {
-        printf("ERROR - Unable to bind socket\n");
-        exit(1);
-    }
-    // Listen for connections and then accept
-    listen(server_s, 100);
 
 	// Main loop to listen, accept, and then spin-off a thread to handle the GET
 	while (1)
 	{
+        // Listen for connections and then accept
+		listen(server_s, 100);
 		addr_len = sizeof(client_addr);
 
 		client_s = accept(server_s, (struct sockaddr *)&client_addr, &addr_len);
-		if (client_s == -1)
+		if (client_s == 0)
 		{
-			perror("ERROR - Unable to create socket to client\n");
+			printf("ERROR - Unable to create socket \n");
-            continue;
+			exit(1);
 		}
 
-        std::async(std::launch::async, ClientRequest, server_s, client_s);
-
 		/* FOR UNIX/LINUX ---------------------------------------------------- */
 #ifdef UNIX
-        /*
 		// Spin-off a child process by fork
 		nChild_proc_id = fork();
 
@@ -159,28 +140,25 @@ int main(void)
 		{
 			child_proc(server_s, client_s);
 		}
-        */
 #endif
 		/* ------------------------------------------------------------------- */
 
 		/* FOR WIN ----------------------------------------------------------- */
 #ifdef WIN
-        /*
 		// Spin-off a thread to handle this request (pass only client_s)
 		if (_beginthread(handle_get, 4096, (void *)client_s) < 0)
 		{
 			printf("ERROR - Unable to create thread \n");
 			exit(1);
 		}
-        */
 #endif
 		/* ------------------------------------------------------------------- */
 	}
-    close(server_s);
+
 	/* FOR UNIX/LINUX ------------------------------------------------------ */
 #ifdef UNIX
 	// Close the server socket
-	//close(server_s);
+	close(server_s);
 #endif
 	/* --------------------------------------------------------------------- */
 
@@ -198,61 +176,6 @@ int main(void)
 	return (1);
 }
 
-void ClientRequest(int server_s, int client_s) {
-	char           in_buf[BUF_SIZE];     // Input buffer for GET resquest
-	char           out_buf[BUF_SIZE];    // Output buffer for HTML response
-	char           *file_name;           // File name
-	unsigned int   fh;                   // File handle
-	unsigned int   buf_len;              // Buffer length for file reads
-	unsigned int   retcode;              // Return code
-
-	// Receive the GET request from the Web browser
-	retcode = recv(client_s, in_buf, BUF_SIZE, 0);
-
-	// Handle the GET if there is one (see note #3 in the header)
-	if (retcode != -1)
-	{
-		// Parse out the filename from the GET request
-		strtok(in_buf, " ");
-		file_name = strtok(NULL, " ");
-
-		// Open the requested file
-		//  - Start at 2nd char to get rid of leading "\"
-#ifdef WIN
-		fh = open(&file_name[1], O_RDONLY | O_BINARY, S_IREAD | S_IWRITE);
-#endif
-#ifdef UNIX
-		fh = open(&file_name[1], O_RDONLY, S_IREAD | S_IWRITE);
-#endif
-
-		// Generate and send the response (404 if could not open the file)
-		if (fh == -1)
-		{
-			printf("File %s not found - sending an HTTP 404 \n", &file_name[1]);
-			strcpy(out_buf, NOTOK_404);
-			send(client_s, out_buf, strlen(out_buf), 0);
-			strcpy(out_buf, MESS_404);
-			send(client_s, out_buf, strlen(out_buf), 0);
-		}
-		else
-		{
-			printf("File %s is being sent \n", &file_name[1]);
-			if (strstr(file_name, ".gif") != NULL)
-				strcpy(out_buf, OK_IMAGE);
-			else
-				strcpy(out_buf, OK_TEXT);
-			send(client_s, out_buf, strlen(out_buf), 0);
-			do {
-				buf_len = read(fh, out_buf, BUF_SIZE);
-				send(client_s, out_buf, buf_len, 0);
-			} while (buf_len != 0);
-			close(fh);
-		}
-	}
-	// Close the client socket and end the thread
-	close(client_s);
-}
-
 /* FOR WIN --------------------------------------------------------------- */
 #ifdef WIN
 //===========================================================================
@@ -270,7 +193,7 @@ void handle_get(void *in_arg)
 	unsigned int   retcode;              // Return code
 
 										 // Set client_s to in_arg
-	client_s = (unsigned int&)in_arg;
+	client_s = (unsigned int)in_arg;
 
 	// Receive the GET request from the Web browser
 	retcode = recv(client_s, in_buf, BUF_SIZE, 0);
@@ -366,10 +289,11 @@ void child_proc(int server_s, int client_s)
 				strcpy(out_buf, OK_TEXT);
 			send(client_s, out_buf, strlen(out_buf), 0);
             
-			do {
+			while (fh != EOF)
+            {
 				buf_len = read(fh, out_buf, BUF_SIZE);
 				send(client_s, out_buf, buf_len, 0);
-			} while (buf_len != 0);
+            }
 			close(fh);
 		}
 	}

src/multi_threads.cpp

@@ -0,0 +1,124 @@
+/* ************************************************************************* *
+ *                                                                           *
+ *  Multi.cpp:                                                               *
+ *    This is a sample program for multi-threaded applications.              *
+ *                                                                           *
+ *    As soon as this program starts, the main thread generates two child    *
+ *    threads.  The two child threads wait for 10 seconds and terminate.     *
+ *                                                                           *
+ *    While the two child threads are running, the main thread waits.  The   *
+ *    main thread waits until both threads finish.                           *
+ *                                                                           *
+ *  Compile:                                                                 *
+ *    In Project->Setting->C/C++->CodeGenartion(in Category)                 *
+ *            ->Select Multi-threaded for runtime library                    *
+ *                                                                           *
+ *  Coded by: H. Fujinoki                                                    *
+ *    September 12, 11:00 AM at Edwardsville, IL                             *
+ *                                                                           *
+ * ************************************************************************* */
+#include <ratio>
+#define UNIX // WIN for Windows environment, UNIX for BSD or LINUX env.    
+    /* FOR WIN ------------------------------------------------------------- */
+#ifdef WIN
+#include <process.h>  // for thread system calls (_beginthread, etc.)
+#include <windows.h>  // for TRUE, FALSE labels
+#endif
+    /* --------------------------------------------------------------------- */
+
+    /* FOR UNIX/LINUX ------------------------------------------------------ */
+#ifdef UNIX
+#endif
+    /* --------------------------------------------------------------------- */
+#include <chrono>
+#include <thread>
+#include <stdio.h>    // for printf
+#include <time.h>     // for clock() and CLK_TCK    
+
+/* Global label defenition ------------------------------------------------ */
+#define INTERVAL    1             // Transmission interval in seconds
+#define REPEATS     10            // Number of child thread's repeats
+
+/* Global Variables ------------------------------------------------------- */
+int nChild1_status;               // Child thread #1 status
+int nChild2_status;               // Child thread #2 status    
+
+/* Prototypes ------------------------------------------------------------- */
+void ChildThread1(void);   // The child thread #1
+void ChildThread2(void);   // The child thread #2
+
+/* The MAIN --------------------------------------------------------------- */
+int main (void)
+{
+   /* Set the child thread status (TRUE = RUNNING) --- */
+   nChild1_status = true;
+   nChild2_status = true;
+
+   /* Create and start the two threads --- */
+    std::thread nChild1(ChildThread1);  // Start child process #1
+    std::thread nChild2(ChildThread2);  // Start child process #2
+    nChild1.join();
+    nChild2.join();
+
+   /* Spin-loop until both threads finish --- */
+   while ((nChild1_status == true)||(nChild2_status == true))
+   {  ;  }
+
+   /* Two threads are now finished --- */
+   printf("Both child threads are finished ... \n");
+   printf("The main thread is finishing ... \n"); 
+}
+
+// The Child-Thread #1 ///////////////////////////////////////////////////////
+void ChildThread1(void)
+{
+   /* Child #1 local variable(s) --- */
+   int    i;    // Loop counter
+
+   /* This thread is started --- */
+   printf("Child Thread #1 has started ... \n");
+
+   /* wait for 10 seconds w/ count down --- */
+   for (i = 0; i < REPEATS; i++)
+   {
+       /* Wait for 10 seconds --- */
+       std::this_thread::sleep_for(std::chrono::duration<double, std::milli>(1000));
+
+       /* Display count down --- */
+       printf("Child #1: %d more second(s) to finish ...\n", REPEATS -i);
+   }
+
+   /* Reset the status flag --- */
+   nChild1_status = false;
+
+   /* Terminate this thread --- */
+   //_endthread();
+}
+
+// The Child-Thread #2 ///////////////////////////////////////////////////////
+void ChildThread2(void)
+{
+   /* Child #2 local variable(s) --- */
+   int    i;    // Loop counter
+
+   /* This thread is started --- */
+   printf("Child Thread #2 has started ... \n");
+
+   /* wait for 10 seconds w/ count down --- */
+   for (i = 0; i < REPEATS; i++)
+   {
+       /* Wait for 10 seconds --- */
+       std::this_thread::sleep_for(std::chrono::duration<double, std::milli>(1000));
+
+       /* Display count down --- */
+       printf("Child #2: %d more second(s) to finish ...\n", REPEATS -i);
+   }
+
+   /* Reset the status flag --- */
+   nChild2_status = false;
+
+   /* Terminate this thread --- */
+   //_endthread();
+}
+
+// THE END OF LINES //////////////////////////////////////////////////////////

src/web_server.cpp

@@ -28,7 +28,7 @@
 //=  History:  KJC (12/29/00) - Genesis (from server.c)                       =
 //=            HF (01/25/01) - Ported to multi-platform environment           =
 //=============================================================================
-#define UNIX // WIN for Windows environment, UNIX for BSD or LINUX env.    
+#define WIN // WIN for Windows environment, UNIX for BSD or LINUX env.    
 
 //----- Include files ---------------------------------------------------------
 #include <stdio.h>          // Needed for printf()

test/CMakeLists.txt

@@ -0,0 +1,7 @@
+find_package(unity REQUIRED)
+include_directories(${CMAKE_SOURCE_DIR}/src)
+add_executable(testing 
+    ./test.cpp
+)
+set_target_properties(testing PROPERTIES LINKER_LANGUAGE CXX)
+target_link_libraries(testing unity)

test/test.cpp

@@ -0,0 +1,28 @@
+#include <cassert>
+#include <iostream>
+
+int math();
+void test_math();
+void IsEqual(bool lhs, bool rhs);
+
+int main() {
+    test_math();
+    return 0;
+}
+
+int math() {
+    return 2+2;
+}
+
+void test_math() {
+    IsEqual(math(), 4);
+    IsEqual(math(), 6);
+}
+
+void IsEqual(bool lhs, bool rhs) {
+    if (lhs == rhs) {
+        std::cout << "Test Success" << std::endl;
+    } else {
+    std::cout << "Test Failure" << std::endl;
+    }
+}