]> git.sesse.net Git - jam/blobdiff - jam.c
Move the receiver stuff into its own thread, starting before the senders.
[jam] / jam.c
diff --git a/jam.c b/jam.c
index b8289509c572d4400f461d91db39d443b9c61198..d1637f30fb7a8a6601fceacd242fb9a532cb130c 100644 (file)
--- a/jam.c
+++ b/jam.c
@@ -20,12 +20,20 @@ unsigned num_sources = 0;
 unsigned room_sources = 0;
 
 unsigned num_senders = 128;
+unsigned do_listen = 1;
+
+unsigned long long total_bytes_received = 0;
+pthread_mutex_t receive_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+unsigned long long total_bytes_sent = 0;
+pthread_mutex_t send_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 const static struct option longopts[] = {
        { "source-list", required_argument, NULL, 's' },
        { "destination-list", required_argument, NULL, 'd' },
        { "num-senders", required_argument, NULL, 'n' },
        { "port", required_argument, NULL, 'p' },
+       { "sender-only", no_argument, NULL, 'o' },
        { NULL, 0, NULL, 0 }
 };
 
@@ -101,7 +109,7 @@ void parse_options(int argc, char **argv)
        int option_index = 0;
 
        for ( ;; ) {
-               int c = getopt_long(argc, argv, "s:d:n:p:", longopts, &option_index); 
+               int c = getopt_long(argc, argv, "s:d:n:p:o", longopts, &option_index); 
                switch (c) {
                case 's':
                        read_ip_list(optarg, &sources, &num_sources, &room_sources);
@@ -115,6 +123,9 @@ void parse_options(int argc, char **argv)
                case 'p':
                        port = atoi(optarg);
                        break;
+               case 'o':
+                       do_listen = 0;
+                       break;
                case -1:
                        return;       // end of argument list
                default:
@@ -128,6 +139,11 @@ void *sender_worker(void *arg)
 {
        unsigned i;
        int sock;
+       char buf[65536];
+       unsigned long long bytes_sent = 0;
+
+       for (i = 0; i < 65536; ++i)
+               buf[i] = rand() & 0xff;
 
        for (i = 0; i < 1000; ++i) {
                unsigned src_num = (unsigned)(num_sources * gen_uniform_random());
@@ -156,10 +172,40 @@ void *sender_worker(void *arg)
                
                fprintf(stderr, "connected\n");
 
-               // FIXME: send data here
+               while (num_bytes > 0) {
+                       unsigned bytes_to_send = num_bytes;
+                       unsigned ret;
+
+                       if (bytes_to_send > 65536) {
+                               bytes_to_send = 65536;  
+                       }
+
+                       ret = send(sock, buf, bytes_to_send, MSG_NOSIGNAL);
+                       if (ret == -1) {
+                               perror("send()");
+                               exit(1);
+                       }
+
+                       num_bytes -= ret;
+                       bytes_sent += ret;
+
+                       // update the central counter after every 1MB (8ms
+                       // at gigabit speeds, should be enough) of sent data
+                       if (bytes_sent > 1048576) {
+                               pthread_mutex_lock(&send_mutex);
+                               total_bytes_sent += bytes_sent;
+                               pthread_mutex_unlock(&send_mutex);
+
+                               bytes_sent = 0;
+                       }
+               }
 
                close(sock);
        }
+                       
+       pthread_mutex_lock(&send_mutex);
+       total_bytes_sent += bytes_sent;
+       pthread_mutex_unlock(&send_mutex);
 
        pthread_exit(0);
 }
@@ -168,22 +214,81 @@ void *receiver_worker(void *arg)
 {
        int sock = (int)arg;
        char buf[65536];
+       unsigned long long bytes_received = 0;
+
+       fprintf(stderr, "Receiver started\n");
 
        for ( ;; ) {
                int ret = read(sock, buf, 65536);
                if (ret == 0)
                        break;
 
-               // FIXME: update stats here
+               // update the central counter after every 1MB (8ms
+               // at gigabit speeds, should be enough) of received data
+               if (bytes_received > 1048576) {
+                       pthread_mutex_lock(&receive_mutex);
+                       total_bytes_sent += bytes_received;
+                       pthread_mutex_unlock(&receive_mutex);
+
+                       bytes_received = 0;
+               }
        }
        
        if (close(sock) == -1) {
                perror("close()");
                exit(1);
        }
+                       
+       pthread_mutex_lock(&receive_mutex);
+       total_bytes_received += bytes_received;
+       pthread_mutex_unlock(&receive_mutex);
 
        pthread_exit(0);
 }
+       
+void *receiver_dispatcher(void *arg)
+{
+       int server_sock = (int)arg;
+       pthread_attr_t attr;
+       
+       // FIXME: these do not really set errno
+       if (pthread_attr_init(&attr) != 0) {
+               perror("pthread_attr_init()");
+               exit(1);
+       }
+
+       if (pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN + 65536 + 0x4000) != 0) {
+               perror("pthread_attr_setstacksize");
+               exit(1);
+       }
+
+       if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0) {
+               perror("pthread_attr_setdetachstate");
+               exit(1);
+       }
+
+       /*
+        * Listen for incoming connections, spawning off one receiver
+        * thread for each (which will just gobble up the data until
+        * we're done).
+        */
+       for ( ;; ) {
+               struct sockaddr_in addr;
+               socklen_t addr_len = sizeof(addr);
+               pthread_t thread;
+
+               int sock = accept(server_sock, (struct sockaddr *)&addr, &addr_len);
+               if (sock == -1) {
+                       perror("accept()");
+                       exit(1);
+               }
+
+               if (pthread_create(&thread, &attr, receiver_worker, (void *)sock) != 0) {
+                       perror("pthread_create()");
+                       exit(1);
+               }
+       }
+}
 
 int get_server_socket(unsigned short port)
 {
@@ -231,7 +336,9 @@ int main(int argc, char **argv)
                fprintf(stderr, "Missing or empty source or destination host list. Aborting.\n");
        }
 
