geoip2_c 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d4407340c5c98633cae71cbc6b2c69cfb85a315
-  data.tar.gz: 35e0cc0e59278f9d6ce2f5c8079dff2a5a443ed0
+SHA256:
+  metadata.gz: fa4074dbeab86f3881d576390460438107cd9d3d156d1a3da9813b2f5dc1f890
+  data.tar.gz: 94a44a7f48e4b69742c659b473b60baad893df2cf938db6e49d7ee7388a6fbe4
 SHA512:
-  metadata.gz: 03a92ddb4b9d5097ea58a4a734a2bd4a7dc578e2afb01ad735211a6f71eeb139d2ce7cfab3022c90bdd0fded7e79799a89ece649c9886d32cc58d43ebed9bec5
-  data.tar.gz: 92a70552ec7f8f3583e49574f88116a19f9575f6b2948889d2e0168097a71cfa9e9ee4bb6809abeb17bc5767b6108691fd3876040c778063f11c7d52b88847d2
+  metadata.gz: 2a338f192553f75914d5c5bfe72c26be5aea555df7c6416406751521f35445d36c06c99c0ea3aa58f11b9f635dc8f4e8f85a5ac2b03f402be8c9295d655ff41b
+  data.tar.gz: 758c468308389d460bdf3633afb824079188ce3ecc4cc05e2f76365c3adcbd3cbf158d6129cade3627177dda6f238b2e29d5b77bed044f2493b6587fcb577941

data/.travis.yml

@@ -4,12 +4,11 @@ services:
 
 env:
   global:
-    DOCKER_COMPOSE_VERSION: 1.8.1
+    DOCKER_COMPOSE_VERSION: 1.18.0
   matrix:
-    - TARGET_RUBY_VERSION=2.1
-    - TARGET_RUBY_VERSION=2.2
-    - TARGET_RUBY_VERSION=2.3
     - TARGET_RUBY_VERSION=2.4
+    - TARGET_RUBY_VERSION=2.5
+    - TARGET_RUBY_VERSION=2.6
 
 before_install:
   #- sudo apt-get update

data/README.md

@@ -15,6 +15,24 @@ This library uses `Hash#dig` and `Array#dig`.
 If you want to use this library with Ruby2.1 or Ruby2.2, you can install a gem which adds support `#dig` method.
 But I don't want to add extra dependency to this library, so I decided not to add extra dependency to support old Ruby versions.
 
+## Build requirements
+
+Need ruby.h to build this extension, so you must install it before build this extension.
+
+Debian GNU Linux / Ubuntu:
+
+```
+$ sudo apt install -y build-essential automake autoconf libtool
+```
+
+CentOS:
+
+```
+$ sudo yum groupinstall -y "Development Tools"
+```
+
+**NOTE**: If you want to use libmaxminddb provided as a deb/rpm package, you can install libmaxminddb-dev or libmaxminddb-devel at your own risk.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -36,10 +54,10 @@ Or install it yourself as:
 ```ruby
 require "geoip2"
 
-db = GeoIP2::Databaes.new("/path/to/GeoLite2-City.mmdb")
+db = GeoIP2::Database.new("GeoLite2-City.mmdb")
 result = db.lookup("66.102.9.80")
-retult.get_value("city", "names", "en") # => "Mountain View"
-retult.dig("city", "names", "en")       # => "Mountain View"
+result.get_value("city", "names", "en") # => "Mountain View"
+result.dig("city", "names", "en")       # => "Mountain View"
 ```
 
 ## Development

data/docker-compose.yml

@@ -1,5 +1,19 @@
-version: "2"
+version: "3"
 services:
+  test-ruby2.6:
+    build:
+      context: .
+      dockerfile: dockerfiles/Dockerfile-ruby2.6
+    command: tail -f /dev/null
+    environment:
+      - BUNDLE_GEMFILE=Gemfile
+  test-ruby2.5:
+    build:
+      context: .
+      dockerfile: dockerfiles/Dockerfile-ruby2.5
+    command: tail -f /dev/null
+    environment:
+      - BUNDLE_GEMFILE=Gemfile
   test-ruby2.4:
     build:
       context: .

data/dockerfiles/{Dockerfile-ruby2.1 → Dockerfile-ruby2.5}

@@ -1,4 +1,4 @@
-FROM ruby:2.1-alpine
+FROM ruby:2.5-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 

