finalize and merge lua scripting

Makefile

@@ -32,6 +32,7 @@ all: $(BIN)
 
 clean:
 	$(RM) $(BIN) obj/*
+	@$(MAKE) -C deps/luajit clean
 
 $(BIN): $(OBJ) $(ODIR)/bytecode.o
 	@echo LINK $(BIN)

README

@@ -4,10 +4,8 @@ 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.
 
-  This "scripted" branch of wrk includes LuaJIT and a Lua script may be
-  used to perform minor alterations to the default HTTP request or even
-  even generate a completely new HTTP request each time. The script may
-  also inspect each response and perform custom reporting.
+  An optional LuaJIT script can perform HTTP request generation, response
+  processing, and custom reporting.
 
 Basic Usage
 

src/wrk.c

@@ -581,8 +581,6 @@ static int parse_args(struct config *cfg, char **url, char **headers, int argc,
                 printf("wrk %s [%s] ", VERSION, aeGetApiName());
                 printf("Copyright (C) 2012 Will Glozer\n");
                 break;
-            case 'r':
-                fprintf(stderr, "wrk 2.0.0+ uses -d instead of -r\n");
             case 'h':
             case '?':
             case ':':

src/wrk.h

@@ -14,7 +14,7 @@
 #include "script.h"
 #include "http_parser.h"
 
-#define VERSION  "2.2.2"
+#define VERSION  "3.0.0"
 #define RECVBUF  8192
 #define SAMPLES  100000000