tools: wrk update to 5b2fa06

tools/wrk/.gitignore

@@ -1,2 +1,14 @@
-obj/*
-/wrk
+*.o
+*.a
+wrk
+deps/luajit/src/host/buildvm
+deps/luajit/src/host/buildvm_arch.h
+deps/luajit/src/host/minilua
+deps/luajit/src/jit/vmdef.lua
+deps/luajit/src/lj_bcdef.h
+deps/luajit/src/lj_ffdef.h
+deps/luajit/src/lj_folddef.h
+deps/luajit/src/lj_libdef.h
+deps/luajit/src/lj_recdef.h
+deps/luajit/src/lj_vm.s
+deps/luajit/src/luajit

tools/wrk/Makefile

@@ -1,35 +1,64 @@
-CFLAGS  := -std=c99 -Wall -O2 -pthread
-LDFLAGS := -pthread
-LIBS    := -lm
-ifeq ($(shell uname),SunOS)
-LIBS    += -lnsl -lsocket -lresolv
+CFLAGS  := -std=c99 -Wall -O2 -D_REENTRANT
+LIBS    := -lpthread -lm -lcrypto -lssl
+
+TARGET  := $(shell uname -s | tr [A-Z] [a-z] 2>/dev/null || echo unknown)
+
+ifeq ($(TARGET), sunos)
+	CFLAGS += -D_PTHREADS -D_POSIX_C_SOURCE=200112L
+	LIBS   += -lsocket
+else ifeq ($(TARGET), darwin)
+	LDFLAGS += -pagezero_size 10000 -image_base 100000000
+else ifeq ($(TARGET), linux)
+	LIBS    += -ldl
+	LDFLAGS += -Wl,-E
+else ifeq ($(TARGET), freebsd)
+	CFLAGS  += -D_DECLARE_C99_LDBL_MATH
+	LDFLAGS += -Wl,-E
 endif
 
-SRC  := wrk.c aprintf.c stats.c units.c ae.c zmalloc.c http_parser.c tinymt64.c
+SRC  := wrk.c net.c ssl.c aprintf.c stats.c script.c units.c \
+		ae.c zmalloc.c http_parser.c tinymt64.c
 BIN  := wrk
 
 ODIR := obj
-OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC))
+OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o
+
+LDIR     = deps/luajit/src
+LIBS    := -lluajit $(LIBS)
+CFLAGS  += -I $(LDIR)
+LDFLAGS += -L $(LDIR)
 
 all: $(BIN)
 
 clean:
 	$(RM) $(BIN) obj/*
+	@$(MAKE) -C deps/luajit clean
 
 $(BIN): $(OBJ)
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+	@echo LINK $(BIN)
+	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
-$(OBJ): config.h Makefile | $(ODIR)
+$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR)
 
 $(ODIR):
-	@mkdir $@
+	@mkdir -p $@
+
+$(ODIR)/bytecode.o: src/wrk.lua
+	@echo LUAJIT $<
+	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@'
 
 $(ODIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+	@echo CC $<
+	@$(CC) $(CFLAGS) -c -o $@ $<
+
+$(LDIR)/libluajit.a:
+	@echo Building LuaJIT...
+	@$(MAKE) -C $(LDIR) BUILDMODE=static
 
 .PHONY: all clean
 .SUFFIXES:
-.SUFFIXES: .c .o
+.SUFFIXES: .c .o .lua
 
-vpath %.c src
-vpath %.h src
+vpath %.c   src
+vpath %.h   src
+vpath %.lua scripts

tools/wrk/NOTICE

@@ -14,7 +14,9 @@ This product includes software developed by Salvatore Sanfilippo and
 other contributors to the redis project.
 
 Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
 Copyright (C) 2009 Harish Mallipeddi - [email protected]
+Copyright (c) 2012, Joyent, Inc. All rights reserved.
 
 Copyright (c) 2006-2009, Salvatore Sanfilippo
 All rights reserved.
@@ -79,6 +81,32 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+=========================================================================
+==  LuaJIT Notice                                                      ==
+=========================================================================
+
+LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
+
+Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
 =========================================================================
 ==  Tiny Mersenne Twister (TinyMT) Notice                              ==
 =========================================================================

tools/wrk/README

@@ -4,23 +4,85 @@ wrk - a HTTP benchmarking tool
   load when run on a single multi-core CPU. It combines a multithreaded
   design with scalable event notification systems such as epoll and kqueue.
 
+  An optional LuaJIT script can perform HTTP request generation, response
+  processing, and custom reporting. Several example scripts are located in
+  scripts/
+
 Basic Usage
 
-  wrk -t8 -c400 -r10m http://localhost:8080/index.html
+  wrk -t12 -c400 -d30s http://127.0.0.1:8080/index.html
 
-  This runs wrk with 8 threads, keeping 400 connections open, and making a
-  total of 10 million HTTP GET requests to http://localhost:8080/index.html
+  This runs a benchmark for 30 seconds, using 12 threads, and keeping
+  400 HTTP connections open.
 
   Output:
 
-  Making 10000000 requests to http://localhost:8080/index.html
-    8 threads and 400 connections
+  Running 30s test @ http://127.0.0.1:8080/index.html
+    12 threads and 400 connections
     Thread Stats   Avg      Stdev     Max   +/- Stdev
-      Latency   439.75us  350.49us   7.60ms   92.88%
-      Req/Sec    61.13k     8.26k   72.00k    87.54%
-    10000088 requests in 19.87s, 3.42GB read
-  Requests/sec: 503396.23
-  Transfer/sec:    176.16MB
+      Latency   635.91us    0.89ms  12.92ms   93.69%
+      Req/Sec    56.20k     8.07k   62.00k    86.54%
+    22464657 requests in 30.00s, 17.76GB read
+  Requests/sec: 748868.53
+  Transfer/sec:    606.33MB
+
+Scripting
+
+  wrk's public Lua API is:
+
+    init     = function(args)
+    request  = function()
+    response = function(status, headers, body)
+    done     = function(summary, latency, requests)
+
+    wrk = {
+      scheme  = "http",
+      host    = "localhost",
+      port    = nil,
+      method  = "GET",
+      path    = "/",
+      headers = {},
+      body    = nil
+    }
+
+    function wrk.format(method, path, headers, body)
+
+      wrk.format returns a HTTP request string containing the passed
+      parameters merged with values from the wrk table.
+
+    global init     -- function called when the thread is initialized
+    global request  -- function returning the HTTP message for each request
+    global response -- optional function called with HTTP response data
+    global done     -- optional function called with results of run
+
+  The init() function receives any extra command line arguments for the
+  script. Script arguments must be separated from wrk arguments with "--"
+  and scripts that override init() but not request() must call wrk.init()
+
+  The done() function receives a table containing result data, and two
+  statistics objects representing the sampled per-request latency and
+  per-thread request rate. Duration and latency are microsecond values
+  and rate is measured in requests per second.
+
+    latency.min              -- minimum value seen
+    latency.max              -- maximum value seen
+    latency.mean             -- average value seen
+    latency.stdev            -- standard deviation
+    latency:percentile(99.0) -- 99th percentile value
+    latency[i]               -- raw sample value
+
+    summary = {
+      duration = N,  -- run duration in microseconds
+      requests = N,  -- total completed requests
+      bytes    = N,  -- total bytes received
+      errors   = {
+        connect = N, -- total socket connection errors
+        read    = N, -- total socket read errors
+        write   = N, -- total socket write errors
+        status  = N, -- total HTTP status codes > 399
+        timeout = N  -- total request timeouts
+      }
+    }
 
 Benchmarking Tips
 
@@ -29,9 +91,16 @@ Benchmarking Tips
   initial connection burst the server's listen(2) backlog should be greater
   than the number of concurrent connections being tested.
 
+  A user script that only changes the HTTP method, path, adds headers or
+  a body, will have no performance impact. If multiple HTTP requests are
+  necessary they should be pre-generated and returned via a quick lookup in
+  the request() call. Per-request actions, particularly building a new HTTP
+  request, and use of response() will necessarily reduce the amount of load
+  that can be generated.
+
 Acknowledgements
 
   wrk contains code from a number of open source projects including the
-  'ae' event loop from redis, the nginx/joyent/node.js 'http-parser' and
-  the Tiny Mersenne Twister PRNG. Please consult the NOTICE file for
-  licensing details.
+  'ae' event loop from redis, the nginx/joyent/node.js 'http-parser',
+  Mike Pall's LuaJIT, and the Tiny Mersenne Twister PRNG. Please consult
+  the NOTICE file for licensing details.

tools/wrk/deps/luajit/COPYRIGHT

@@ -0,0 +1,56 @@
+===============================================================================
+LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
+
+Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+[ MIT license: http://www.opensource.org/licenses/mit-license.php ]
+
+===============================================================================
+[ LuaJIT includes code from Lua 5.1/5.2, which has this license statement: ]
+
+Copyright (C) 1994-2012 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===============================================================================
+[ LuaJIT includes code from dlmalloc, which has this license statement: ]
+
+This is a version (aka dlmalloc) of malloc/free/realloc written by
+Doug Lea and released to the public domain, as explained at
+http://creativecommons.org/licenses/publicdomain
+
+===============================================================================