Merge branch 'hdr_histograms_and_nmpa'

Conflicts: experiments/exp_percentiles.cpp include/pinba/histogram.h src/report_by_request.cpp src/report_by_timer.cpp
badoo · May 3, 2018 · 0cd6668 · 0cd6668
2 parents 290a228 + f1acbdf
commit 0cd6668
Show file tree

Hide file tree

Showing 15 changed files with 1,168 additions and 1,607 deletions.
diff --git a/experiments/Makefile.am b/experiments/Makefile.am
@@ -34,16 +34,10 @@ noinst_PROGRAMS = \
 	exp_nanomsg_connect \
 	exp_nanomsg_ticker \
 	exp_nanomsg_poller \
-	exp_percentiles \
 	exp_protobuf_nmpa \
-	exp_aggregation \
 	exp_histogram_perf \
 	#
 
-exp_aggregation_SOURCES = \
-	exp_aggregation.cpp \
-	#
-
 exp_collector_SOURCES = \
 	exp_collector.cpp \
 	#
@@ -72,15 +66,11 @@ exp_nanomsg_poller_SOURCES = \
 	exp_nanomsg_poller.cpp \
 	#
 
-exp_percentiles_SOURCES = \
-	exp_percentiles.cpp \
-	#
-
 exp_protobuf_nmpa_SOURCES = \
 	exp_protobuf_nmpa.cpp \
 	#
 
 exp_histogram_perf_SOURCES = \
 	exp_histogram_perf.cpp \
 	../hdr_histogram/hdr_histogram.c \
-	#
+	#