Update libsniper to 1.3.1 (#5694)

frameworks/C++/libsniper/libsniper.dockerfile

@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -qq -y update
 
-RUN apt-get -qq -y install --no-install-recommends git cmake libev-dev libgoogle-perftools-dev libfmt-dev make gcc-9 g++-9 libre2-dev libboost-stacktrace-dev
+RUN apt-get -qq -y install --no-install-recommends git cmake libev-dev libgoogle-perftools-dev libfmt-dev make gcc-9 g++-9 libre2-dev libboost-stacktrace-dev libhttp-parser-dev libxxhash-dev
 
 RUN   update-alternatives --quiet --remove-all gcc \
     ; update-alternatives --quiet --remove-all g++ \
@@ -27,11 +27,11 @@ WORKDIR /libsniper_bench
 
 RUN git config --global http.sslverify false
 
-ENV LIBSNIPER_VER v1.2.0
+ENV LIBSNIPER_VER v1.3.1
 
 RUN git clone https://github.com/rtbtech/libsniper.git libs/core
 
-RUN cd libs/core && git checkout v1.2.0
+RUN cd libs/core && git checkout v1.3.1
 
 RUN mkdir build && cd /libsniper_bench/build && cmake -DCMAKE_BUILD_TYPE=Release -S .. && make --jobs=`nproc`
 

frameworks/C++/libsniper/libsniper_bench/CMakeLists.txt

@@ -22,14 +22,11 @@ set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 find_package(Boost REQUIRED)
 find_package(Threads REQUIRED)
-find_package(fmt REQUIRED)
 find_package(TCMalloc REQUIRED)
-find_package(Libev REQUIRED)
-find_package(Libre2 REQUIRED)
 
 include_directories(SYSTEM ${BOOST_INCLUDE_DIRS})
 
-set(libsniper "std" "log" "cache" "xxhash" "net" "strings" "pico" "http" "event")
+set(RTBTECH_DEPS "http")
 
 add_subdirectory(libs)
 add_subdirectory(src)

frameworks/C++/libsniper/libsniper_bench/cmake/FindLibev.cmake

@@ -1,22 +0,0 @@
-FIND_PATH(LIBEV_INCLUDE_DIR ev.h /usr/local/include /opt/local/include /usr/include)
-FIND_LIBRARY(LIBEV_LIBRARY NAMES libev.a PATH /usr/local/lib /opt/local/lib /usr/lib)
-
-IF (LIBEV_INCLUDE_DIR AND LIBEV_LIBRARY)
-    SET(LIBEV_FOUND TRUE)
-ENDIF ()
-
-IF (LIBEV_FOUND)
-    IF (NOT Libev_FIND_QUIETLY)
-        MESSAGE(STATUS "Found libev: ${LIBEV_LIBRARY}")
-    ENDIF ()
-ELSE()
-    IF (Libev_FIND_REQUIRED)
-        IF(NOT LIBEV_INCLUDE_DIR)
-            MESSAGE(FATAL_ERROR "Could not find libev header file!")
-        ENDIF()
-
-        IF(NOT LIBEV_LIBRARY)
-            MESSAGE(FATAL_ERROR "Could not find libev library file!")
-        ENDIF()
-    ENDIF ()
-ENDIF ()

frameworks/C++/libsniper/libsniper_bench/cmake/FindLibre2.cmake

@@ -1,22 +0,0 @@
-FIND_PATH(LIBRE2_INCLUDE_DIR re2/re2.h /usr/local/include /opt/local/include /usr/include)
-FIND_LIBRARY(LIBRE2_LIBRARY NAMES libre2.a PATH /usr/local/lib /opt/local/lib /usr/lib)
-
-IF (LIBRE2_INCLUDE_DIR AND LIBRE2_LIBRARY)
-    SET(LIBRE2_FOUND TRUE)
-ENDIF ()
-
-IF (LIBRE2_FOUND)
-    IF (NOT Libre2_FIND_QUIETLY)
-        MESSAGE(STATUS "Found libre2: ${LIBRE2_LIBRARY}")
-    ENDIF ()
-ELSE()
-    IF (Libre2_FIND_REQUIRED)
-        IF(NOT LIBRE2_INCLUDE_DIR)
-            MESSAGE(FATAL_ERROR "Could not find libre2 header file!")
-        ENDIF()
-
-        IF(NOT LIBRE2_LIBRARY)
-            MESSAGE(FATAL_ERROR "Could not find libre2 library file!")
-        ENDIF()
-    ENDIF ()
-ENDIF ()

frameworks/C++/libsniper/libsniper_bench/src/CMakeLists.txt

@@ -4,10 +4,7 @@ include_directories(${SNIPER_INCLUDE_DIRS})
 set(PROJECT_LIBS
         ${CMAKE_THREAD_LIBS_INIT}
         ${BOOST_LIBRARIES}
-        dl ${LIBRE2_LIBRARY}
-        ${LIBEV_LIBRARY}
         backtrace dl
-        fmt::fmt
         stdc++fs.a
         tcmalloc
         )