Misc

.gitignore

@@ -21,6 +21,7 @@ test/test.xcodeproj/*/xcuser*
 test/*.o
 test/*.pem
 test/*.srl
+work/
 benchmark/server
 benchmark/server-crow
 

benchmark/Makefile

@@ -1,28 +1,36 @@
 CXXFLAGS = -std=c++11 -O2 -I..
 
 THEAD_POOL_COUNT = 16
-BENCH_FLAGS = -c 8 -d 5s
+
+BENCH_CMD = bombardier -c 8 -d 5s localhost:8080
+# BENCH_CMD = wrk -d 5s http://localhost:8080
 
 # cpp-httplib
 bench: server
-	@./server & export PID=$$!; bombardier $(BENCH_FLAGS) localhost:8080; kill $${PID}
-
-server : cpp-httplib/main.cpp ../httplib.h
-	g++ -o $@ $(CXXFLAGS) -DCPPHTTPLIB_THREAD_POOL_COUNT=$(THEAD_POOL_COUNT) cpp-httplib/main.cpp
+	@./server & export PID=$$!; $(BENCH_CMD); kill $${PID}
 
 run : server
 	@./server
 
+server : cpp-httplib/main.cpp ../httplib.h
+	g++ -o $@ $(CXXFLAGS) -DCPPHTTPLIB_THREAD_POOL_COUNT=$(THEAD_POOL_COUNT) cpp-httplib/main.cpp
+
 # crow
+bench-crow: server-crow
+	@./server-crow & export PID=$$!; $(BENCH_CMD); kill $${PID}
+
+run-crow : server-crow
+	@./server-crow
+
 server-crow : crow/main.cpp
 	g++ -o $@ $(CXXFLAGS) crow/main.cpp
 
-bench-crow: server-crow
-	@./server-crow & export PID=$$!; bombardier $(BENCH_FLAGS) localhost:8080; kill $${PID}
-
 # flask
 bench-flask:
-	@FLASK_APP=flask/main.py flask run --port=8080 & export PID=$$!; bombardier $(BENCH_FLAGS) localhost:8080; kill $${PID}
+	@FLASK_APP=flask/main.py flask run --port=8080 & export PID=$$!; $(BENCH_CMD); kill $${PID}
+
+run-flask:
+	@FLASK_APP=flask/main.py flask run --port=8080
 
 # misc
 bench-all: bench bench-crow bench-flask