Initial commit

16 files changed, 613 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b2a687e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,39 @@
+*.a
+*.la
+*.lo
+*.o
+*.orig
+*.pyc
+*.rej
+*.tar.bz2
+*.tar.gz
+*.tar.xz
+*~
+*.gdbm
+*.cflow
+.deps
+.emacs*
+.libs
+ABOUT-NLS
+ChangeLog
+INSTALL
+Makefile
+Makefile.in
+TAGS
+aclocal.m4
+autoconf.h
+autoconf.h.in
+autom4te.cache
+build-aux
+config.log
+config.status
+configure
+configure.ac
+core
+gmon.out
+libltdl
+libtool
+m4
+stamp-h1
+tmp/
+benchmarks
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a4fd957
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,7 @@
+[submodule "gdbm/newcache"]
+        path = gdbm/newcache
+        url = git://git.gnu.org.ua/gdbm.git
+        branch = newcache
+[submodule "gdbm/master"]
+        path = gdbm/master
+        url = git://git.gnu.org.ua/gdbm.git
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..a7c97e1
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,22 @@
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = gdbm/master gdbm/newcache src
+BENCHMARKDIR=benchmarks
+benchmark:
+        @if test -z "$(NRECS)"; then \
+                echo "Please set NRECS"; \
+                exit 1; \
+        fi; \
+        if test -z "$(NKEYS)"; then \
+                echo "Please set NKEYS"; \
+                exit 1; \
+        fi; \
+        DIRNAME="$(BENCHMARKDIR)/$(NRECS)-$(NKEYS)"; \
+        if ! test -d "$$DIRNAME"; then \
+                mkdir -p $$DIRNAME; \
+                (echo "NRECS=$(NRECS)"; \
+                 echo "NKEYS=$(NKEYS)"; \
+                 echo "MAXCACHE=$(MAXCACHE)"; \
+                 echo "include @abs_top_builddir@/src/benchmark.mk") > $$DIRNAME/Makefile; \
+        fi; \
+        $(MAKE) -C $$DIRNAME
+
diff --git a/bootstrap b/bootstrap
new file mode 100644
index 0000000..1726aea
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,8 @@
+#!/bin/sh
+set e
+test -d m4 || mkdir m4
+test -d gdbm || mkdir gdbm
+git submodule init
+git submodule update
+git submodule foreach ./bootstrap
+autoreconf -f -i -s
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..5abd4ff
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,18 @@
+AC_PREREQ([2.69])
+AC_INIT([gdbm-benchmarks],[0.1],[gray@gnu.org],
+        [gdbm-benchmarks],
+        [https://puszcza.gnu.org.ua/projects/gdbm])
+AC_CONFIG_SRCDIR([src/fetchkeys.c])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([-Wall -Werror 1.11.5 foreign tar-ustar silent-rules])
+
+# Checks for programs.
+AC_PROG_CC
+
+AC_CONFIG_SUBDIRS(gdbm/master gdbm/newcache)
+AC_CONFIG_FILES([Makefile
+                 src/Makefile
+                 src/master/Makefile
+                 src/newcache/Makefile
+                 src/benchmark.mk])
+AC_OUTPUT
diff --git a/gdbm/master b/gdbm/master
new file mode 160000
+Subproject 4fb2326a4ac0e6f45c21f7651b1c87317567fd8
diff --git a/gdbm/newcache b/gdbm/newcache
new file mode 160000
+Subproject 1f94a81a9f3a9955ca74dff07b7909595a85048
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..ef23521
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,3 @@
+dropcache
+fetchkeys
+benchmark.mk
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..c019df3
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS=newcache master
+EXTRA_DIST=fechkeys.c runtest gnuplot.m4 benchmark.mk.in
diff --git a/src/benchmark.mk.in b/src/benchmark.mk.in
new file mode 100644
index 0000000..c576cd6
--- /dev/null
+++ b/src/benchmark.mk.in
@@ -0,0 +1,50 @@
+AM_DEFAULT_VERBOSITY=0
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+
+abs_top_srcdir = @abs_top_srcdir@
+abs_top_builddir = @abs_top_builddir@
+
+MASTERDIR=$(abs_top_builddir)/gdbm/master
+GDBMTOOL=$(MASTERDIR)/src/gdbmtool
+TESTDIR=$(MASTERDIR)/tests
+
+all: test
+test: master.log newcache.log
+%.log: keys.txt a.gdbm
+        $(AM_V_GEN)MAXCACHE=$(MAXCACHE); \
+                $(abs_top_srcdir)/src/runtest -d \
+                        --final $${MAXCACHE:-$$(($$($(GDBMTOOL) a.gdbm dir |\
+                                    sed -n -e '2{' \
+                                           -e 's/.*Buckets = //' \
+                                           -e 's/\.$$//' \
+                                           -e 'p}') * 2))} \
+                        --log-file=$*.log \
+                $(abs_top_builddir)/src/$*/fetchkeys
+clean:
+        rm -f master.log newcache.log
+allclean: clean
+        rm -f keys.txt a.gdbm
+keys.txt:
+        @$(MAKE) -C $(TESTDIR) num2word
+        $(AM_V_GEN)$(TESTDIR)/num2word 1:$(NRECS) | \
+                cut -f1 | shuf | head -n $(NKEYS) > keys.txt
+a.gdbm:
+        @$(MAKE) -C $(TESTDIR) num2word gtload
+        $(AM_V_GEN)$(TESTDIR)/num2word 1:$(NRECS) | $(TESTDIR)/gtload -clear a.gdbm
+benchmark.gnuplot: $(abs_top_srcdir)/src/gnuplot.m4
+        m4 -DNRECS=$(NRECS) -DNKEYS=$(NKEYS) \
+                $(abs_top_srcdir)/src/gnuplot.m4 > benchmark.gnuplot
+plot: test benchmark.gnuplot
+        gnuplot -p benchmark.gnuplot
+
diff --git a/src/dropcache.c b/src/dropcache.c
new file mode 100644
index 0000000..659f00a
--- /dev/null
+++ b/src/dropcache.c
@@ -0,0 +1,24 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+char const drop_caches[] = "/proc/sys/vm/drop_caches";
+
+int
+main(int argc, char **argv)
+{
+  int fd;
+  fd = open(drop_caches, O_WRONLY);
+  if (fd == -1)
+    {
+      perror(drop_caches);
+      return 1;
+    }
+  if (write(fd, "3\n", 2) != 2)
+    {
+      perror(drop_caches);
+      return 1;
+    }      
+  close(fd);
+  return 0;
+}
diff --git a/src/fetchkeys.c b/src/fetchkeys.c
new file mode 100644
index 0000000..32f0199
--- /dev/null
+++ b/src/fetchkeys.c
@@ -0,0 +1,320 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <gdbm.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+#include <errno.h>
+#include <signal.h>
+#include <assert.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+static unsigned long
+get_size (char const *str)
+{
+  char *p;
+  unsigned long n, m;
+