diff --git a/src/malloc/Makefile b/src/malloc/Makefile
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/src/malloc/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/src/malloc/bench.c b/src/malloc/bench.c
new file mode 100644
index 0000000..28ae66d
--- /dev/null
+++ b/src/malloc/bench.c
@@ -0,0 +1,141 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+#include "test.h"
+
+void bench_malloc_sparse() {
+	void *p[N];
+	size_t i;
+	for (i=0; i<sizeof p/sizeof *p; i++) {
+		p[i] = malloc(4000);
+		memset(p[i], 0, 4000);
+	}
+	for (i=0; i<sizeof p/sizeof *p; i++)
+		if (i%150) free(p[i]);
+}
+
+void bench_malloc_bubble() {
+	void *p[N];
+	size_t i;
+	for (i=0; i<sizeof p/sizeof *p; i++) {
+		p[i] = malloc(4000);
+		memset(p[i], 0, 4000);
+	}
+	for (i=0; i<sizeof p/sizeof *p-1; i++)
+		free(p[i]);
+}
+
+void bench_malloc_tiny1() {
+	void **p = malloc(N * sizeof *p);
+	size_t i;
+	for (i=0; i<N; i++) {
+		p[i] = malloc((i%4+1)*16);
+	}
+	for (i=0; i<N; i++) {
+		free(p[i]);
+	}
+	free(p);
+}
+
+void bench_malloc_tiny2() {
+	void **p = malloc(N * sizeof *p);
+	size_t i;
+	for (i=0; i<N; i++) {
+		p[i] = malloc((i%4+1)*16);
+	}
+	if (N>1) for (i=1; i; i = (i+1999)%N)
+		free(p[i]);
+	free(p[0]);
+	free(p);
+}
+
+void bench_malloc_big1() {
+	void *p[N];
+	size_t i;
+	for (i=0; i<sizeof p/sizeof *p; i++) {
+		p[i] = malloc((i%4+1)*16384);
+	}
+	for (i=0; i<sizeof p/sizeof *p; i++) {
+		free(p[i]);
+	}
+}
+
+void bench_malloc_big2() {
+	void *p[N];
+	size_t i;
+	for (i=0; i<sizeof p/sizeof *p; i++) {
+		p[i] = malloc((i%4+1)*16384);
+	}
+	if (N>1) for (i=1; i; i = (i+1999)%(sizeof p/sizeof *p))
+		free(p[i]);
+	free(p[0]);
+}
+
+
+#define SH_COUNT 300
+#define PV_COUNT 300
+#define MAX_SZ 500
+#define DEF_SZ 40
+
+struct foo {
+	void *mem;
+	pthread_mutex_t lock;
+};
+
+static unsigned rng(unsigned *r)
+{
+	return *r = *r * 1103515245 + 12345;
+}
+
+
+static void *stress(void *arg)
+{
+	struct foo *foo = arg;
+	unsigned r = (unsigned)pthread_self();
+	int i, j;
+	size_t sz;
+	void *p;
+
+	for (i=0; i<N; i++) {
+		j = rng(&r) % SH_COUNT;
+		sz = rng(&r) % MAX_SZ;
+		pthread_mutex_lock(&foo[j].lock);
+		p = foo[j].mem;
+		foo[j].mem = 0;
+		pthread_mutex_unlock(&foo[j].lock);
+		free(p);
+		if (!p) {
+			p = malloc(sz);
+			pthread_mutex_lock(&foo[j].lock);
+			if (!foo[j].mem) foo[j].mem = p, p = 0;
+			pthread_mutex_unlock(&foo[j].lock);
+			free(p);
+		}
+	}
+	return 0;
+}
+
+void bench_malloc_thread_stress() {
+	struct foo foo[SH_COUNT] = {{0}};
+	pthread_t td1, td2;
+	void *res;
+
+	pthread_create(&td1, 0, stress, foo);
+	pthread_create(&td2, 0, stress, foo);
+	pthread_join(td1, &res);
+	pthread_join(td2, &res);
+}
+
+void bench_malloc_thread_local() {
+	struct foo foo1[SH_COUNT] = {{0}};
+	struct foo foo2[SH_COUNT] = {{0}};
+	pthread_t td1, td2;
+	void *res;
+
+	pthread_create(&td1, 0, stress, foo1);
+	pthread_create(&td2, 0, stress, foo2);
+	pthread_join(td1, &res);
+	pthread_join(td2, &res);
+}
+
diff --git a/src/stdio/bench.c b/src/stdio/bench.c
new file mode 100644
index 0000000..625a217
--- /dev/null
+++ b/src/stdio/bench.c
@@ -0,0 +1,35 @@
+#define _POSIX_C_SOURCE 200809L
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "test.h"
+
+void bench_stdio_putcgetc() {
+	FILE *f = tmpfile();
+	size_t i;
+	size_t cs = 0;
+
+	for (i=0; i<N; i++)
+		putc('x', f);
+	fseeko(f, 0, SEEK_SET);
+	for (i=0; i<N; i++)
+		cs += getc(f);
+	fclose(f);
+	if (cs != (size_t)N*'x')
+		abort();
+}
+
+void bench_stdio_putcgetc_unlocked() {
+	FILE *f = tmpfile();
+	size_t i;
+	size_t cs = 0;
+
+	for (i=0; i<N; i++)
+		putc_unlocked('x', f);
+	fseeko(f, 0, SEEK_SET);
+	for (i=0; i<N; i++)
+		cs += getc_unlocked(f);
+	fclose(f);
+	if (cs != (size_t)N*'x')
+		abort();
+}