data/dockerfiles/{Dockerfile-ruby2.2 → Dockerfile-ruby2.6}

@@ -1,4 +1,4 @@
-FROM ruby:2.2-alpine
+FROM ruby:2.6-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 

data/ext/geoip2/geoip2.c

@@ -30,13 +30,15 @@ static VALUE rb_geoip2_lr_to_h(VALUE self);
 static const rb_data_type_t rb_mmdb_type = {
   "geoip2/mmdb", {
     0, mmdb_free, 0,
-  }, NULL, NULL
+  }, NULL, NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static const rb_data_type_t rb_lookup_result_type = {
   "geoip2/lookup_result", {
-    0, 0, 0,
-  }, NULL, NULL
+    0, RUBY_DEFAULT_FREE, 0,
+  }, NULL, NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static void

data/ext/geoip2/libmaxminddb/.gitignore

@@ -2,6 +2,7 @@
 *.lo
 *.o
 *.so
+*.swp
 */.deps
 */.libs
 *~
@@ -24,9 +25,11 @@
 /man
 /missing
 /src/libmaxminddb.pc
+/src/test-data-pool
 /t/*.log
 /t/*.trs
 /t/*_t
+/t/*-t
 /test-driver
 Makefile
 Makefile.in

data/ext/geoip2/libmaxminddb/.travis.yml

@@ -15,18 +15,40 @@ addons:
 language: c
 matrix:
   include:
+    # Why do we have -Wno-unused-parameter? Because libtap has unused
+    # parameters unfortunately.
+    #
+    # Why -Wno-unused-command-line-argument? Because Clang on OSX does not like
+    # -pthread to be given during linking (while gcc says it should be). We
+    # could alternatively work around this via conditionals in automake, but
+    # that seems uglier. Note we specify this for gcc on OSX as well as gcc
+    # there is a frontend for Clang.
     - os: linux
       compiler: gcc
       env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter"
     - os: osx
       compiler: gcc
-      env: MMCFLAGS="-std=c99 -Wall -Wextra -Wno-unused-parameter"
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-command-line-argument"
     - os: linux
       compiler: clang
       env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter"
     - os: osx
       compiler: clang
-      env: MMCFLAGS="-std=c99 -Wall -Wextra -Wno-unused-parameter"
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-command-line-argument"
+    # The same, but POSIX.1-2001. We default to POSIX.1-2008 but want to remain
+    # compatible with POSIX.1-2001.
+    - os: linux
+      compiler: gcc
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -D_POSIX_C_SOURCE=200112L"
+    - os: osx
+      compiler: gcc
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-command-line-argument -D_POSIX_C_SOURCE=200112L"
+    - os: linux
+      compiler: clang
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -D_POSIX_C_SOURCE=200112L"
+    - os: osx
+      compiler: clang
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-command-line-argument -D_POSIX_C_SOURCE=200112L"
 env:
   global:
     - secure: a2pXNVW/lGrMdJTal+pzH0J5N69RdBErwe2dHU2xDnOeNcDYmiSxmU4Fw52KPYXFzdlR9GuEyZtHtesRQthSHpylcIvfJJCih7EvwbNQ5pfplpT5ri2PKPFWB11ebr6vG23Ucgc5lrqHdgIgv+QtqVmW1IDf0hq62itMpu4MwcQ=

data/ext/geoip2/libmaxminddb/Changes.md

@@ -1,3 +1,42 @@
+## 1.3.2 - 2018-01-17
+
+* Allocate memory for `MMDB_entry_data_list_s` structs in separate chunks
+  rather than one large chunk. This simplifies accessing memory in
+  `MMDB_get_entry_data_list()` and increases performance. It builds on the
+  changes in 1.3.0 and 1.3.1.
+* We no longer export `data_pool_*` symbols. These are internal functions
+  but we were previously exporting them. Pull request by Faidon Liambotis.
+  GitHub #162.
+* Build with POSIX.1-2008 by default if the system supports it. This allows
+  use of `open()` with `O_CLOEXEC`. We retain support for systems that
+  provide only POSIX.1-2001.
+* Open the database with the `O_CLOEXEC` flag if the system provides it.
+  This avoids cases where we could leak fds when called in multi-threaded
+  programs that `fork()` and `exec()`. Original report and PR by Brandon L
+  Black.
+* Added a test to ensure we export only intended symbols (e.g. MMDB_*).
+
+
+## 1.3.1 - 2017-11-24
+
+* Fix build problems related to `rpl_malloc()`. Pull request by Rainer
+  Gerhards. GitHub #152.
+* Fix a race to set and read data in a field on the `MMDB_s` struct
+  (`ipv4_start_node`). GitHub #153.
+* Fix cases of invalid memory access when using
+  `MMDB_get_entry_data_list()`. This was introduced in 1.3.0 and occurred
+  when performing large lookups. GitHub #153.
+
+
+## 1.3.0 - 2017-11-10
+
+* Perform fewer memory allocations in `MMDB_get_entry_data_list()`. This
+  significantly improves its performance. GitHub #147.
+* Fix `mmdblookup`'s build epoch reporting on some systems. Big endian
+  systems with a 32-bit `time_t` no longer show a database build date of
+  1970-01-01 00:00:00. Pull request by Rainer Jung. GitHub #143.
+
+
 ## 1.2.1 - 2017-05-15
 
 * Use autoconf to check the system's endianness rather than trying to do this

data/ext/geoip2/libmaxminddb/README.dev.md

@@ -4,23 +4,14 @@ We release by uploading the tarball to GitHub, uploading Ubuntu PPAs, and by
 updating the Homebrew recipe for this library.
 
 ## Creating the release tarball
+You may want to refer to the section about prerequisites.
 
+* Check whether there are any open issues to fix while you're doing this.
 * Update `Changes.md` to include specify the new version, today's date, and
-  list relevant changes.
-* Run `./dev-bin/make-release.sh` to update various files in the distro, our
-  GitHub pages, creates and pushes a tag, etc.
-* Run `make safedist` in the checkout directory to create a tarball.
-
-## GitHub
-
-* Go to https://github.com/maxmind/libmaxminddb/releases
-* GitHub will already have a release for the tag you just created.
-* Click on the new tag new.
-* Click on "Edit tag".
-* Give the release a title summarizing the changes.
-* Paste in the changes from the `Changes.md` file as the body.
-* Attach the release tarball you just created.
-* Click "Update release"
+  list relevant changes. Commit this.
+* Run `./dev-bin/release.sh` to update various files in the distro, our
+  GitHub pages, and creates a GitHub release with the tarball.
+* Check the release looks good on both GitHub and launchpad.net.
 
 ## PPA
 
@@ -33,26 +24,46 @@ The PPA release script is at `dev-bin/ppa-release.sh`. Running it should
 guide you though the release, although it may require some changes to run on
 configurations different than Greg's machine.
 
-Pre-script PPA release process:
+Check whether any new Ubuntu versions need to be listed in this script
+before running it.
 
-1. git co ubuntu-ppa
-2. git merge `<TAG>`
-3. dch -i
-  * Add new entry for wily (or whatever the most recent Ubuntu release
-    is. Follow existing PPA versioning style.
-4. git commit to add the debian changelog
-5. gbp buildpackage -S
-6. dput ppa:maxmind/ppa ../libmaxminddb_`<TAG>`-`<DEB VERSION>`_source.changes
-7. git push
-
-If 5 was successful, modify debian/changelog and repeat 5 & 6 for trusty and
-precise. Note that you can skip step #4 for subsequent uploads by adding
-`--git-ignore-new` when you call `gbp`.
+You should run it from `master`.
 
 ## Homebrew
 
-* Go to https://github.com/Homebrew/homebrew/blob/master/Library/Formula/libmaxminddb.rb
+* Go to https://github.com/Homebrew/homebrew-core/edit/master/Formula/libmaxminddb.rb
 * Edit the file to update the url and sha256. You can get the sha256 for the
   tarball with the `sha256sum` command line utility.
 * Make a commit with the summary `libmaxminddb <VERSION>`
 * Submit a PR with the changes you just made.
+
+# Prerequisites for releasing
+
+* Required packages (Ubuntu Artful): vim git-core dput build-essential
+  autoconf automake libtool git-buildpackage libfile-slurp-perl pandoc
+  dirmngr libfile-slurp-tiny-perl libdatetime-perl debhelper dh-autoreconf
+  libipc-run3-perl libtest-output-perl devscripts
+* Install [hub](https://github.com/github/hub/releases). (Using `./install`
+  from the tarball is fine)
+* GitHub ssh key (e.g. in `~/.ssh/id_rsa`)
+* Git config (e.g. `~/.gitconfig`)
+* Import your GPG secret key (or create one if you don't have a suitable
+  one)
+  * `gpg --import /path/to/key`
+  * `gpg --edit-key KEYID` and trust it ultimately
+  * Ensure it shows with `gpg --list-secret-keys`
+* You need to be invited to the launchpad.net MaxMind organization on your
+  launchpad.net account.
+* You need your GPG key listed on your launchpad.net account
+  * You can add it in the web interface. It wants the output of
+    `gpg --fingerprint`.
+  * Part of the instructions involve having your key published on the
+    Ubuntu keyserver:
+    `gpg --keyserver keyserver.ubuntu.com --send-keys KEYID`
+  * You'll get an email with an encrypted payload that you need to decrypt
+    and follow the link to confirm it.
+* Ensure `dch` knows your name and email. Refer to its man page for how to
+  tell it this. One way is to set the `DEBFULLNAME` and `DEBEMAIL`
+  environment variables. These should match your GPG key's name and email
+  exactly. This is what gets used in the Debian changelog as well as
+  defines what GPG key to use.

data/ext/geoip2/libmaxminddb/README.md

@@ -20,7 +20,7 @@ This library is licensed under the Apache License, Version 2.
 ## From a Tarball
 
 This code is known to work with GCC 4.4+ and clang 3.2+. It should also work
-on other compilers that supports C99, POSIX 2011.11, and the `-fms-extensions
+on other compilers that supports C99, POSIX.1-2001, and the `-fms-extensions
 flag` (or equivalent). The latter is needed to allow an anonymous union in a
 structure.
 
@@ -76,8 +76,8 @@ APT sources, run:
 
 Then install the packages by running:
 
-    $ sudo aptitude update
-    $ sudo aptitude install libmaxminddb0 libmaxminddb-dev mmdb-bin
+    $ sudo apt update
+    $ sudo apt install libmaxminddb0 libmaxminddb-dev mmdb-bin
 
 ## On OS X via Homebrew
 

data/ext/geoip2/libmaxminddb/bin/Makefile.am

@@ -3,3 +3,8 @@ include $(top_srcdir)/common.mk
 AM_LDFLAGS = $(top_builddir)/src/libmaxminddb.la
 
 bin_PROGRAMS = mmdblookup
+
+if !WINDOWS
+AM_CPPFLAGS += -pthread
+AM_LDFLAGS += -pthread
+endif

data/ext/geoip2/libmaxminddb/bin/mmdblookup.c

@@ -4,6 +4,10 @@
 #include "maxminddb.h"
 #include <errno.h>
 #include <getopt.h>
+#ifndef _WIN32
+#include <pthread.h>
+#endif
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,16 +22,27 @@
 #include <unistd.h>
 #endif
 
-#define LOCAL
+#define LOCAL static
+#define NO_PROTO
 
 /* *INDENT-OFF* */
 /* --prototypes automatically generated by dev-bin/regen-prototypes.pl - don't remove this comment */
 LOCAL void usage(char *program, int exit_code, const char *error);
-LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
-                               char **ip_address, int *verbose, int *iterations,
-                               int *lookup_path_length);
+LOCAL const char **get_options(
+    int argc,
+    char **argv,
+    char **mmdb_file,
+    char **ip_address,
+    int *verbose,
+    int *iterations,
+    int *lookup_path_length,
+    int *const thread_count,
+    char **const ip_file);
 LOCAL MMDB_s open_or_die(const char *fname);
 LOCAL void dump_meta(MMDB_s *mmdb);
+LOCAL bool lookup_from_file(MMDB_s *const mmdb,
+                            char const *const ip_file,
+                            bool const dump);
 LOCAL int lookup_and_print(MMDB_s *mmdb, const char *ip_address,
                            const char **lookup_path,
                            int lookup_path_length);
@@ -37,6 +52,17 @@ LOCAL void random_ipv4(char *ip);
 /* --prototypes end - don't remove this comment-- */
 /* *INDENT-ON* */
 
+#ifndef _WIN32
+// These aren't with the automatically generated prototypes as we'd lose the
+// enclosing macros.
+static bool start_threaded_benchmark(
+    MMDB_s *const mmdb,
+    int const thread_count,
+    int const iterations);
+static long double get_time(void);
+static void *thread(void *arg);
+#endif
+
 int main(int argc, char **argv)
 {
     char *mmdb_file = NULL;
@@ -44,10 +70,12 @@ int main(int argc, char **argv)
     int verbose = 0;
     int iterations = 0;
     int lookup_path_length = 0;
+    int thread_count = 0;
+    char *ip_file = NULL;
 
     const char **lookup_path =
         get_options(argc, argv, &mmdb_file, &ip_address, &verbose, &iterations,
-                    &lookup_path_length);
+                    &lookup_path_length, &thread_count, &ip_file);
 
     MMDB_s mmdb = open_or_die(mmdb_file);
 
