X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=jam.c;h=1b6aaed6cf7625462f638d86eaa9430a5212b585;hb=f4c2815e7f939daf638b8cd388a212c9278f341c;hp=3b38d0217587f00d08e319eee7a1f5191f190599;hpb=32c853ee6bd73470050fde54e1f6a819f2a392c0;p=jam diff --git a/jam.c b/jam.c index 3b38d02..1b6aaed 100644 --- a/jam.c +++ b/jam.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -19,15 +20,35 @@ 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 } }; +// 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]; @@ -88,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); @@ -102,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: @@ -113,7 +137,72 @@ void parse_options(int argc, char **argv) void *sender_worker(void *arg) { - printf("Dummy sender worker\n"); + 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()); + 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]; + + if (connect(sock, (struct sockaddr *)&sin, sizeof(sin)) == -1) { + perror("connect()"); + exit(1); + } + + 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); } @@ -121,26 +210,81 @@ void *receiver_worker(void *arg) { int sock = (int)arg; char buf[65536]; - - printf("Received worker for socket %u\n", sock); + unsigned long long bytes_received = 0; for ( ;; ) { int ret = read(sock, buf, 65536); if (ret == 0) break; - // FIXME: update stats here - } + bytes_received += ret; - printf("Socket %u done\n", sock); + // 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_received += 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) { @@ -188,7 +332,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); @@ -204,6 +350,20 @@ 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 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); + } + } + // Fire off sender workers. for (i = 0; i < num_senders; ++i) { pthread_t thread; @@ -214,26 +374,21 @@ int main(int argc, char **argv) } } - /* - * Listen for incoming connections, spawning off one receiver - * thread for each (which will just gobble up the data until - * we're done). - */ + // Just stay around collecting statistics until we're done. for ( ;; ) { - struct sockaddr_in addr; - socklen_t addr_len = sizeof(addr); - pthread_t thread; + unsigned long long sent, received; - int sock = accept(server_sock, (struct sockaddr *)&addr, &addr_len); - if (sock == -1) { - perror("accept()"); - exit(1); - } + pthread_mutex_lock(&send_mutex); + sent = total_bytes_sent; + pthread_mutex_unlock(&send_mutex); + + pthread_mutex_lock(&receive_mutex); + received = total_bytes_received; + pthread_mutex_unlock(&receive_mutex); - if (pthread_create(&thread, &attr, receiver_worker, (void *)sock) != 0) { - perror("pthread_create()"); - exit(1); - } + printf("%llu %llu\n", sent, received); + + sleep(1); } exit(0);