diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/hos_client.cpp | 35 | ||||
| -rw-r--r-- | src/hos_client.h | 7 |
3 files changed, 32 insertions, 19 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f6114724..fea7ce45 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,12 +9,17 @@ set(CMKAE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -shared -fPIC") add_library(${lib_name}_shared SHARED hos_client.cpp hos_hash.cpp) target_link_libraries(${lib_name}_shared "-Wl,--whole-archive" + libaws-c-common.a + libaws-checksums.a + libaws-c-event-stream.a libaws-cpp-sdk-core.a libaws-cpp-sdk-s3.a "-Wl,--no-whole-archive" - libMESA_field_stat2.so libcurl.so - libpthread.so) + libpthread.so + libMESA_prof_load.so + libMESA_field_stat2.so + libMESA_handle_logger.so) set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) #for ASAN diff --git a/src/hos_client.cpp b/src/hos_client.cpp index 303aaaf4..4d5dbd4d 100644 --- a/src/hos_client.cpp +++ b/src/hos_client.cpp @@ -237,6 +237,13 @@ static void hos_client_create() hos_config_t *hos_conf = &g_hos_handle.hos_config; void *log = g_hos_handle.log; + if (g_hos_handle.S3Client != NULL) + { + g_hos_handle.count++; + g_hos_instance.result = true; + return ; + } + Aws::InitAPI(g_options); Aws::Client::ClientConfiguration config; Aws::Auth::AWSCredentials credentials(hos_conf->accesskeyid, hos_conf->secretkey); @@ -626,6 +633,18 @@ static bool hos_putobject_sync(Aws::S3::Model::PutObjectRequest& request, size_t } } +hos_instance hos_get_instance() +{ + if (g_hos_handle.S3Client != NULL) + { + g_hos_handle.count++; + g_hos_instance.result = true; + return &g_hos_instance; + } + g_hos_instance.result = false; + return &g_hos_instance; +} + hos_instance hos_init_instance(const char *conf_path, const char *module, size_t thread_num, const char *bucket) { hos_config_t *hos_conf = &g_hos_handle.hos_config; @@ -650,12 +669,13 @@ hos_instance hos_init_instance(const char *conf_path, const char *module, size_t MESA_load_profile_uint_def(conf_path, module, "hos_cache_size", &hos_conf->cache_size, 102400); MESA_load_profile_uint_def(conf_path, module, "hos_cache_count", &hos_conf->cache_count, 10); MESA_load_profile_uint_def(conf_path, module, "hos_fd_live_time_ms", &hos_conf->timeout, 1000); - MESA_load_profile_string_nodef(conf_path, module, "hos_fs2_serverip", hos_conf->fs2_ip, MAX_HOS_STRING_LEN); + MESA_load_profile_string_nodef(conf_path, module, "hos_fs2_serverip", hos_conf->fs2_ip, INET6_ADDRSTRLEN); MESA_load_profile_uint_nodef(conf_path, module, "hos_fs2_serverport", &hos_conf->fs2_port); MESA_load_profile_string_def(conf_path, module, "hos_fs2_path", hos_conf->fs2_path, sizeof(hos_conf->fs2_path), "./hos_fs2.stat"); MESA_load_profile_uint_def(conf_path, module, "hos_fs2_format", &hos_conf->fs2_fmt, 0); - if (hos_conf->ip && hos_conf->port && hos_conf->accesskeyid && hos_conf->secretkey) + if (hos_conf->ip && hos_conf->port && strlen(hos_conf->accesskeyid) && strlen(hos_conf->secretkey)) { + MESA_handle_runtime_log_creation("./log"); g_hos_handle.log = MESA_create_runtime_log_handle(hos_conf->log_path, hos_conf->log_level); if (log == NULL) { @@ -1092,10 +1112,7 @@ int hos_close_fd(size_t fd, size_t thread_id) hos_fd_context_t *a_fd_context = NULL; char num[128]; hos_config_t *hos_conf = &g_hos_handle.hos_config; -<<<<<<< HEAD size_t upload_len = 0; -======= ->>>>>>> c9c751ab... 增加同步模式 if (fd < 3 || thread_id > hos_conf->thread_num) { @@ -1140,19 +1157,11 @@ int hos_close_fd(size_t fd, size_t thread_id) if (hos_conf->pool_thread_size > 0) { -<<<<<<< HEAD hos_putobject_async(request, upload_len, thread_id, fd, a_fd_context->bucket, a_fd_context->object); } else { hos_putobject_sync(request, upload_len, thread_id, fd, a_fd_context->bucket, a_fd_context->object); -======= - hos_putobject_async(request, a_fd_context->cache->gcount(), thread_id, fd, a_fd_context->bucket, a_fd_context->object); - } - else - { - hos_putobject_sync(request, a_fd_context->cache->gcount(), thread_id, fd, a_fd_context->bucket, a_fd_context->object); ->>>>>>> c9c751ab... 增加同步模式 } } } diff --git a/src/hos_client.h b/src/hos_client.h index 657a51c2..03ae838c 100644 --- a/src/hos_client.h +++ b/src/hos_client.h @@ -105,11 +105,10 @@ hos_instance hos_client_create(const char *serverip, size_t port, const char *ac *************************************************************************************/ hos_instance hos_init_instance(const char *conf_path, const char *module, size_t thread_num, const char *bucket); /************************************************************************************* - * 函数名： hos_create_bucket - * 参数: const char *bucket 桶名称 - * 返回值： bool 成功返回true，失败返回false + * 函数名： hos_get_instance + * 返回值： hos_instance 成功，result 为true *************************************************************************************/ -//bool hos_verify_bucket(const char *bucket); +hos_instance hos_get_instance(); /************************************************************************************* * 函数名： hos_create_bucket * 参数： const char * bucket 桶名称 |