README.md

@@ -7,16 +7,13 @@ To build source, you should install `build-essential`.
 Usage: 
 ```bash
 ./server [OPTION]...
-./client SERVERNAME PORT [option] [FILENAME]...
+./client SERVERNAME PORT FILENAME
 ```
 
 Server OPTION and arguments:
 - `-p port`   :set to port binding. couldn't set to 0
 - `-h`        :print help message.
 
-Client option and arguments:
-- `-b`        :benchmark mode
-
 Available macro:
 
 For server
@@ -25,9 +22,9 @@ For server
 - DEFAULT_MAX_PATH_SIZE: 256(must be less than 1000)
 - USE_SENDFILE
     - DEFAULT_SEND_FILE_CHUNK_SIZE: 0x100000(1MB)
-- DEFAULT_WORK_QUEUE_SIZE(server only): 10
-- DEFAULT_MAX_THREAD_NUMBER(server only): 10
-- DEFAULT_RESPONSE_REQUEST(p-server only): 3(-1 is INF)
+- DEFAULT_WORK_QUEUE_SIZE: 10
+- DEFAULT_MAX_THREAD_NUMBER: 10
+   
 For client
 - MUL_CLIENT(second unit)
 - SLOW_CLIENT(microsecond unit, (buf_size/SLOW_CLIENT) bytes/usec)

client.c

@@ -12,9 +12,6 @@
 #include <stdbool.h>
 #include <assert.h>
 #include <fcntl.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/times.h>
 #include "socket_wrapper.h"
 
 #ifdef USE_SENDFILE
@@ -172,33 +169,24 @@ int main(int argc, const char *argv[]){
     const char * filename;
     const char * server_name;
     in_port_t server_port = 0;
-    int arg_filename_start = 3;
     int sock, err;
-    int retval = 0;
-    bool benchmode = false;
-    
-    clock_t clock_sum = 0;
-    clock_t begin_sclock;
-    clock_t begin_uclock;
-    
-    int op_count = 0;
-    if (argc < 4){
-        fprintf(stderr,"USAUE: %s SERVERNAME PORT [Option]... [FILENAME]...\n",argv[0]);
+    if (argc != 4){
+        fprintf(stderr,"USAUE: %s SERVERNAME PORT FILENAME\n",argv[0]);
         return 1;
     }
     server_name = argv[1];
     server_port = atoi(argv[2]);
-    if (strcmp("-b",argv[arg_filename_start])==0
-    ||strcmp("--benchmark",argv[arg_filename_start])==0){
-        arg_filename_start++;
-        benchmode = true;
-    }
-    
-    if (server_port == 0){
+    filename = argv[3];
+    if (server_port == 0)
+    {
         fprintf(stderr,"port invalid");
         return 1;
     }
-
+    sock = socket(AF_INET,SOCK_STREAM,0);
+    if(sock < 0){
+        perror("sock create fail");
+        return 1;
+    }
     err = getsockaddrbyname(AF_INET,SOCK_STREAM,0,server_name,(struct sockaddr *)&addr);
     if (err != 0){
         int check;
@@ -208,49 +196,21 @@ int main(int argc, const char *argv[]){
         assert(check != -1);
         if (check == 0){
             fprintf(stderr,"parsing fail : invaild format\n");
+            close(sock);
             return 1;
         }
     }
     addr.sin_family = AF_INET;
     addr.sin_port = htons(server_port);
-
-    if (benchmode){
-        struct tms t;
-        times(&t);
-        begin_sclock = t.tms_stime;
-        begin_uclock = t.tms_utime;
+    if(connect(sock,(struct sockaddr *)&addr,sizeof(addr)) < 0){
+        perror("connect failed");
+        return 1;
     }
-    while (arg_filename_start < argc){
-        filename = argv[arg_filename_start++];
-        sock = socket(AF_INET,SOCK_STREAM,0);
-        if(sock < 0){
-            perror("sock create fail");
-            return 1;
-        }
-        
-        if(connect(sock,(struct sockaddr *)&addr,sizeof(addr)) < 0){
-            perror("connect failed");
-            return 1;
-        }
-        if(sendReadOp(sock,filename) == 0){
-            int ret = recvData(sock,filename);
-            if (ret < 0){
-                fprintf(stderr,"%d",ret);
-            }
-            retval += ret;
-        }
+    if(sendReadOp(sock,filename) == 0){
+        int ret = recvData(sock,filename);
         close(sock);
-        op_count++;
+        return ret;
     }
-    if (benchmode){
-        struct tms t;
-        times(&t);
-        clock_sum += t.tms_stime - begin_sclock;
-        clock_sum += t.tms_utime - begin_uclock;
-    }
-    if (benchmode){
-        fprintf(stdout,"operation: %lf ticks/op\n",((double)clock_sum)/((double)op_count));
-    }
-    
-    return retval;
+    close(sock);
+    return 0;
 }

p-client.c

@@ -12,6 +12,7 @@
 #include <stdbool.h>
 #include <assert.h>
 #include <fcntl.h>
+
 #include "socket_wrapper.h"
 
 #ifdef USE_SENDFILE

p-server.c

@@ -15,11 +15,7 @@
 #include <sys/wait.h>
 #include "socket_wrapper.h"
 
-#ifndef DEFAULT_MAX_LISTEN_SOCKET
 static const int MAX_LISTEN_SOCKET = 16;
-#else
-static const int MAX_LISTEN_SOCKET = DEFAULT_MAX_LISTEN_SOCKET;
-#endif
 
 #ifdef USE_SENDFILE
 #include <sys/sendfile.h>
@@ -45,11 +41,6 @@ static const int TIMEOUT = 5;
 #else
 static const int TIMEOUT = DEFAULT_TIMEOUT;
 #endif
-#ifndef DEFAULT_RESPONSE_REQUEST
-static const int RESPONSE_REQUEST = 3;
-#else
-static const int RESPONSE_REQUEST = DEFAULT_RESPONSE_REQUEST;
-#endif
 
 /*========
  *Operation
@@ -270,7 +261,7 @@ int main(int argc, const char *argv[]){
         return 1;
     }
 
-    for (i = 0; i < RESPONSE_REQUEST; i++)
+    for (i = 0; i < 3; i++)
     {
         int fd, pid;
         char ip_buf[INET_ADDRSTRLEN];
@@ -296,7 +287,7 @@ int main(int argc, const char *argv[]){
             return retval;
         }
     }
-    for (i = 0; i < RESPONSE_REQUEST; i++)
+    for (i = 0; i < 3; i++)
     {
         int retval;
         int pid = wait(&retval);

server.c

@@ -288,6 +288,7 @@ void * worker_proc(void * data){
     }
 }
 
+
 static pthread_t worker_threads[MAX_THREAD_NUMBER];
 
 static int sock;