quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jianq...@apache.org
Subject incubator-quickstep git commit: Fixed the build issues regarding tmb benchmark.
Date Wed, 20 Jun 2018 03:45:29 GMT
Repository: incubator-quickstep
Updated Branches:
  refs/heads/master 97bef178f -> e36fc7497


Fixed the build issues regarding tmb benchmark.


Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/e36fc749
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/e36fc749
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/e36fc749

Branch: refs/heads/master
Commit: e36fc7497fb63cadff7bcb3e30f42a3c94a087e2
Parents: 97bef17
Author: Zuyu Zhang <zuyu@cs.wisc.edu>
Authored: Mon Jun 18 20:18:26 2018 -0500
Committer: Zuyu Zhang <zuyu@cs.wisc.edu>
Committed: Mon Jun 18 20:20:22 2018 -0500

----------------------------------------------------------------------
 third_party/src/tmb/benchmarks/CMakeLists.txt   | 16 ++++++++--------
 third_party/src/tmb/benchmarks/src/bus_setup.cc |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/e36fc749/third_party/src/tmb/benchmarks/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/third_party/src/tmb/benchmarks/CMakeLists.txt b/third_party/src/tmb/benchmarks/CMakeLists.txt
index cec8fd8..d215489 100644
--- a/third_party/src/tmb/benchmarks/CMakeLists.txt
+++ b/third_party/src/tmb/benchmarks/CMakeLists.txt
@@ -109,32 +109,32 @@ target_link_libraries(tmbbench
 add_executable(oneway_throughput src/oneway_throughput.cc)
 target_link_libraries(oneway_throughput
                       gflags_nothreads-static
-                      tcmalloc_minimal
                       tmb
-                      tmbbench)
+                      tmbbench
+                      ${LIBS})
 
 add_executable(oneway_throughput_numa src/oneway_throughput_numa.cc)
 target_link_libraries(oneway_throughput_numa
                       gflags_nothreads-static
-                      tcmalloc_minimal
                       tmb
-                      tmbbench)
+                      tmbbench
+                      ${LIBS})
 
 add_executable(oneway_throughput_distributed
                src/oneway_throughput_distributed.cc)
 target_link_libraries(oneway_throughput_distributed
                       gflags_nothreads-static
-                      tcmalloc_minimal
                       tmb
-                      tmbbench)
+                      tmbbench
+                      ${LIBS})
 
 add_executable(oneway_throughput_distributed_coordinator
                src/oneway_throughput_distributed_coordinator.cc)
 target_link_libraries(oneway_throughput_distributed_coordinator
                       gflags_nothreads-static
-                      tcmalloc_minimal
                       tmb
-                      tmbbench)
+                      tmbbench
+                      ${LIBS})
 
 add_executable(reset_bus src/reset_bus.cc)
 target_link_libraries(reset_bus

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/e36fc749/third_party/src/tmb/benchmarks/src/bus_setup.cc
----------------------------------------------------------------------
diff --git a/third_party/src/tmb/benchmarks/src/bus_setup.cc b/third_party/src/tmb/benchmarks/src/bus_setup.cc
index 8e4c223..205f8e3 100644
--- a/third_party/src/tmb/benchmarks/src/bus_setup.cc
+++ b/third_party/src/tmb/benchmarks/src/bus_setup.cc
@@ -96,7 +96,6 @@ DEFINE_string(servers, "",
               "specifies a comma-separated list of servers to connect to, "
               "each of which is given in HOSTNAME:PORT or IP:PORT format. "
               "Has no effect for other TMB implementations.");
-#endif
 
 namespace {
 
@@ -153,6 +152,7 @@ bool ParseServersString(const std::string &servers_string,
 }
 
 }  // namespace
+#endif
 
 tmb::MessageBus* CreateBus(const bool delete_messages_immediately) {
 #ifdef TMB_MEMORYMIRROR_ENABLED


Mime
View raw message