-       server_sock = get_server_socket(port);
+       if (do_listen) {
+               server_sock = get_server_socket(port);
+       }
        
        printf("Sending data on port %u from %u sources to %u destinations.\n\n",
                port, num_sources, num_destinations);
@@ -247,37 +354,31 @@ int main(int argc, char **argv)
                exit(1);
        }
 
-       // Fire off sender workers.
-       for (i = 0; i < num_senders; ++i) {
-               pthread_t thread;
+       if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0) {
+               perror("pthread_attr_setdetachstate");
+               exit(1);
+       }
                
-               if (pthread_create(&thread, &attr, sender_worker, NULL) != 0) {
+       // Fire off the master receiver.
+       if (do_listen) {
+               pthread_t thread;
+               if (pthread_create(&thread, &attr, receiver_dispatcher, (void *)server_sock) != 0) {
                        perror("pthread_create()");
                        exit(1);
                }
        }
 
-       /*
-        * Listen for incoming connections, spawning off one receiver
-        * thread for each (which will just gobble up the data until
-        * we're done).
-        */
-       for ( ;; ) {
-               struct sockaddr_in addr;
-               socklen_t addr_len = sizeof(addr);
+       // Fire off sender workers.
+       for (i = 0; i < num_senders; ++i) {
                pthread_t thread;
-
-               int sock = accept(server_sock, (struct sockaddr *)&addr, &addr_len);
-               if (sock == -1) {
-                       perror("accept()");
-                       exit(1);
-               }
-
-               if (pthread_create(&thread, &attr, receiver_worker, (void *)sock) != 0) {
+               
+               if (pthread_create(&thread, &attr, sender_worker, NULL) != 0) {
                        perror("pthread_create()");
                        exit(1);
                }
        }
 
+       sleep(3600);
+
        exit(0);
 }