Start of a structure.

Makefile

@@ -1,10 +1,10 @@
 COMP ?= clang
-DISABLED_WARNINGS ?= 
+DISABLED_WARNINGS ?= -Wno-padded
 CFLAGS ?= -Weverything -Werror -O3 -g --std=gnu11 --pedantic-errors -fPIE -fstack-protector-strong -D_GNU_SOURCE $(DISABLED_WARNINGS)
 LDFLAGS ?= $(CFLAGS) -Wl,-z,relro -Wl,-z,now -pie
 LIBS ?=
 
-OBJ = buf.o rand.o
+OBJ = buf.o list.o rand.o
 
 all: stutterfuzz
 

list.c

@@ -0,0 +1,24 @@
+#include <stdlib.h>
+
+#include "list.h"
+
+void list_head_init(struct list_head *head) {
+	head->next = head->prev = head;
+}
+
+bool list_is_empty(const struct list_head *head) {
+	return head->next == head;
+}
+
+void list_add(struct list_head *new, struct list_head *head) {
+	new->next = head;
+	new->prev = head->prev;
+	new->prev->next = new;
+	head->prev = new;
+}
+
+void list_del(struct list_head *entry) {
+	entry->next->prev = entry->prev;
+	entry->prev->next = entry->next;
+	entry->prev = entry->next = NULL;
+}

