Merge pull request #14 from deflinhec/develop

Develop

Author: deflinhec

.dockerignore

@@ -1,14 +1,18 @@
-.git/*
-
-# Executable generated files
-build/proj/*
-build/unix*/*
-include/*
-lib/*
-bin/*
-
-# Windows generated files
-out/*
-.vs/*
-**/out/*
-**/.vs/*
+.git/*
+.vscode/*
+
+# Downloaded source files
+test/googletest-src/*
+benchmark/benchmark-src/*
+
+# Executable generated files
+build/*
+include/*
+lib/*
+bin/*
+
+# Windows generated files
+out/*
+.vs/*
+**/out/*
+**/.vs/*

.gitattributes

@@ -1,2 +1,4 @@
 # git should never touch line endings
 * -text
+
+*.sh text eol=lf

.github/workflows/tests.yml

@@ -57,12 +57,7 @@ jobs:
         shell: bash
         run: |
           cd ${GITHUB_WORKSPACE}/build
-          ctest -C Debug
-      - name: Export libraries
-        if: runner.os == 'Windows'
-        run: |
-          del build\bin\*.pdb
-          xcopy /y vcpkg\installed\${{ env.RUNVCPKG_VCPKG_TRIPLET_OUT }}\bin\*.dll build\bin\
+          ctest -C Debug --verbose
       - uses: actions/upload-artifact@v2
         with:
           name: Gsx2jsonpp-${{ matrix.os }}

.gitignore

@@ -1,4 +1,5 @@
-/build/*
-/include/*
-/lib/*
-/bin/*
+/.vscode/*
+/build/*
+/include/*
+/lib/*
+/bin/*

CMakeLists.txt

@@ -35,6 +35,7 @@ endfunction(add_sources)
 ###################################################
 
 option(${PROJECT_NAME}_BUILD_TESTS "Build tests" ON)
+option(${PROJECT_NAME}_BUILD_BENCHMARK_TESTS "Build benchmark" ON)
 
 set(SERVER_SOURCES
 	${CMAKE_CURRENT_SOURCE_DIR}/src/gsx2json.cpp
@@ -123,10 +124,20 @@ install(TARGETS ${PROJECT_NAME}
     LIBRARY DESTINATION lib
 )
 
+if (MSVC AND _VCPKG_INSTALLED_DIR)
+    install(DIRECTORY "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin/"
+            DESTINATION bin
+            FILES_MATCHING PATTERN "*.dll" )
+endif()
+
 ###################################################
 ### Testing
 ###################################################
 
+if (${PROJECT_NAME}_BUILD_BENCHMARK_TESTS)
+    add_subdirectory(benchmark)
+endif()
+
 if (${PROJECT_NAME}_BUILD_TESTS)
     enable_testing ()
     add_subdirectory(test)

README.md

@@ -45,7 +45,7 @@ In this example below I'm going to use `5000` as port, and output log file under
 
 After launched, Gsx2Jsonpp should be accessable in your browser [localhost:5000](http://localhost:5000/hi).
 
-Supervisor have been setup within the container to guarantee an auto restart after accidentially crashed.
+Supervisor have been setup within the container to guarantee an auto restart after accidentially crashed(hopefully not).
 
 ## :toolbox: Build from source
 
@@ -204,6 +204,5 @@ There are three sections to the returned data.
 
 - :white_check_mark: docker image
 
-- :white_large_square: json file lockdown
-
+- :white_large_square: md5 checksum
 

benchmark/.gitignore

@@ -0,0 +1 @@
+/benchmark-*

benchmark/CMakeLists.txt

@@ -0,0 +1,46 @@
+# Download and unpack benchmark at configure time
+configure_file(CMakeLists.txt.in benchmark-download/CMakeLists.txt)
+execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
+	RESULT_VARIABLE result
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/benchmark-download )
+if(result)
+	message(FATAL_ERROR "CMake step for benchmark failed: ${result}")
+endif()
+execute_process(COMMAND ${CMAKE_COMMAND} --build .
+	RESULT_VARIABLE result
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/benchmark-download )
+if(result)
+	message(FATAL_ERROR "Build step for benchmark failed: ${result}")
+endif()
+
+# configure Google Benchmarks
+set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "" FORCE)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/benchmark-src
+                 ${CMAKE_CURRENT_BINARY_DIR}/benchmark-build
+                 EXCLUDE_FROM_ALL)
+
+add_executable(run-benchmark
+    main.cpp
+    ${SERVER_SOURCES}
+    ${SERVER_HEADERS}
+)
+
+set_target_properties(run-benchmark PROPERTIES
+	XCODE_GENERATE_SCHEME TRUE
+	XCODE_SCHEME_WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/bin
+)
+
+target_include_directories(run-benchmark
+    PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
+    PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/benchmark-src"
+    PUBLIC "${PROJECT_SOURCE_DIR}/src"
+    PUBLIC "${PROJECT_SOURCE_DIR}/cpp-httplib"
+    PUBLIC "${PROJECT_SOURCE_DIR}/json/include"
+    PUBLIC "${PROJECT_SOURCE_DIR}/uriparser/include"
+)
+
+target_link_libraries(run-benchmark uriparser)
+target_link_libraries(run-benchmark httplib::httplib)
+target_link_libraries(run-benchmark cxxopts::cxxopts)
+target_link_libraries(run-benchmark nlohmann_json::nlohmann_json)
+target_link_libraries(run-benchmark benchmark)

benchmark/CMakeLists.txt.in

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8.2)
+
+project(benchmark-download NONE)
+
+include(ExternalProject)
+ExternalProject_Add(benchmark
+	GIT_REPOSITORY    https://github.com/google/benchmark.git
+	GIT_TAG           master
+	SOURCE_DIR        "${CMAKE_CURRENT_SOURCE_DIR}/benchmark-src"
+	BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/benchmark-build"
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND     ""
+	INSTALL_COMMAND   ""
+	TEST_COMMAND      ""
+)