X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=jam.c;h=fc0b723867e18ade828c9c9ee73aae038b68a873;hb=12e7e145baf058f169ae789a8155be116a9e2e0b;hp=e81e166d4bebe403217155a7b2d4b2f0fac417e7;hpb=c7b34c15c91b9552b41463be7c2e598922874d4e;p=jam

diff --git a/jam.c b/jam.c
index e81e166..fc0b723 100644
--- a/jam.c
+++ b/jam.c
@@ -20,18 +20,26 @@ unsigned num_sources = 0;
 unsigned room_sources = 0;
 
 unsigned num_senders = 128;
+unsigned do_listen = 1;
 
 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 }
 };
 
+// generates from [0,1>
+double gen_uniform_random()
+{
+	return rand() / (RAND_MAX+1.0);
+}
+
 double gen_pareto_random(double min, double k)
 {
-	double u = rand() / (RAND_MAX+1.0);
+	double u = gen_uniform_random();
 	return min * pow(u, -1.0 / k);
 }
 
@@ -95,7 +103,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);
@@ -109,6 +117,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:
@@ -121,12 +132,58 @@ void parse_options(int argc, char **argv)
 void *sender_worker(void *arg)
 {
 	unsigned i;
+	int sock;
+	char buf[65536];
 
-	printf("Dummy sender worker\n");
+	for (i = 0; i < 65536; ++i)
+		buf[i] = rand() & 0xff;
 
 	for (i = 0; i < 1000; ++i) {
-		unsigned bytes = (unsigned)gen_pareto_random(1048576.0, 1.0);
-		printf("Sending %u bytes\n", bytes);
+		unsigned src_num = (unsigned)(num_sources * gen_uniform_random());
+		unsigned dst_num = (unsigned)(num_destinations * gen_uniform_random());
+		unsigned num_bytes = (unsigned)gen_pareto_random(1048576.0, 1.0);
+		struct sockaddr_in sin;
+
+		sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+		if (sock == -1) {
+			perror("socket()");
+			exit(1);
+		}
+		
+		// FIXME: bind to the right source
+		
+		sin.sin_family = AF_INET;
+		sin.sin_port = htons(port);
+		sin.sin_addr = destinations[dst_num];
+	
+		fprintf(stderr, "connecting %u\n", i);
+
+		if (connect(sock, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
+			perror("connect()");
+			exit(1);
+		}
+		
+		fprintf(stderr, "connected\n");
+
+		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;
+		}
+		fprintf(stderr, "sent\n");
+
+		close(sock);
 	}
 
 	pthread_exit(0);
@@ -137,7 +194,7 @@ void *receiver_worker(void *arg)
 	int sock = (int)arg;
 	char buf[65536];
 
-	printf("Received worker for socket %u\n", sock);
+	fprintf(stderr, "Receiver started\n");
 
 	for ( ;; ) {
 		int ret = read(sock, buf, 65536);
@@ -146,8 +203,6 @@ void *receiver_worker(void *arg)
 
 		// FIXME: update stats here
 	}
-
-	printf("Socket %u done\n", sock);
 	
 	if (close(sock) == -1) {
 		perror("close()");
@@ -203,7 +258,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);
@@ -219,6 +276,11 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
+	if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0) {
+		perror("pthread_attr_setdetachstate");
+		exit(1);
+	}
+
 	// Fire off sender workers.
 	for (i = 0; i < num_senders; ++i) {
 		pthread_t thread;
@@ -234,6 +296,11 @@ int main(int argc, char **argv)
 	 * 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);