@@ -55,12 +83,43 @@ int main(int argc, char **argv)
         dump_meta(&mmdb);
     }
 
+    // The benchmarking and lookup from file modes are hidden features mainly
+    // intended for development right now. This means there are several flags
+    // that exist but are intentionally not mentioned in the usage or man page.
+
+    // The lookup from file mode may be useful to expose publicly in the usage,
+    // but we should have it respect the lookup_path functionality if we do so.
+    if (ip_file) {
+        free(lookup_path);
+        if (!lookup_from_file(&mmdb, ip_file, verbose == 1)) {
+            MMDB_close(&mmdb);
+            return 1;
+        }
+        MMDB_close(&mmdb);
+        return 0;
+    }
+
     if (0 == iterations) {
         exit(lookup_and_print(&mmdb, ip_address, lookup_path,
                               lookup_path_length));
-    } else {
-        exit(benchmark(&mmdb, iterations));
     }
+
+    free(lookup_path);
+
+    srand( time(NULL) );
+
+#ifndef _WIN32
+    if (thread_count > 0) {
+        if (!start_threaded_benchmark(&mmdb, thread_count, iterations)) {
+            MMDB_close(&mmdb);
+            exit(1);
+        }
+        MMDB_close(&mmdb);
+        exit(0);
+    }
+#endif
+
+    exit(benchmark(&mmdb, iterations));
 }
 
 LOCAL void usage(char *program, int exit_code, const char *error)
