删除libevent对openssl的依赖,目前仅用libevent的超时机制,禁用ssl部分功能;添加gtest_sapp.inf

5 files changed, 29 insertions, 20 deletions

diff --git a/.gitmodules b/.gitmodules
index e3578c5..ff481af 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "test/sapp_module_test"]
 	path = test/sapp_module_test
 	url = https://lijia:[email protected]/Alpha_lib/sapp_module_test.git
-	
-[submodule "test/banchmark_pcap"]
-	path = test/banchmark_pcap
+[submodule "test/benchmark_pcap"]
+	path = test/benchmark_pcap
 	url = https://lijia:[email protected]/public_resources/benchmark_pcap.git
diff --git a/bin/plug/business/gtest_sapp/gtest_sapp.inf b/bin/plug/business/gtest_sapp/gtest_sapp.inf
new file mode 100644
index 0000000..9d2e8f8
--- /dev/null
+++ b/bin/plug/business/gtest_sapp/gtest_sapp.inf
@@ -0,0 +1,8 @@
+[PLUGINFO]
+PLUGNAME=gtest
+SO_PATH=./plug/business/gtest_sapp/libgtest_sapp.so
+INIT_FUNC=gtest_sapp_slave_init
+
+[TCP_ALL]
+FUNC_FLAG=ALL
+FUNC_NAME=timer_tcpall_entry
diff --git a/test/benchmark_pcap b/test/benchmark_pcap
new file mode 160000
+Subproject e5cd557cd19e409f5cf42806b5f848c29eebcb5
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index 91f6800..1667a12 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -15,23 +15,6 @@ set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib64/libgte
 set_property(TARGET gtest PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
 set_property(TARGET gtest PROPERTY INTERFACE_LINK_LIBRARIES pthread)
 
-#### open ssl
-ExternalProject_Add(openssl PREFIX openssl
-        URL ${CMAKE_SOURCE_DIR}/vendor/openssl-OpenSSL_1_1_1b.zip
-        URL_MD5 6ceb7d73cb61c4c264b3065b29ce8f2c
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND make
-        INSTALL_COMMAND ""
-        BUILD_IN_SOURCE 1)
-
-ExternalProject_Get_Property(openssl SOURCE_DIR)
-set(HIREDIS_INCLUDE_DIRECTORIES ${SOURCE_DIR})
-file(MAKE_DIRECTORY ${HIREDIS_INCLUDE_DIRECTORIES})
-
-add_library(openssl-static STATIC IMPORTED GLOBAL)
-set_property(TARGET openssl-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/libopenssl.a)
-set_property(TARGET openssl-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR})
-
 
 #### libevent
 ExternalProject_Add(libevent PREFIX libevent
diff --git a/version.txt b/version.txt
new file mode 100644
index 0000000..99dc721
--- /dev/null
+++ b/version.txt
@@ -0,0 +1,19 @@
+# Generated by autorevision - do not hand-hack!
+
+VCS_TYPE="git"
+VCS_BASENAME="sapp_v4.0_20190711"
+VCS_UUID="efa070923d8398b49f41acda82b839d11eb75230"
+VCS_NUM="113"
+VCS_DATE="2019-06-06T18:04:03+0800"
+VCS_BRANCH="sapp_v4.0_develop"
+VCS_TAG="parallel"
+VCS_TICK="24"
+VCS_EXTRA=""
+
+VCS_ACTION_STAMP=""
+VCS_FULL_HASH="e0fc7d67d95a9d6f2a59bbf648b4a7ba38a85ad7"
+VCS_SHORT_HASH="e0fc7d6"
+
+VCS_WC_MODIFIED="1"
+
+# end