list.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <stdbool.h>
+
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wgnu-statement-expression"
+#pragma GCC diagnostic ignored "-Wlanguage-extension-token"
+
+#define offset_of(type, member) ((size_t) &((type *) NULL)->member)
+
+#define container_of(ptr, type, member) ({ \
+		typeof( ((type *) NULL)->member ) *__mptr = (ptr); \
+		(type *)( (char *)__mptr - offset_of(type, member) );})
+
+struct list_head {
+	struct list_head *next;
+	struct list_head *prev;
+};
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define list_entry(ptr, type, member) \
+		container_of(ptr, type, member)
+
+#define list_for_each_entry(pos, head, member) \
+		for (pos = list_entry((head)->next, typeof(*pos), member); \
+				&pos->member != (head); \
+				pos = list_entry(pos->member.next, typeof(*pos), member))
+
+#define list_for_each_entry_safe(pos, n, head, member) \
+		for (pos = list_entry((head)->next, typeof(*pos), member), \
+					n = list_entry(pos->member.next, typeof(*pos), member); \
+				&pos->member != (head); \
+				pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+void list_head_init(struct list_head *);
+bool __attribute__ ((warn_unused_result)) list_is_empty(const struct list_head *);
+void list_add(struct list_head *, struct list_head *);
+void list_del(struct list_head *);

stutterfuzz.c

@@ -1,23 +1,221 @@
+#include <assert.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
+#include "list.h"
 #include "rand.h"
 
-static uint64_t get_split(uint64_t total_len, uint64_t remaining_len) {
+static struct {
-	uint64_t rnd;
+	char *blob_dir;
+	uint32_t num_conns;
+} config = {
+	.num_conns = 100,
+};
+
+struct file {
+	char *path;
+	char *buf;
+	size_t len;
+	struct list_head file_list;
+};
+
+struct conn {
+	int fd;
+	struct file *file;
+	size_t offset;
+	struct list_head conn_list;
+};
+
+static struct list_head file_head = LIST_HEAD_INIT(file_head);
+static struct list_head conn_head = LIST_HEAD_INIT(conn_head);
+
+static uint64_t rounds = 0, open_conns = 0;
+
+static bool parse_opts(int argc, char *argv[]) {
+	static struct option long_options[] = {
+		{"blob-dir",  required_argument, 0, 'b'},
+		{"num-conns", required_argument, 0, 'n'},
+		{0,           0,                 0, 0  },
+	};
+
+	int opt;
+	while ((opt = getopt_long_only(argc, argv, "", long_options, NULL)) != -1) {
+		switch (opt) {
+			case 'b':
+				config.blob_dir = optarg;
+				break;
+
+			case 'n':
+				config.num_conns = (uint32_t) strtoul(optarg, NULL, 10);
+				assert(config.num_conns);
+
+			default:
+				return false;
+		}
+	}
+
+	if (optind != argc) {
+		return false;
+	}
+
+	if (!config.blob_dir) {
+		return false;
+	}
+
+	return true;
+}
+
+static void open_blobs() {
+	size_t dirlen = strlen(config.blob_dir);
+
+	DIR *dir = opendir(config.blob_dir);
+	assert(dir);
+
+	uint64_t max_size = 0, min_size = UINT64_MAX, total_size = 0, num_blobs = 0;
+
+	while (true) {
+		struct dirent entry, *ret;
+		assert(!readdir_r(dir, &entry, &ret));
+		if (!ret) {
+			break;
+		}
+		if (entry.d_name[0] == '.') {
+			continue;
+		}
+
+		struct file *file = malloc(sizeof(*file));
+		assert(file);
+		list_add(&file->file_list, &file_head);
+
+		size_t max_len = dirlen + strlen(entry.d_name) + 2;
+		file->path = malloc(max_len);
+		assert(file->path);
+		snprintf(file->path, max_len, "%s/%s", config.blob_dir, entry.d_name);
+
+		int fd = open(file->path, O_RDONLY);
+		assert(fd >= 0);
+
+		struct stat stat;
+		assert(!fstat(fd, &stat));
+
+		file->len = (size_t) stat.st_size;
+
+		max_size = max_size < file->len ? file->len : max_size;
+		min_size = min_size > file->len ? file->len : min_size;
+		num_blobs++;
+		total_size += file->len;
+
+		file->buf = mmap(NULL, file->len, PROT_READ, MAP_SHARED, fd, 0);
+		assert(file->buf);
+
+		assert(!close(fd));
+	}
+
+	assert(num_blobs);
+
+	fprintf(stderr, "Loaded %ju blobs. Bytes: %ju min, %ju mean, %ju max\n",
+			(uintmax_t) num_blobs,
+			(uintmax_t) min_size,
+			(uintmax_t) (total_size / num_blobs),
+			(uintmax_t) max_size);
+
+	assert(!closedir(dir));
+}
+
+static struct file *file_next() {
+	static struct list_head *first = NULL, *iter;
+
+	if (!first) {
+		iter = first = file_head.next;
+	}
+
+	if (iter->next == &file_head) {
+		iter = iter->next->next;
+		rounds++;
+		fprintf(stderr, "\rRounds: %ju", (uintmax_t) rounds);
+	} else {
+		iter = iter->next;
+	}
+	return list_entry(iter, struct file, file_list);
+}
+
+static size_t conn_get_split(struct conn *conn) {
+	size_t total_len = conn->file->len;
+	size_t remaining_len = total_len - conn->offset;
+	size_t rnd;
 	rand_fill(&rnd, sizeof(rnd));
 	rnd %= total_len;
 	return rnd > remaining_len ? remaining_len : rnd;
 }
 
-int main(int __attribute__ ((unused)) argc, char __attribute__ ((unused)) *argv[]) {
+static void conn_new() {
+	struct conn *conn = malloc(sizeof(*conn));
+	assert(conn);
+	conn->fd = socket(AF_INET6, SOCK_STREAM | SOCK_NONBLOCK, 0);
+	assert(conn->fd >= 0);
+	// TODO: start connection
+	conn->file = file_next();
+	conn->offset = 0;
+	list_add(&conn->conn_list, &conn_head);
+	open_conns++;
+}
+
+static void conn_del(struct conn *conn) {
+	assert(!close(conn->fd));
+	list_del(&conn->conn_list);
+	free(conn);
+	open_conns--;
+}
+
+static void conn_fill() {
+	while (open_conns < config.num_conns) {
+		conn_new();
+	}
+}
+
+static void conn_send_message(struct conn *conn) {
+	size_t remaining = conn->file->len - conn->offset;
+	size_t to_send = conn_get_split(conn);
+	if (send(conn->fd, conn->file->buf + conn->offset, to_send, MSG_DONTWAIT | MSG_NOSIGNAL) != (ssize_t) to_send ||
+			to_send == remaining) {
+		conn_del(conn);
+		return;
+	}
+	conn->offset += to_send;
+}
+
+static void conn_send_messages() {
+	struct conn *iter, *next;
+	list_for_each_entry_safe(iter, next, &conn_head, conn_list) {
+		conn_send_message(iter);
+	}
+}
+
+int main(int argc, char *argv[]) {
 	rand_init();
 
-	uint64_t total_len = 1397;
+	if (!parse_opts(argc, argv)) {
-	for (uint64_t remaining = total_len, consume = 0; remaining; remaining -= consume) {
+		fprintf(stderr, "Usage: TODO\n");
-		consume = get_split(total_len, remaining);
+		return 1;
-		fprintf(stderr, "consume %ju bytes\n", (uintmax_t) consume);
 	}
 
-	rand_cleanup();
+	open_blobs();
+
+	while (true) {
+		conn_fill();
+		conn_send_messages();
+	}
+
+	// rand_cleanup();
 }