diff options
| author | 彭宣正 <[email protected]> | 2020-11-23 11:01:49 +0800 |
|---|---|---|
| committer | 彭宣正 <[email protected]> | 2020-12-02 09:48:01 +0800 |
| commit | 27937cde15f39db4ef85993972cd0f2878ea1332 (patch) | |
| tree | 820001f07f5fd4144e40842993fc31fde13f9ac5 | |
| parent | 7279374664ba221f1671691903aa4ea10d35980f (diff) | |
去掉hos_init_api和hos_shutdown_api
| -rw-r--r-- | src/hos_client.cpp | 16 | ||||
| -rw-r--r-- | src/hos_client.h | 9 | ||||
| -rw-r--r-- | support/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 22 deletions
diff --git a/src/hos_client.cpp b/src/hos_client.cpp index 27cced9a..7b4cb180 100644 --- a/src/hos_client.cpp +++ b/src/hos_client.cpp @@ -152,18 +152,6 @@ void hos_set_thread_sum(hos_client_handle client, size_t thread_sum) return ; } -void hos_init_api() -{ - //options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Debug; - Aws::InitAPI(options); -} - -void hos_shutdown_api() -{ - //options.loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Debug; - Aws::ShutdownAPI(options); -} - hos_client_handle hos_client_create(const char *endpoint, const char *accesskeyid, const char *secretkey, size_t pool_size) { if (!endpoint || !accesskeyid || !secretkey) @@ -175,6 +163,8 @@ hos_client_handle hos_client_create(const char *endpoint, const char *accesskeyi { return hos_handle; } + + Aws::InitAPI(options); hos_handle = (hos_client_handle)malloc(sizeof(hos_client_handle_t)); memset(hos_handle, 0, sizeof(hos_client_handle_t)); Aws::Client::ClientConfiguration config; @@ -814,5 +804,7 @@ int hos_client_destory(hos_client_handle handle) } free(handle); + Aws::ShutdownAPI(options); + return HOS_CLIENT_OK; } diff --git a/src/hos_client.h b/src/hos_client.h index a53d23b5..c549f372 100644 --- a/src/hos_client.h +++ b/src/hos_client.h @@ -75,15 +75,6 @@ enum s3errors typedef void (*put_finished_callback)(bool, const char *, const char *, const char *, void *); - -/************************************************************************************* - * 函数名： hos_init_api -*************************************************************************************/ -void hos_init_api(); -/************************************************************************************* - * 函数名： hos_shutdown_api -*************************************************************************************/ -void hos_shutdown_api(); /************************************************************************************* * 函数名： hos_client_init * 参数： const char *endpoint 目的地址，如”http://192.168.44.12:9098/hos“ diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index b9151559..98f6eb03 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -5,7 +5,7 @@ set(AWSS3_URL ${CMAKE_CURRENT_SOURCE_DIR}/aws-sdk-cpp-master.zip) #set(AWSS3_URL_MD5 a94cce4fe5003acf55fe1eac8c49ad4f) set(AWSS3_URL_MD5 dcdcd3cd6d2864f7efbfa90db6f5bf32) #set(AWSS3_URL_MD5 1bb2784d5f39ff05fcf2c30092dc8a66) -set(AWSS3_CONFIGURE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && cmake . -DBUILD_ONLY=s3 -DCMAKE_BUILD_TYPE=Debug) +set(AWSS3_CONFIGURE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && cmake . -DBUILD_ONLY=s3) set(AWSS3_MAKE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make) set(AWSS3_INSTALL cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make install PREFIX=${SUPPORT_INSTALL_PREFIX}) |