aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--P3/README.md42
-rw-r--r--P3/server.c2
2 files changed, 43 insertions, 1 deletions
diff --git a/P3/README.md b/P3/README.md
new file mode 100644
index 0000000..3bd3501
--- /dev/null
+++ b/P3/README.md
@@ -0,0 +1,42 @@
+# CSCI 4061: Project 3
+
+The third project in CSCI 4061: Intro to Operating Systems.
+
+## Fall 2020
+
+- **Test machine:** atlas.cselabs.umn.edu
+- **Date:** 11/15/2020
+- **Name:** Andrea Smith, Matt Strapp
+- **x500:** smit9523, strap012
+
+The purpose of this program is to create a multi-threaded web server by using POSIX threads. In this project, we wrote the mapper and reducer threads, a logging system
+
+#### Program structure
+
+```dispatch():```
+Repeatedly receives the client request and adds the requests to the queue.
+
+```worker():```
+Monitors the queue, retrieve new requests as they come in, and send the result back to the client.
+
+## Extra Credit A
+
+```dynamic_pool_size_update():```
+Changes the worker thread pool dynamically depending on the number of requests
+
+## Extra Credit B
+
+```initCache():```
+
+```isInCache():```
+
+```readFromCache():```
+
+```addIntoCache():```
+
+```deleteCache():```
+
+
+#### Team Contributions:
+
+For the first draft, Andrea primarily contributed to sendChunkData() and getChunkData() and Matt wrote shuffle() and getInterData(), but the debugging process (the majority of the work) was entirely a joint effort. \ No newline at end of file
diff --git a/P3/server.c b/P3/server.c
index 6659e38..b28a772 100644
--- a/P3/server.c
+++ b/P3/server.c
@@ -460,7 +460,7 @@ int main(int argc, char **argv) {
return -2;
}
// Create instance of logfil
- FILE *logfile = fopen("webserver_log", "w");
+ FILE *logfile = fopen("webserver_log", "w")
fclose(logfile);
// Change the current working directory to server root directory