Merge pull request #40 from lightstep/jmacd/makefile_parallelism

Fix Makefile parallelism; Fix two benchmark client bugs

Author: jmacd

configure.ac

@@ -4,7 +4,7 @@
 # by homebrew, see the commands to set PKG_CONFIG_PATH in build.sh.
 
 AC_PREREQ([2.69])
-AC_INIT([lightstep-tracer-cpp], [0.33],
+AC_INIT([lightstep-tracer-cpp], [0.34],
         [https://github.com/lightstep/lightstep-tracer-cpp/issues])
 LT_INIT([disable-shared])
 AM_INIT_AUTOMAKE([1.14 foreign subdir-objects])

src/c++11/Makefile.am

@@ -9,7 +9,7 @@ PROTOC = @PROTOC@
 # Lightstep Collector reporting:
 COLLECTOR_SRC = $(top_srcdir)/lightstep-tracer-common
 ENVOY_SRC = ./envoy
-PROTO_DIR = proto
+PROTO_DIR = ./proto
 
 PROTO_SRC = \
 	$(COLLECTOR_SRC)/collector.proto \
@@ -18,14 +18,17 @@ PROTO_SRC = \
 PROTO_GEN = \
 	lightstep/collector.pb.h \
 	lightstep/envoy_carrier.pb.h \
-	proto/collector.pb.cc \
-	proto/envoy_carrier.pb.cc
+	$(PROTO_DIR)/collector.pb.cc \
+	$(PROTO_DIR)/envoy_carrier.pb.cc
 
-$(PROTO_GEN): $(PROTO_SRC) $(PROTOC)
+$(PROTO_DIR).stamp: $(PROTO_SRC)
 	mkdir -p $(PROTO_DIR)
 	$(PROTOC) --proto_path=$(COLLECTOR_SRC) --cpp_out=$(PROTO_DIR) $(COLLECTOR_SRC)/collector.proto
 	$(PROTOC) --proto_path=$(ENVOY_SRC) --cpp_out=$(PROTO_DIR) $(ENVOY_SRC)/envoy_carrier.proto
-	mv proto/*.h lightstep
+	mv $(PROTO_DIR)/*.h lightstep
+	touch $(PROTO_DIR).stamp
+
+$(PROTO_GEN): $(PROTO_DIR).stamp
 
 # Tell Automake that these files have to be generated first (also cleaned)
 BUILT_SOURCES = $(PROTO_GEN)
@@ -58,8 +61,8 @@ nobase_nodist_include_HEADERS = \
 	lightstep/envoy_carrier.pb.h
 
 nodist_liblightstep_core_cxx11_la_SOURCES = \
-	proto/collector.pb.cc \
-	proto/envoy_carrier.pb.cc
+	$(PROTO_DIR)/collector.pb.cc \
+	$(PROTO_DIR)/envoy_carrier.pb.cc
 
 # Note: To set the protobuf library include and library flags, e.g.,
 #
@@ -81,20 +84,25 @@ EXTRA_DIST = \
 #   ./configure --disable-grpc
 if ENABLE_GRPC
 
-BUILT_SOURCES += $(GRPC_PROTO_GEN)
-CLEANFILES    += $(GRPC_PROTO_GEN)
-
 GRPC_PROTO_SRC = \
 	$(COLLECTOR_SRC)/collector.proto
 
 GRPC_PROTO_GEN = \
 	lightstep/collector.grpc.pb.h \
-	proto/collector.grpc.pb.cc
+	$(PROTO_DIR)/collector.grpc.pb.cc
 
-$(GRPC_PROTO_GEN): $(GRPC_PROTO_SRC) $(PROTOC)
+BUILT_SOURCES += $(GRPC_PROTO_GEN)
+CLEANFILES    += $(GRPC_PROTO_GEN)
+
+# TODO make grpc_cpp_plugin a configure option
+#
+$(PROTO_DIR).grpc.stamp: $(GRPC_PROTO_SRC)
 	mkdir -p $(PROTO_DIR)
 	$(PROTOC) --proto_path=$(COLLECTOR_SRC) --grpc_out=$(PROTO_DIR) --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` $(COLLECTOR_SRC)/collector.proto
-	mv proto/*.h lightstep
+	mv $(PROTO_DIR)/*.h lightstep
+	touch $(PROTO_DIR).grpc.stamp
+
+$(GRPC_PROTO_GEN): $(PROTO_DIR).grpc.stamp
 
 # LightStep gRPC recorder library
 lib_LTLIBRARIES += liblightstep_grpc_cxx11.la
@@ -106,7 +114,7 @@ nobase_nodist_include_HEADERS += \
 	lightstep/collector.grpc.pb.h
 
 nodist_liblightstep_grpc_cxx11_la_SOURCES = \
-	proto/collector.grpc.pb.cc
+	$(PROTO_DIR)/collector.grpc.pb.cc
 
 # Note $(grpc_LIBS)++ shenanigans. The grpc C++ pkg-config input (grpc++.pc) uses
 # characters that are invalid to autoconf, so we can't find it.  Instead, we locate

test/c++11/cppclient.cc

@@ -121,7 +121,7 @@ void Test::test_body(const lightstep::Tracer& tracer,
   auto logn      = static_cast<uint64_t>(control["NumLogs"].number_value());
   auto logsz     = static_cast<uint64_t>(control["BytesPerLog"].number_value());
 
-  uint64_t sleep_debt = 0;
+  int64_t sleep_debt = 0;
 
   for (uint64_t i = 0; i < repeat; i++) {
     lightstep::Span span = tracer.StartSpan("span/test");
@@ -164,7 +164,7 @@ void Test::run_benchmark() {
     }
     lightstep::TimeStamp start = lightstep::Clock::now();
 
-    uint64_t sleep_nanos;
+    uint64_t sleep_nanos = 0;
     uint64_t answer;
     // TODO concurrency test
     test_body(tracer, control, &sleep_nanos, &answer);