Refactor

Author: ahmeducf

.idea/.gitignore

@@ -5,8 +5,8 @@ CC = gcc
 CFLAGS = -g -Werror
 LDFLAGS = -lpthread
 
-proxy: proxy.c cache.c ./proxy_helpers/error_handling.c service.c robust_io.c ./thread_helpers/sbuf.c ./thread_helpers/semaphore.c socket.c thread.c ./proxy_helpers/url_parser.c ./proxy_helpers/wrappers.c cache.h constants.h ./proxy_helpers/error_handling.h service.h robust_io.h ./thread_helpers/sbuf.h ./thread_helpers/semaphore.h socket.h thread.h ./proxy_helpers/url_parser.h ./proxy_helpers/wrappers.h
-	$(CC) $(CFLAGS) -o proxy service.c cache.c ./proxy_helpers/error_handling.c robust_io.c ./thread_helpers/sbuf.c ./thread_helpers/semaphore.c socket.c thread.c ./proxy_helpers/url_parser.c ./proxy_helpers/wrappers.c proxy.c $(LDFLAGS)
+proxy: proxy.c cache/cache.c proxy-helpers service.c robust-input-output/robust_io.c thread-helpers semaphore/semaphore.c socket-interface/socket.c thread-helpers proxy-helpers proxy-helpers cache/cache.h constants.h proxy-helpers service.h robust-input-output/robust_io.h thread-helpers semaphore/semaphore.h socket-interface/socket.h thread-helpers proxy-helpers proxy-helpers
+	$(CC) $(CFLAGS) -o proxy service.c ./cache/cache.c ./proxy-helpers/error_handling.c ./robust-input-output/robust_io.c ./thread-helpers/sbuf.c ./semaphore/semaphore.c ./socket-interface/socket.c ./thread-helpers/thread.c ./proxy-helpers/url_parser.c ./proxy-helpers/wrappers.c proxy.c $(LDFLAGS)
 
 
 # Creates a tarball in ../proxylab-handin.tar that you can then

.idea/misc.xml

@@ -2,9 +2,9 @@
 #define CACHE_H
 #include <stdio.h>
 #include <stdlib.h>
-#include "constants.h"
-#include "proxy_helpers/wrappers.h"
-#include "thread_helpers/semaphore.h"
+#include "../constants.h"
+#include "../proxy-helpers/wrappers.h"
+#include "../semaphore/semaphore.h"
 
 /* Global variables */
 extern unsigned long cur_time;        /* Used to update timestamp */

.idea/vcs.xml

@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
     Signal(SIGPIPE, SIG_IGN);
 
     listenfd = Open_listenfd(argv[1]);
-    printf("Proxy listening on port: %d\n", listenfd);
+    printf("Proxy listening on port: %s\n", argv[1]);
 
     /* Initialize cache */
     cache_init(&cache);

Makefile

@@ -3,7 +3,7 @@
 
 #include <unistd.h>
 #include <errno.h>
-#include "proxy_helpers/error_handling.h"
+#include "../proxy-helpers/error_handling.h"
 
 
 /* Persistent state for the robust I/O (Rio) package */

cache.c renamed to cache/cache.c

@@ -1,7 +1,7 @@
 #ifndef SEMAPHORE_H
 #define SEMAPHORE_
 #include <semaphore.h>
-#include "../proxy_helpers/error_handling.h"
+#include "../proxy-helpers/error_handling.h"
 #include "../constants.h"
 
 extern int cache_line_readcnt[CACHE_LINE_NUM];           /* number of readers per cache line */

cache.h renamed to cache/cache.h

@@ -50,6 +50,7 @@ static void serve_client(int connfd, cache_line_t *cache)
         /* Read object from cache */
         printf("<-- service from cache -->\n");
         service_from_cache(connfd, cache, matched_line_idx);
+        printf("This is a cached version of the request!\n");
     }
     else {
         printf("Cache miss!\n");

proxy

@@ -2,14 +2,14 @@
 #define PROXY_H
 
 #include "constants.h"
-#include "proxy_helpers/url_parser.h"
-#include "proxy_helpers/wrappers.h"
-#include "socket.h"
-#include "robust_io.h"
-#include "thread.h"
-#include "thread_helpers/sbuf.h"
-#include "thread_helpers/semaphore.h"
-#include "cache.h"
+#include "proxy-helpers/url_parser.h"
+#include "proxy-helpers/wrappers.h"
+#include "socket-interface/socket.h"
+#include "robust-input-output/robust_io.h"
+#include "thread-helpers/thread.h"
+#include "thread-helpers/sbuf.h"
+#include "semaphore/semaphore.h"
+#include "cache/cache.h"
 
 /* Worker thread routine prototype */
 void *thread(void *vargp);

proxy_helpers/error_handling.c renamed to proxy-helpers/error_handling.c

@@ -3,8 +3,8 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include "constants.h"
-#include "proxy_helpers/error_handling.h"
+#include "../constants.h"
+#include "../proxy-helpers/error_handling.h"
 
 /* Simplifies calls to bind(), connect(), and accept() */
 typedef struct sockaddr SA;

proxy_helpers/error_handling.h renamed to proxy-helpers/error_handling.h

@@ -1,7 +1,7 @@
 #ifndef SBUF_H
 #define SBUF_H
-#include "semaphore.h"
-#include "../proxy_helpers/wrappers.h"
+#include "../semaphore/semaphore.h"
+#include "../proxy-helpers/wrappers.h"
 
 #define NTHREADS 4
 #define SBUFSIZE 16

proxy_helpers/url_parser.c renamed to proxy-helpers/url_parser.c

@@ -1,7 +1,7 @@
 #ifndef THREADING_H
 #define THREADING_H
 #include <pthread.h>
-#include "proxy_helpers/error_handling.h"
+#include "../proxy-helpers/error_handling.h"
 
 /* Pthreads thread control wrappers prototypes */
 void Pthread_create(pthread_t *tidp, pthread_attr_t *attrp,