X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=jam.c;h=5faf0379d4b7eb13299dd48595641d935e6e409a;hb=2f5350f30cbfeebde0bd287d16fb118639536493;hp=656be4da526b8a0eaa82db747315d6d0ffb786b4;hpb=6470f895fdfa745b977b4a93cfafd211298b5ebf;p=jam

diff --git a/jam.c b/jam.c
index 656be4d..5faf037 100644
--- a/jam.c
+++ b/jam.c
@@ -143,14 +143,19 @@ void parse_options(int argc, char **argv)
 	}
 }
 
-void generate_new_sender(int ep_fd)
+struct sender {
+	int fd;
+	unsigned long long bytes_left;
+};
+
+void generate_new_sender(int ep_fd, struct sender *s)
 {
 	int sock, one = 1;
 	unsigned src_num, dst_num;
 	unsigned long long num_bytes;
 	struct sockaddr_in sin;
 	struct epoll_event ev;
-
+	
 	sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (sock == -1) {
 		perror("socket()");
@@ -181,8 +186,10 @@ void generate_new_sender(int ep_fd)
 	
 	// stick it in the epoll set (FIXME: make edge-triggered?)
 	ev.events = EPOLLOUT | EPOLLHUP | EPOLLERR;
-	ev.data.fd = sock;
-	ev.data.u64 = num_bytes;
+	ev.data.ptr = s;
+
+	s->fd = sock;
+	s->bytes_left = num_bytes;
 
 	if (epoll_ctl(ep_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
 		perror("EPOLL_CTL_ADD");
@@ -216,8 +223,15 @@ void *sender_worker(void *arg)
 		buf[i] = rand() & 0xff;
 
 	// allocate all the senders
-	for (i = 0; i < num_sockets_per_sender; ++i)
-		generate_new_sender(ep_fd);
+	for (i = 0; i < num_sockets_per_sender; ++i) {
+		struct sender *s = (struct sender *)malloc(sizeof(struct sender));
+		if (s == NULL) {
+			perror("malloc()");
+			exit(1);
+		}
+
+		generate_new_sender(ep_fd, s);
+	}
 
 	for ( ;; ) {
 		int num_active = epoll_wait(ep_fd, events, num_sockets_per_sender, -1);
@@ -227,20 +241,24 @@ void *sender_worker(void *arg)
 		}
 
 		for (i = 0; i < num_active; ++i) {
-			unsigned long long bytes_to_send = events[i].data.u64;
+			struct sender *s = (struct sender *)events[i].data.ptr;
+			unsigned long long bytes_to_send = s->bytes_left;
 			unsigned ret;
 
 			if (bytes_to_send > 65536) {
 				bytes_to_send = 65536;	
 			}
 
-			ret = send(events[i].data.fd, buf, bytes_to_send, MSG_NOSIGNAL);
+			ret = send(s->fd, buf, bytes_to_send, MSG_NOSIGNAL);
 			if (ret == -1) {
+				if (errno == EAGAIN)
+					continue;
+
 				perror("send()");
 				exit(1);
 			}
 
-			events[i].data.u64 -= ret;
+			s->bytes_left -= ret;
 			bytes_sent += ret;
 
 			// update the central counter after every 1MB (8ms
@@ -253,14 +271,13 @@ void *sender_worker(void *arg)
 				bytes_sent = 0;
 			}
 			
-			if (events[i].data.u64 == 0) {
-				close(events[i].data.fd);
-				if (epoll_ctl(ep_fd, EPOLL_CTL_DEL, events[i].data.fd, NULL) == -1) {
+			if (s->bytes_left == 0) {
+				if (epoll_ctl(ep_fd, EPOLL_CTL_DEL, s->fd, NULL) == -1) {
 					perror("EPOLL_CTL_ADD");
 					exit(1);
 				}
-
-				generate_new_sender(ep_fd);
+				close(s->fd);
+				generate_new_sender(ep_fd, s);
 			}
 		}
 	}