Tweak the output a bit.

[jam] / jam.c

diff --git a/jam.c b/jam.c
index 8713dcdf59193401fa27dbf52535741ca388b6c2..b8289509c572d4400f461d91db39d443b9c61198 100644 (file)
--- a/jam.c
+++ b/jam.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include <getopt.h>
@@ -23,10 +24,23 @@ unsigned num_senders = 128;
 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' },
        { 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 = gen_uniform_random();
+       return min * pow(u, -1.0 / k);
+}
+
 void read_ip_list(char *filename, struct in_addr **addr_list, unsigned *num, unsigned *room)
 {
        char buf[256];
@@ -87,7 +101,7 @@ void parse_options(int argc, char **argv)
        int option_index = 0;
 
        for ( ;; ) {
-               int c = getopt_long(argc, argv, "s:d:p:", longopts, &option_index); 
+               int c = getopt_long(argc, argv, "s:d:n:p:", longopts, &option_index); 
                switch (c) {
                case 's':
                        read_ip_list(optarg, &sources, &num_sources, &room_sources);
@@ -95,6 +109,9 @@ void parse_options(int argc, char **argv)
                case 'd':
                        read_ip_list(optarg, &destinations, &num_destinations, &room_destinations);
                        break;
+               case 'n':
+                       num_senders = atoi(optarg);
+                       break;
                case 'p':
                        port = atoi(optarg);
                        break;
@@ -109,7 +126,41 @@ void parse_options(int argc, char **argv)
 
 void *sender_worker(void *arg)
 {
-       printf("Dummy sender worker\n");
+       unsigned i;
+       int sock;
+
+       for (i = 0; i < 1000; ++i) {
+               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");
+
+               // FIXME: send data here
+
+               close(sock);
+       }
+
        pthread_exit(0);
 }
 
@@ -118,8 +169,6 @@ void *receiver_worker(void *arg)
        int sock = (int)arg;
        char buf[65536];
 
-       printf("Received worker for socket %u\n", sock);
-
        for ( ;; ) {
                int ret = read(sock, buf, 65536);
                if (ret == 0)
@@ -127,8 +176,6 @@ void *receiver_worker(void *arg)
 
                // FIXME: update stats here
        }
-
-       printf("Socket %u done\n", sock);
        
        if (close(sock) == -1) {
                perror("close()");