@@ -116,9 +175,16 @@ LOCAL void usage(char *program, int exit_code, const char *error)
     exit(exit_code);
 }
 
-LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
-                               char **ip_address, int *verbose, int *iterations,
-                               int *lookup_path_length)
+LOCAL const char **get_options(
+    int argc,
+    char **argv,
+    char **mmdb_file,
+    char **ip_address,
+    int *verbose,
+    int *iterations,
+    int *lookup_path_length,
+    int *const thread_count,
+    char **const ip_file)
 {
     static int help = 0;
     static int version = 0;
@@ -130,13 +196,22 @@ LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
             { "verbose",   no_argument,       0, 'v' },
             { "version",   no_argument,       0, 'n' },
             { "benchmark", required_argument, 0, 'b' },
+#ifndef _WIN32
+            { "threads",   required_argument, 0, 't' },
+#endif
+            { "ip-file",   required_argument, 0, 'I' },
             { "help",      no_argument,       0, 'h' },
             { "?",         no_argument,       0, 1   },
             { 0,           0,                 0, 0   }
         };
 
         int opt_index;
-        int opt_char = getopt_long(argc, argv, "f:i:b:vnh?", options,
+#ifdef _WIN32
+        char const * const optstring = "f:i:b:I:vnh?";
+#else
+        char const * const optstring = "f:i:b:t:I:vnh?";
+#endif
+        int opt_char = getopt_long(argc, argv, optstring, options,
                                    &opt_index);
 
         if (-1 == opt_char) {
@@ -155,6 +230,10 @@ LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
             *iterations = strtol(optarg, NULL, 10);
         } else if ('h' == opt_char || '?' == opt_char) {
             help = 1;
+        } else if (opt_char == 't') {
+            *thread_count = strtol(optarg, NULL, 10);
+        } else if (opt_char == 'I') {
+            *ip_file = optarg;
         }
     }
 
@@ -179,7 +258,7 @@ LOCAL const char **get_options(int argc, char **argv, char **mmdb_file,
         usage(program, 1, "You must provide a filename with --file");
     }
 
