test: added timer for client

diff --git a/test/client/client.c b/test/client/client.c
index 1e70583..e0cf58e 100644 (file)
--- a/test/client/client.c
+++ b/test/client/client.c
@@ -9,17 +9,19 @@
 
 #include "p2pkp.h"
 
-#define TEST_FILE "/root/Dropbox/school/p2pkp/test/client/test_file"
-
 int main(int argc, char **argv)
 {
        int sock, err;
        struct sockaddr_in psin;
        struct hostent *host;
+       char *filename;
+       int filename_len;
+       struct timeval start;
+       struct timeval stop;
 
-       if (argc % 2 == 0 || argc < 2) {
-               fprintf(stderr, "Usage: %s <peer_ip1> <peer_port1> "
-                               "<pper_ip2> <peer_port2> ...\n", argv[0]);
+       if (argc % 2 || argc < 3) {
+               fprintf(stderr, "Usage: %s <file> <peer_ip1> <peer_port1> "
+                               "[<pper_ip2> <peer_port2> ...]\n", argv[0]);
                return -1;
        }
 
@@ -34,8 +36,10 @@ int main(int argc, char **argv)
                return -1;
        }
        printf("Successfully created AF_P2PKP socket: %d\n", sock);
+       filename = argv[1];
+       filename_len = strlen(filename);
 
-       argv++;
+       argv+=2;
        while (*argv) {
                printf("Connecting to: %s:%s\n", argv[0], argv[1]);
 
@@ -56,14 +60,17 @@ int main(int argc, char **argv)
 
        printf("Starting to write on the socket\n");
 
-       err = write(sock, TEST_FILE, sizeof(TEST_FILE) - 1);
+       gettimeofday(&start, NULL);
+       err = write(sock, filename, filename_len - 1);
        if (err < 0) {
-               printf("Error while sending file %s: %s(%d)\n", TEST_FILE,
+               printf("Error while sending file %s: %s(%d)\n", filename,
                                strerror(errno), errno);
                return err;
        }
+       gettimeofday(&stop, NULL);
 
-       printf("Successfully written file\n");
+       printf("Successfully written %s in %ld seconds\n", filename, 
+                       stop.tv_sec - start.tv_sec);
 
        return 0;
 }

diff --git a/test/test.sh b/test/test.sh
index d36d0fe..90a5458 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -4,6 +4,7 @@ MODULE_NAME=af_p2pkp
 MODULE_DIR=../module
 CLIENT=client/client
 SERVER=server/server
+FILE=/root/Dropbox/school/p2pkp/test/client/test_file
 IP="127.0.0.1"
 
 LISTENERS_PORTS=(
@@ -15,6 +16,8 @@ LISTENERS_PORTS=(
 #use nc.traditional
 echo 2 | update-alternatives --config nc &> /dev/null
 
+[ -e $FILE ] || exit
+
 #increase tests debugging
 set -x
 
@@ -31,7 +34,7 @@ done
 # wait for netcat to start listening
 sleep 1
 
-$CLIENT $ARGUMENTS
+$CLIENT $FILE $ARGUMENTS
 
 # kill netcat
 for pid in $pids; do