diff options
Diffstat (limited to 'example')
| -rw-r--r-- | example/demo/hos_upload_complete.cpp | 2 | ||||
| -rw-r--r-- | example/demo/hos_write_complete.cpp | 4 | ||||
| -rw-r--r-- | example/performance/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | example/performance/HosClientPerformance.cpp | 3 |
4 files changed, 23 insertions, 4 deletions
diff --git a/example/demo/hos_upload_complete.cpp b/example/demo/hos_upload_complete.cpp index c53f50e8..bb76db52 100644 --- a/example/demo/hos_upload_complete.cpp +++ b/example/demo/hos_upload_complete.cpp @@ -50,7 +50,7 @@ int file_to_buffer(const char *file, char *buffer, size_t *len) return 0; } -void callback(bool result, const char *error, void *userdata) +void callback(bool result, const char *error, const char *bucket, const char *object, void *userdata) { userdata_t *data = (userdata_t *)userdata; clock_gettime(CLOCK_MONOTONIC, data->finished); diff --git a/example/demo/hos_write_complete.cpp b/example/demo/hos_write_complete.cpp index 00a78109..e78ed694 100644 --- a/example/demo/hos_write_complete.cpp +++ b/example/demo/hos_write_complete.cpp @@ -50,7 +50,7 @@ int file_to_buffer(const char *file, char *buffer, size_t *len) return 0; } -void callback(bool result, const char *error, void *userdata) +void callback(bool result, const char *error, const char *bucket, const char *object, void *userdata) { userdata_t *data = (userdata_t *)userdata; clock_gettime(CLOCK_MONOTONIC, data->finished); @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) hos_init_api(); debuginfo("hos_client_init start ...\n"); - hos_client_handle handle = hos_client_create("http://192.168.40.223:9098/hos/", "default", "default", 4000); + hos_client_handle handle = hos_client_create("http://192.168.40.223:9098/hos/", "default", "default", 400); //hos_client_handle handle = hos_client_create("http://192.168.32.10:9098/hos/", "default", "default", 4); if (handle == NULL) { diff --git a/example/performance/CMakeLists.txt b/example/performance/CMakeLists.txt index 1eea1e3a..58d2c7cf 100644 --- a/example/performance/CMakeLists.txt +++ b/example/performance/CMakeLists.txt @@ -8,6 +8,24 @@ link_directories(/opt/MESA/lib/) link_libraries(hos-client-cpp pthread) include_directories(/opt/MESA/include) +#for ASAN +set(ASAN_OPTION "OFF" CACHE STRING " set asan type chosen by the user, using OFF as default") +set_property(CACHE ASAN_OPTION PROPERTY STRINGS OFF ADDRESS THREAD) +message(STATUS "ASAN_OPTION='${ASAN_OPTION}'") + +if(ASAN_OPTION MATCHES "ADDRESS") + set(CMAKE_C_FLAGS "${CMAKADDRESS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=address -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=address -fno-omit-frame-pointer") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan") +elseif(ASAN_OPTION MATCHES "THREAD") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=thread -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DCMAKE_BUILD_TYPE=Debug -fsanitize=thread -fno-omit-frame-pointer") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lasan") +endif() +# end of for ASAN + add_executable(HosClientPerformance HosClientPerformance.cpp) target_link_libraries(HosClientPerformance hos-client-cpp) diff --git a/example/performance/HosClientPerformance.cpp b/example/performance/HosClientPerformance.cpp index e2aa7b23..3cd88ef8 100644 --- a/example/performance/HosClientPerformance.cpp +++ b/example/performance/HosClientPerformance.cpp @@ -102,7 +102,7 @@ int read_file_list(const char *path, char file_name[][256]) return 0; } -static void callback(bool result, const char *error, void *userdata) +static void callback(bool result, const char *error, const char *bucket, const char *object, void *userdata) { #if 0 userdata_t *data = (userdata_t *)userdata; @@ -541,6 +541,7 @@ int main(int argc, char *argv[]) hos_set_thread_sum(handle, conf.thread_sum); hos_set_cache_size(handle, conf.append_size); + hos_set_cache_times(handle, 0); //创建bucket if (hos_create_bucket(handle, conf.bucket)) |