Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions wish/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,6 @@ add_library(wish_handler
# BoringSSL targets: ssl and crypto
target_link_libraries(wish_handler wslay event ssl crypto)

add_executable(echo_server examples/echo_server.cc)
target_link_libraries(echo_server wish_handler)

add_executable(hello_client examples/hello_client.cc)
target_link_libraries(hello_client wish_handler)

add_executable(benchmark_client examples/benchmark_client.cc)
target_link_libraries(benchmark_client wish_handler)
add_subdirectory(examples)

add_subdirectory(benchmark)
21 changes: 8 additions & 13 deletions wish/cpp/benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
add_executable(wish_echo_server
server.cc
add_executable(benchmark_client
client.cc
)
target_link_libraries(wish_echo_server
target_link_libraries(benchmark_client
wish_handler
absl::flags
absl::flags_parse
absl::log
absl::log_initialize
"$<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags>"
benchmark::benchmark
)

add_executable(wish_bench_client
client.cc
add_executable(tls_benchmark_client
tls_client.cc
)
target_link_libraries(wish_bench_client
target_link_libraries(tls_benchmark_client
wish_handler
absl::flags
absl::flags_parse
absl::log
absl::log_initialize
"$<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags>"
benchmark::benchmark
)
)
4 changes: 2 additions & 2 deletions wish/cpp/benchmark/benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import signal

BUILD_DIR = "./build"
SERVER_BINARY_NAME = "benchmark/wish_echo_server"
CLIENT_BINARY_NAME = "benchmark/wish_bench_client"
SERVER_BINARY_NAME = "examples/echo_server"
CLIENT_BINARY_NAME = "benchmark/benchmark_client"
SERVER_BINARY_PATH = os.path.join(BUILD_DIR, SERVER_BINARY_NAME)
CLIENT_BINARY_PATH = os.path.join(BUILD_DIR, CLIENT_BINARY_NAME)

Expand Down
128 changes: 0 additions & 128 deletions wish/cpp/benchmark/server.cc

This file was deleted.

File renamed without changes.
25 changes: 25 additions & 0 deletions wish/cpp/examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
add_executable(echo_server
echo_server.cc
)
target_link_libraries(echo_server
wish_handler
absl::flags
absl::flags_parse
absl::log
absl::log_initialize
"$<LINK_LIBRARY:WHOLE_ARCHIVE,absl::log_flags>"
)

add_executable(tls_echo_server
tls_echo_server.cc
)
target_link_libraries(tls_echo_server
wish_handler
)

add_executable(tls_hello_client
tls_hello_client.cc
)
target_link_libraries(tls_hello_client
wish_handler
)
Loading