From 299b45d62f039f5bf329894bf891d604b8a638a8 Mon Sep 17 00:00:00 2001
From: "sgunderson@bigfoot.com" <>
Date: Wed, 31 Jan 2007 23:36:50 +0100
Subject: [PATCH] Move the receiver stuff into its own thread, starting before
 the senders. Also add some stats.

---
 jam.c | 118 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 90 insertions(+), 28 deletions(-)

diff --git a/jam.c b/jam.c
index fc0b723..d1637f3 100644
--- a/jam.c
+++ b/jam.c
@@ -22,6 +22,12 @@ 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' },
@@ -134,6 +140,7 @@ 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;
@@ -180,11 +187,25 @@ void *sender_worker(void *arg)
 			}
 
 			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;
+			}
 		}
-		fprintf(stderr, "sent\n");
 
 		close(sock);
 	}
+			
+	pthread_mutex_lock(&send_mutex);
+	total_bytes_sent += bytes_sent;
+	pthread_mutex_unlock(&send_mutex);
 
 	pthread_exit(0);
 }
@@ -193,6 +214,7 @@ void *receiver_worker(void *arg)
 {
 	int sock = (int)arg;
 	char buf[65536];
+	unsigned long long bytes_received = 0;
 
 	fprintf(stderr, "Receiver started\n");
 
@@ -201,16 +223,72 @@ void *receiver_worker(void *arg)
 		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)
 {
@@ -280,43 +358,27 @@ int main(int argc, char **argv)
 		perror("pthread_attr_setdetachstate");
 		exit(1);
 	}
-
-	// Fire off sender workers.
-	for (i = 0; i < num_senders; ++i) {
-		pthread_t thread;
 		
-		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).
-	 */
-	if (!do_listen) {
-		sleep(3600);
-		exit(0);
-	}
-
-	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);
 }
-- 
2.39.2