-    if (NULL == *ip_address && *iterations == 0) {
+    if (*ip_address == NULL && *iterations == 0 && !*ip_file) {
         usage(program, 1, "You must provide an IP address with --ip");
     }
 
@@ -229,8 +308,8 @@ LOCAL void dump_meta(MMDB_s *mmdb)
                             "    Languages:     ";
 
     char date[40];
-    strftime(date, 40, "%F %T UTC",
-             gmtime((const time_t *)&mmdb->metadata.build_epoch));
+    const time_t epoch = (const time_t)mmdb->metadata.build_epoch;
+    strftime(date, 40, "%F %T UTC", gmtime(&epoch));
 
     fprintf(stdout, meta_dump,
             mmdb->metadata.node_count,
@@ -259,6 +338,109 @@ LOCAL void dump_meta(MMDB_s *mmdb)
     fprintf(stdout, "\n");
 }
 
+// The input file should have one IP per line.
+//
+// We look up each IP.
+//
+// If dump is true, we dump the data for each IP to stderr. This is useful for
+// comparison in that you can dump out the data for the IPs before and after
+// making changes. It goes to stderr rather than stdout so that the report does
+// not get included in what you will compare (since it will almost always be
+// different).
+//
+// In addition to being useful for comparisons, this function provides a way to
+// have a more deterministic set of lookups for benchmarking.
+LOCAL bool lookup_from_file(MMDB_s *const mmdb,
+                            char const *const ip_file,
+                            bool const dump)
+{
+    FILE *const fh = fopen(ip_file, "r");
+    if (!fh) {
+        fprintf(stderr, "fopen(): %s: %s\n", ip_file, strerror(errno));
+        return false;
+    }
+
+    clock_t const clock_start = clock();
+    char buf[1024] = { 0 };
+    // I'd normally use uint64_t, but support for it is optional in C99.
+    unsigned long long i = 0;
+    while (1) {
+        if (fgets(buf, sizeof(buf), fh) == NULL) {
+            if (!feof(fh)) {
+                fprintf(stderr, "fgets(): %s\n", strerror(errno));
+                fclose(fh);
+                return false;
+            }
+            if (fclose(fh) != 0) {
+                fprintf(stderr, "fclose(): %s\n", strerror(errno));
+                return false;
+            }
+            break;
+        }
+
+        char *ptr = buf;
+        while (*ptr != '\0') {
+            if (*ptr == '\n') {
+                *ptr = '\0';
+                break;
+            }
+            ptr++;
+        }
+        if (strlen(buf) == 0) {
+            continue;
+        }
+
+        i++;
+
+        MMDB_lookup_result_s result = lookup_or_die(mmdb, buf);
+        if (!result.found_entry) {
+            continue;
+        }
+
+        MMDB_entry_data_list_s *entry_data_list = NULL;
+        int const status = MMDB_get_entry_data_list(&result.entry,
+                                                    &entry_data_list);
+        if (status != MMDB_SUCCESS) {
+            fprintf(stderr, "MMDB_get_entry_data_list(): %s\n",
+                    MMDB_strerror(status));
+            fclose(fh);
+            MMDB_free_entry_data_list(entry_data_list);
+            return false;
+        }
+
+        if (!entry_data_list) {
+            fprintf(stderr, "entry_data_list is NULL\n");
+            fclose(fh);
+            return false;
+        }
+
+        if (dump) {
+            fprintf(stdout, "%s:\n", buf);
+            int const status = MMDB_dump_entry_data_list(stderr,
+                                                         entry_data_list, 0);
+            if (status != MMDB_SUCCESS) {
+                fprintf(stderr, "MMDB_dump_entry_data_list(): %s\n",
+                        MMDB_strerror(status));
+                fclose(fh);
+                MMDB_free_entry_data_list(entry_data_list);
+                return false;
+            }
+        }
+
+        MMDB_free_entry_data_list(entry_data_list);
+    }
+
+    clock_t const clock_diff = clock() - clock_start;
+    double const seconds = (double)clock_diff / CLOCKS_PER_SEC;
+
+    fprintf(
+        stdout,
+        "Looked up %llu addresses in %.2f seconds. %.2f lookups per second.\n",
+        i, seconds, i / seconds);
+
+    return true;
+}
+
 LOCAL int lookup_and_print(MMDB_s *mmdb, const char *ip_address,
                            const char **lookup_path,
                            int lookup_path_length)
@@ -324,7 +506,6 @@ LOCAL int benchmark(MMDB_s *mmdb, int iterations)
     char ip_address[16];
     int exit_code = 0;
 
-    srand( time(NULL) );
     clock_t time = clock();
 
     for (int i = 0; i < iterations; i++) {
@@ -395,3 +576,140 @@ LOCAL void random_ipv4(char *ip)
     snprintf(ip, 16, "%u.%u.%u.%u",
              *bytes, *(bytes + 1), *(bytes + 2), *(bytes + 3));
 }
+
+#ifndef _WIN32
+struct thread_info {
+    pthread_t id;
+    int num;
+    MMDB_s *mmdb;
+    int iterations;
+};
+
+NO_PROTO static bool start_threaded_benchmark(
+    MMDB_s *const mmdb,
+    int const thread_count,
+    int const iterations)
+{
+    struct thread_info *const tinfo = calloc(thread_count,
+                                             sizeof(struct thread_info));
+    if (!tinfo) {
+        fprintf(stderr, "calloc(): %s\n", strerror(errno));
+        return false;
+    }
+
+    // Using clock() isn't appropriate for multiple threads. It's CPU time, not
+    // wall time.
+    long double const start_time = get_time();
+    if (start_time == -1) {
+        return false;
+    }
+
+    for (int i = 0; i < thread_count; i++) {
+        tinfo[i].num = i;
+        tinfo[i].mmdb = mmdb;
+        tinfo[i].iterations = iterations;
+
+        if (pthread_create(&tinfo[i].id, NULL, &thread, &tinfo[i]) != 0) {
+            fprintf(stderr, "pthread_create() failed\n");
+            free(tinfo);
+            return false;
+        }
+    }
+
+    for (int i = 0; i < thread_count; i++) {
+        if (pthread_join(tinfo[i].id, NULL) != 0) {
+            fprintf(stderr, "pthread_join() failed\n");
+            free(tinfo);
+            return false;
+        }
+    }
+
+    free(tinfo);
+
+    long double const end_time = get_time();
+    if (end_time == -1) {
+        return false;
+    }
+
+    long double const elapsed = end_time - start_time;
+    unsigned long long const total_ips = iterations * thread_count;
+    long double rate = total_ips;
+    if (elapsed != 0) {
+        rate = total_ips / elapsed;
+    }
+
+    fprintf(
+        stdout,
+        "Looked up %llu addresses using %d threads in %.2Lf seconds. %.2Lf lookups per second.\n",
+        total_ips, thread_count, elapsed, rate);
+
+    return true;
+}
+
+NO_PROTO static long double get_time(void)
+{
+    // clock_gettime() is not present on OSX until 10.12.
+#ifdef HAVE_CLOCK_GETTIME
+    struct timespec tp = {
+        .tv_sec  = 0,
+        .tv_nsec = 0,
+    };
+    clockid_t clk_id = CLOCK_REALTIME;
+#ifdef _POSIX_MONOTONIC_CLOCK
+    clk_id = CLOCK_MONOTONIC;
+#endif
+    if (clock_gettime(clk_id, &tp) != 0) {
+        fprintf(stderr, "clock_gettime(): %s\n", strerror(errno));
+        return -1;
+    }
+    return tp.tv_sec + ((float)tp.tv_nsec / 1e9);
+#else
+    time_t t = time(NULL);
+    if (t == (time_t)-1) {
+        fprintf(stderr, "time(): %s\n", strerror(errno));
+        return -1;
+    }
+    return (long double)t;
+#endif
+}
+
+NO_PROTO static void *thread(void *arg)
+{
+    const struct thread_info *const tinfo = arg;
+    if (!tinfo) {
+        fprintf(stderr, "thread(): %s\n", strerror(EINVAL));
+        return NULL;
+    }
+
+    char ip_address[16] = { 0 };
+
+    for (int i = 0; i < tinfo->iterations; i++) {
+        memset(ip_address, 0, 16);
+        random_ipv4(ip_address);
+
+        MMDB_lookup_result_s result = lookup_or_die(tinfo->mmdb, ip_address);
+        if (!result.found_entry) {
+            continue;
+        }
+
+        MMDB_entry_data_list_s *entry_data_list = NULL;
+        int const status = MMDB_get_entry_data_list(&result.entry,
+                                                    &entry_data_list);
+        if (status != MMDB_SUCCESS) {
+            fprintf(stderr, "MMDB_get_entry_data_list(): %s\n",
+                    MMDB_strerror(status));
+            MMDB_free_entry_data_list(entry_data_list);
+            return NULL;
+        }
+
+        if (!entry_data_list) {
+            fprintf(stderr, "entry_data_list is NULL\n");
+            return NULL;
+        }
+
+        MMDB_free_entry_data_list(entry_data_list);
+    }
+
+    return NULL;
+}
+#endif