diff --git a/include/dsn/cpp/perf_test_helper.h b/include/dsn/cpp/perf_test_helper.h deleted file mode 100644 index 8bd121bb55..0000000000 --- a/include/dsn/cpp/perf_test_helper.h +++ /dev/null @@ -1,193 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * helper class for automated performance test in zion - * - * Revision history: - * Aug., 2015, @imzhenyu (Zhenyu Guo), first version - * xxxx-xx-xx, author, fix bug about xxx - */ - -#pragma once - -#include -#include -#include -#include -#include - -#define INVALID_DURATION_US 0xdeadbeefdeadbeefULL - -namespace dsn { -namespace service { - -struct perf_test_opts -{ - int perf_test_seconds; - int perf_test_key_space_size; - // perf_test_concurrency: - // - if perf_test_concurrency == 0, means concurrency grow exponentially. - // - if perf_test_concurrency > 0, means concurrency maintained to a fixed number. - std::vector perf_test_concurrency; - std::vector perf_test_payload_bytes; - std::vector perf_test_timeouts_ms; - std::vector perf_test_hybrid_request_ratio; // e.g., 1,1,1 -}; - -CONFIG_BEGIN(perf_test_opts) -CONFIG_FLD(int, uint64, perf_test_seconds, 10, "how long for each test case") -CONFIG_FLD( - int, uint64, perf_test_key_space_size, 1000, "how large is the key space size for the test") -CONFIG_FLD_INT_LIST(perf_test_concurrency, - "concurrency list: 0 for expotentially growing concurrenty, >0 for fixed") -CONFIG_FLD_INT_LIST(perf_test_payload_bytes, "size list: byte size of each rpc request test") -CONFIG_FLD_INT_LIST(perf_test_timeouts_ms, "timeout list: timeout (ms) for each rpc call") -CONFIG_FLD_INT_LIST(perf_test_hybrid_request_ratio, - "hybrid request ratio, e.g., 1,2,1 - the " - "numbers are ordered by the task code appeared " - "in task code registration") -CONFIG_END - -class perf_client_helper -{ -public: - void start_test(const char *prefix, int max_request_kind_count_in_hybrid); - -protected: - perf_client_helper(); - - void *prepare_send_one(); - void end_send_one(void *context, error_code err); - - virtual void - send_one(int payload_bytes, int key_space_size, const std::vector &ratios) = 0; - -private: - struct perf_test_case - { - int id; - int seconds; - int payload_bytes; - int key_space_size; - int concurrency; - int timeout_ms; - std::vector ratios; - - // statistics - std::atomic timeout_rounds; - std::atomic error_rounds; - std::atomic succ_rounds; - std::atomic succ_rounds_sum_ns; - std::atomic min_latency_ns; - std::atomic max_latency_ns; - double succ_latency_avg_ns; - double succ_qps; - double succ_throughput_MB_s; - - perf_test_case &operator=(const perf_test_case &r) - { - id = r.id; - seconds = r.seconds; - payload_bytes = r.payload_bytes; - key_space_size = r.key_space_size; - timeout_ms = r.timeout_ms; - concurrency = r.concurrency; - ratios = r.ratios; - - timeout_rounds.store(r.timeout_rounds.load()); - error_rounds.store(r.error_rounds.load()); - succ_rounds.store(r.succ_rounds.load()); - succ_rounds_sum_ns.store(r.succ_rounds_sum_ns.load()); - min_latency_ns.store(r.min_latency_ns.load()); - max_latency_ns.store(r.max_latency_ns.load()); - - succ_latency_avg_ns = r.succ_latency_avg_ns; - succ_qps = r.succ_qps; - succ_throughput_MB_s = r.succ_throughput_MB_s; - - return *this; - } - - perf_test_case(const perf_test_case &r) { *this = r; } - - perf_test_case() - : id(0), - seconds(0), - payload_bytes(0), - key_space_size(1000), - concurrency(0), - timeout_ms(0), - timeout_rounds(0), - error_rounds(0), - succ_rounds(0), - succ_latency_avg_ns(0), - succ_qps(0), - succ_throughput_MB_s(0) - { - } - }; - - struct perf_test_suite - { - const char *name; - const char *config_section; - std::vector cases; - }; - - void load_suite_config(perf_test_suite &s, int max_request_kind_count_for_hybrid_test); - - void start(const std::vector &suits); - -private: - void finalize_case(); - - void start_next_case(); - -private: - perf_client_helper(const perf_client_helper &) = delete; - -protected: - std::chrono::milliseconds _timeout; - -private: - perf_test_opts _default_opts; - std::string _name; - perf_test_case *_current_case; - - volatile bool _quiting_current_case; - std::atomic _live_rpc_count; - uint64_t _case_start_ts_ns; - uint64_t _case_end_ts_ns; - - std::vector _suits; - int _current_suit_index; - int _current_case_index; - int _case_count; -}; -} -} diff --git a/include/dsn/service_api_cpp.h b/include/dsn/service_api_cpp.h index 597ae6a8fb..3b075171f1 100644 --- a/include/dsn/service_api_cpp.h +++ b/include/dsn/service_api_cpp.h @@ -44,4 +44,3 @@ #include #include #include -#include diff --git a/src/apps/echo/config.ini b/src/apps/echo/config.ini index e022956e31..0f36d52fe1 100644 --- a/src/apps/echo/config.ini +++ b/src/apps/echo/config.ini @@ -37,8 +37,6 @@ delay_seconds = 0 ; path of a dynamic library which implement this app role, and register itself upon loaded dmodule = -; - ; thread pools need to be started pools = THREAD_POOL_DEFAULT @@ -52,34 +50,6 @@ run = true type = client -[apps.client.perf.echo] -; arguments for the app instances -arguments = localhost 27001 - -; count of app instances for this type (ports are automatically calculated accordingly to avoid confliction) -count = 1 - -; delay seconds for when the apps should be started -delay_seconds = 0 - -; path of a dynamic library which implement this app role, and register itself upon loaded -dmodule = - -; - -; thread pools need to be started -pools = THREAD_POOL_DEFAULT - -; RPC server listening ports needed for this app -ports = - -; whether to run the app instances or not -run = true - -; app type name, as given when registering by dsn_register_app_role -type = client.perf.echo - - [apps.server] ; arguments for the app instances arguments = @@ -93,8 +63,6 @@ delay_seconds = 0 ; path of a dynamic library which implement this app role, and register itself upon loaded dmodule = -; - ; thread pools need to be started pools = THREAD_POOL_DEFAULT @@ -154,7 +122,6 @@ logging_start_level = LOG_LEVEL_WARNING ; logging provider ; logging_factory_name = dsn::tools::screen_logger -; logging_factory_name = dsn::tools::hpc_tail_logger logging_factory_name = dsn::tools::simple_logger ; memory management provider @@ -228,12 +195,6 @@ is_profile = true ; is_trace = true -; byte size of each rpc request test -perf_test_payload_bytes = - -; timeout (ms) for each rpc call -perf_test_timeouts_ms = - ; thread pool to execute the task pool_code = @@ -436,7 +397,6 @@ rpc_timeout_milliseconds = 5000 ; whether the task can be executed inlined with the caller task allow_inline = false - ; is_profile = false @@ -507,10 +467,8 @@ allow_inline = false ; byte size of each rpc request test -perf_test_payload_bytes = ; timeout (ms) for each rpc call -perf_test_timeouts_ms = ; thread pool to execute the task pool_code = diff --git a/src/apps/echo/echo.app.example.h b/src/apps/echo/echo.app.example.h index 177ce53c54..c91b794227 100644 --- a/src/apps/echo/echo.app.example.h +++ b/src/apps/echo/echo.app.example.h @@ -35,7 +35,6 @@ #pragma once #include #include "echo.client.h" -#include "echo.client.perf.h" #include "echo.server.h" namespace dsn { @@ -111,42 +110,5 @@ class echo_client_app : public ::dsn::service_app std::unique_ptr _echo_client; }; - -class echo_perf_test_client_app : public ::dsn::service_app -{ -public: - echo_perf_test_client_app(const service_app_info *info) : ::dsn::service_app(info) - { - _echo_client = nullptr; - } - - ~echo_perf_test_client_app() { stop(); } - - virtual ::dsn::error_code start(const std::vector &args) - { - if (args.size() < 2) - return ::dsn::ERR_INVALID_PARAMETERS; - - _server.assign_ipv4(args[1].c_str(), (uint16_t)atoi(args[2].c_str())); - - _echo_client = new echo_perf_test_client(_server); - _echo_client->start_test("echo.perf-test.case", 1); - return ::dsn::ERR_OK; - } - - virtual ::dsn::error_code stop(bool cleanup = false) - { - if (_echo_client != nullptr) { - delete _echo_client; - _echo_client = nullptr; - } - - return ::dsn::ERR_OK; - } - -private: - echo_perf_test_client *_echo_client; - ::dsn::rpc_address _server; -}; } } diff --git a/src/apps/echo/echo.client.perf.h b/src/apps/echo/echo.client.perf.h deleted file mode 100644 index d203cc3980..0000000000 --- a/src/apps/echo/echo.client.perf.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ -#pragma once - -#include "echo.client.h" - -namespace dsn { -namespace example { -class echo_perf_test_client : public echo_client, public ::dsn::service::perf_client_helper -{ -public: - echo_perf_test_client(::dsn::rpc_address server) : echo_client(server) {} - - virtual void - send_one(int payload_bytes, int key_space_size, const std::vector &ratios) override - { - return send_one_ping(payload_bytes, key_space_size); - } - - void send_one_ping(int payload_bytes, int key_space_size) - { - std::string req; - // TODO: randomize the value of req - // auto rs = random64(0, 10000000); - // std::stringstream ss; - // ss << "key." << rs; - // req = ss.str(); - ping(req, - [ this, context = prepare_send_one() ](error_code err, std::string && resp) { - end_send_one(context, err); - }, - _timeout); - } -}; -} -} \ No newline at end of file diff --git a/src/apps/echo/echo.main.cpp b/src/apps/echo/echo.main.cpp index 5e23f684c6..394eb622ad 100644 --- a/src/apps/echo/echo.main.cpp +++ b/src/apps/echo/echo.main.cpp @@ -40,8 +40,6 @@ static void dsn_app_registration_echo() // register all possible service apps dsn::service_app::register_factory<::dsn::example::echo_server_app>("server"); dsn::service_app::register_factory<::dsn::example::echo_client_app>("client"); - dsn::service_app::register_factory<::dsn::example::echo_perf_test_client_app>( - "client.perf.echo"); } int main(int argc, char **argv) diff --git a/src/apps/skv/config.ini b/src/apps/skv/config.ini index 2e63f4a55f..c84506f5d0 100644 --- a/src/apps/skv/config.ini +++ b/src/apps/skv/config.ini @@ -29,16 +29,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[apps.client.perf.test] -type = client.perf.test -arguments = dsn://mycluster/simple_kv.instance0 -run = true -count = 1 -pools = THREAD_POOL_DEFAULT - -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 2048000 - [core] start_nfs = true @@ -53,7 +43,6 @@ pause_on_start = false ;logging_start_level = LOG_LEVEL_WARNING ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;logging_factory_name = dsn::tools::hpc_logger ;aio_factory_name = dsn::tools::empty_aio_provider @@ -100,8 +89,6 @@ rpc_message_delay_ms_max = 1000 disk_write_fail_ratio = 0.0 disk_read_fail_ratio = 0.00001 -perf_test_seconds = 30 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/apps/skv/perf-test.cmd b/src/apps/skv/perf-test.cmd deleted file mode 100644 index 9db4ef6945..0000000000 --- a/src/apps/skv/perf-test.cmd +++ /dev/null @@ -1,23 +0,0 @@ -@ECHO OFF -@MKDIR perf-result -@RMDIR /Q /S data - -:: %replica_count% - how many replica servers we want in this test -FOR %%R IN (1,2,3) DO ( - :: %tcp_network_provider% - what kind of tcp network providers we use - FOR %%T IN (dsn::tools::sim_network_provider dsn::tools::asio_network_provider dsn::tools::hpc_network_provider) DO ( - :: %udp_network_provider% - what kind of udp network providers we use - FOR %%U IN (dsn::tools::sim_network_provider dsn::tools::asio_udp_provider) DO ( - :: %aio_provider% - what kind of aio provider we use - FOR %%A IN (dsn::tools::empty_aio_provider dsn::tools::native_aio_provider) DO ( - CALL dsn.replication.simple_kv perf-config.ini -cargs replica_count=%%R;tcp_network_provider=%%T;udp_network_provider=%%U;aio_provider=%%A - XCOPY /Y data\client.perf.test\perf-result-* .\perf-result\ - @RMDIR /Q /S data - ) - ) - ) -) - -:exit - - diff --git a/src/apps/skv/perf-test.sh b/src/apps/skv/perf-test.sh deleted file mode 100755 index 80ba6b06d0..0000000000 --- a/src/apps/skv/perf-test.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -e - -tcp_network_providers="dsn::tools::sim_network_provider dsn::tools::asio_network_provider dsn::tools::hpc_network_provider" -udp_network_providers="dsn::tools::sim_network_provider dsn::tools::asio_udp_provider" -aio_providers="dsn::tools::empty_aio_provider dsn::tools::native_aio_provider" - - -mkdir -p perf-result -rm -rf data - -#%replica_count% - how many replica servers we want in this test -for rep_cnt in {1..3};do - #%tcp_network_provider% - what kind of tcp network providers we use - for tcp in ${tcp_network_providers};do - #%udp_network_provider% - what kind of udp network providers we use - for udp in ${udp_network_providers};do - #%aio_provider% - what kind of aio provider we use - for aio in ${aio_providers};do - ./dsn.replication.simple_kv perf-config.ini -cargs replica_count=${rep_cnt},tcp_network_provider=${tcp},udp_network_provider=${udp},aio_provider=${aio} - cp data/client.perf.test/perf-result-* ./perf-result/ - rm -rf data - done - done - done -done diff --git a/src/apps/skv/simple_kv.app.example.h b/src/apps/skv/simple_kv.app.example.h index ad1ddf6d0c..dfb0379c90 100644 --- a/src/apps/skv/simple_kv.app.example.h +++ b/src/apps/skv/simple_kv.app.example.h @@ -35,7 +35,6 @@ #pragma once #include "simple_kv.client.2.h" -#include "simple_kv.client.perf.h" #include "simple_kv.server.h" #define TRANSPARENT_LAYER2_CLIENT @@ -115,6 +114,7 @@ class simple_kv_client_app : public ::dsn::service_app std::tie(err, resp) = _simple_kv_client->append_sync(req); std::cout << "call RPC_SIMPLE_KV_SIMPLE_KV_APPEND end, return " << err.to_string() << std::endl; + // async: //_simple_kv_client->append(req, empty_rpc_handler); } @@ -126,38 +126,6 @@ class simple_kv_client_app : public ::dsn::service_app std::unique_ptr _simple_kv_client; dsn::task_tracker _tracker; }; - -class simple_kv_perf_test_client_app : public ::dsn::service_app -{ -public: - simple_kv_perf_test_client_app(const service_app_info *info) : ::dsn::service_app(info) {} - - ~simple_kv_perf_test_client_app() { stop(); } - - virtual ::dsn::error_code start(const std::vector &args) - { - if (args.size() < 2) - return ::dsn::ERR_INVALID_PARAMETERS; - - // argv[1]: e.g., dsn://mycluster/simple-kv.instance0 - rpc_address service_addr; - service_addr.assign_uri(args[1].c_str()); - - _simple_kv_client.reset(new simple_kv_perf_test_client(service_addr)); - _simple_kv_client->start_test("simple_kv.perf-test.case", 3); - return ::dsn::ERR_OK; - } - - virtual ::dsn::error_code stop(bool cleanup = false) - { - _simple_kv_client.reset(); - - return ::dsn::ERR_OK; - } - -private: - std::unique_ptr _simple_kv_client; -}; } } } diff --git a/src/apps/skv/simple_kv.client.perf.h b/src/apps/skv/simple_kv.client.perf.h deleted file mode 100644 index f0e0cd539f..0000000000 --- a/src/apps/skv/simple_kv.client.perf.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ - -#pragma once -#include "simple_kv.client.2.h" - -namespace dsn { -namespace replication { -namespace application { - -class simple_kv_perf_test_client : public simple_kv_client2, - public ::dsn::service::perf_client_helper -{ -public: - using simple_kv_client2::simple_kv_client2; - - virtual void - send_one(int payload_bytes, int key_space_size, const std::vector &ratios) override - { - auto prob = (double)dsn_random32(0, 1000) / 1000.0; - if (0) { - } else if (prob <= ratios[0]) { - send_one_read(payload_bytes, key_space_size); - } else if (prob <= ratios[1]) { - send_one_write(payload_bytes, key_space_size); - } else if (prob <= ratios[2]) { - send_one_append(payload_bytes, key_space_size); - } else { /* nothing to do */ - } - } - - void send_one_read(int payload_bytes, int key_space_size) - { - auto rs = dsn_random64(0, 10000000) % key_space_size; - std::stringstream ss; - ss << "key." << rs << "." << std::string(payload_bytes, 'x'); - - read(ss.str(), - [ this, context = prepare_send_one() ](error_code err, std::string && resp) { - end_send_one(context, err); - }, - _timeout, - 0, - rs); - } - - void send_one_write(int payload_bytes, int key_space_size) - { - auto rs = dsn_random64(0, 10000000) % key_space_size; - std::stringstream ss; - ss << "key." << rs; - - kv_pair req = {ss.str(), std::string(payload_bytes, 'x')}; - write(req, - [ this, context = prepare_send_one() ](error_code err, int32_t && resp) { - end_send_one(context, err); - }, - _timeout, - 0, - rs); - } - - void send_one_append(int payload_bytes, int key_space_size) - { - auto rs = dsn_random64(0, 10000000) % key_space_size; - std::stringstream ss; - ss << "key." << rs; - kv_pair req = {ss.str(), std::string(payload_bytes, 'x')}; - ; - append(req, - [ this, context = prepare_send_one() ](error_code err, int32_t && resp) { - end_send_one(context, err); - }, - _timeout, - 0, - rs); - } -}; -} -} -} diff --git a/src/apps/skv/simple_kv.main.cpp b/src/apps/skv/simple_kv.main.cpp index 2b6b20de78..1987405343 100644 --- a/src/apps/skv/simple_kv.main.cpp +++ b/src/apps/skv/simple_kv.main.cpp @@ -52,8 +52,6 @@ static void dsn_app_registration_simple_kv() dsn::service_app::register_factory( "client"); - dsn::service_app::register_factory< - ::dsn::replication::application::simple_kv_perf_test_client_app>("client.perf.test"); } int main(int argc, char **argv) diff --git a/src/apps/skv/vconfig.ini b/src/apps/skv/vconfig.ini index 0195ec1cb8..78719e85f3 100644 --- a/src/apps/skv/vconfig.ini +++ b/src/apps/skv/vconfig.ini @@ -36,8 +36,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 10240000 [core] start_nfs = true @@ -53,7 +51,6 @@ pause_on_start = false ;logging_start_level = LOG_LEVEL_WARNING ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simulator] @@ -95,8 +92,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 disk_read_fail_ratio = 0.00001 -perf_test_seconds = 600 -perf_test_payload_bytes = 1,128,1024 [task.LPC_CHECKPOINT_REPLICA] execution_extra_delay_us_max = 10000000 diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7104306e3e..e8980571c9 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -5,4 +5,3 @@ add_subdirectory(perf_counter) add_subdirectory(tools) add_subdirectory(runtime) add_subdirectory(tests) -add_subdirectory(perf.tests) diff --git a/src/core/core/perf_test_helper.cpp b/src/core/core/perf_test_helper.cpp deleted file mode 100644 index 9b6b4866bd..0000000000 --- a/src/core/core/perf_test_helper.cpp +++ /dev/null @@ -1,298 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ -#include -#include -#include - -#define INVALID_DURATION_US 0xdeadbeefdeadbeefULL - -namespace dsn { -namespace service { - -perf_client_helper::perf_client_helper() -{ - _case_count = 0; - _live_rpc_count = 0; - - if (!read_config("task..default", _default_opts)) { - dassert(false, "read configuration failed for section [task..default]"); - } - - if (_default_opts.perf_test_concurrency.size() == 0) { - const int ccs[] = {1, 10, 100, 1000}; - for (size_t i = 0; i < sizeof(ccs) / sizeof(int); i++) - _default_opts.perf_test_concurrency.push_back(ccs[i]); - } - - if (_default_opts.perf_test_timeouts_ms.size() == 0) { - const int timeouts_ms[] = {10000}; - for (size_t i = 0; i < sizeof(timeouts_ms) / sizeof(int); i++) - _default_opts.perf_test_timeouts_ms.push_back(timeouts_ms[i]); - } - - if (_default_opts.perf_test_payload_bytes.size() == 0) { - const int payload_bytes[] = {1024, 64 * 1024, 512 * 1024, 1024 * 1024}; - for (size_t i = 0; i < sizeof(payload_bytes) / sizeof(int); i++) - _default_opts.perf_test_payload_bytes.push_back(payload_bytes[i]); - } -} - -void perf_client_helper::start_test(const char *prefix, int max_request_kind_count_in_hybrid) -{ - perf_test_suite s; - std::vector suits; - - std::vector sections; - dsn_config_get_all_sections(sections); - - for (int i = 0; i < sections.size(); i++) { - if (strstr(sections[i], prefix) == sections[i]) { - s.name = sections[i]; - s.config_section = sections[i]; - s.cases.clear(); - load_suite_config(s, max_request_kind_count_in_hybrid); - suits.push_back(s); - } - } - - start(suits); -} - -void perf_client_helper::load_suite_config(perf_test_suite &s, - int max_request_kind_count_for_hybrid_test) -{ - perf_test_opts opt; - if (!read_config(s.config_section, opt, &_default_opts)) { - dassert(false, "read configuration failed for section [%s]", s.config_section); - } - - double ratio_sum = 0.0; - if (opt.perf_test_hybrid_request_ratio.size() == 0) - opt.perf_test_hybrid_request_ratio.push_back(1); - - for (auto r : opt.perf_test_hybrid_request_ratio) { - ratio_sum += (double)r; - } - - s.cases.clear(); - for (auto &bytes : opt.perf_test_payload_bytes) { - int last_index = static_cast(opt.perf_test_timeouts_ms.size()) - 1; - for (int i = last_index; i >= 0; i--) { - for (auto &cc : opt.perf_test_concurrency) { - perf_test_case c; - c.id = ++_case_count; - c.seconds = opt.perf_test_seconds; - c.payload_bytes = bytes; - c.key_space_size = opt.perf_test_key_space_size; - c.timeout_ms = opt.perf_test_timeouts_ms[i]; - c.concurrency = cc; - c.ratios.resize(max_request_kind_count_for_hybrid_test, 0.0); - - double ratio = 0.0; - for (size_t i = 0; - i < std::min(opt.perf_test_hybrid_request_ratio.size(), c.ratios.size()); - i++) { - ratio += (double)(opt.perf_test_hybrid_request_ratio[i]) / ratio_sum; - c.ratios[i] = ratio; - } - - s.cases.push_back(c); - } - } - } -} - -void perf_client_helper::start(const std::vector &suits) -{ - _suits = suits; - _current_suit_index = -1; - _current_case_index = 0xffffff; - - start_next_case(); -} - -void *perf_client_helper::prepare_send_one() -{ - uint64_t nts_ns = ::dsn_now_ns(); - ++_live_rpc_count; - return (void *)(size_t)(nts_ns); -} - -void perf_client_helper::end_send_one(void *context, error_code err) -{ - uint64_t start_ts = (uint64_t)(context); - uint64_t nts_ns = ::dsn_now_ns(); - - if (err != ERR_OK) { - if (err == ERR_TIMEOUT) - _current_case->timeout_rounds++; - else - _current_case->error_rounds++; - } else { - _current_case->succ_rounds++; - - auto d = nts_ns - start_ts; - _current_case->succ_rounds_sum_ns += d; - if (d < _current_case->min_latency_ns) - _current_case->min_latency_ns = d; - if (d > _current_case->max_latency_ns) - _current_case->max_latency_ns = d; - } - - // if completed - if (_quiting_current_case) { - if (--_live_rpc_count == 0) - finalize_case(); - return; - } else if (nts_ns >= _case_end_ts_ns) { - _quiting_current_case = true; - if (--_live_rpc_count == 0) - finalize_case(); - return; - } else { - --_live_rpc_count; - } - - // continue further waves - if (_current_case->concurrency == 0) { - // exponentially increase - send_one( - _current_case->payload_bytes, _current_case->key_space_size, _current_case->ratios); - send_one( - _current_case->payload_bytes, _current_case->key_space_size, _current_case->ratios); - } else { - // maintain fixed concurrent number - while (!_quiting_current_case && _live_rpc_count <= _current_case->concurrency) { - send_one( - _current_case->payload_bytes, _current_case->key_space_size, _current_case->ratios); - } - } -} - -void perf_client_helper::finalize_case() -{ - dassert(_live_rpc_count == 0, "all live requests must be completed"); - - uint64_t nts = dsn_now_ns(); - auto &suit = _suits[_current_suit_index]; - auto &cs = suit.cases[_current_case_index]; - - cs.succ_qps = - (double)cs.succ_rounds / ((double)(nts - _case_start_ts_ns) / 1000.0 / 1000.0 / 1000.0); - cs.succ_throughput_MB_s = (double)cs.succ_rounds * (double)cs.payload_bytes / 1024.0 / 1024.0 / - ((double)(nts - _case_start_ts_ns) / 1000.0 / 1000.0 / 1000.0); - cs.succ_latency_avg_ns = (double)cs.succ_rounds_sum_ns / (double)cs.succ_rounds; - - std::stringstream ss; - ss << "TEST " << _name << "(" << cs.id << "/" << _case_count << ")::" - << " concurency: " << cs.concurrency << ", timeout(ms): " << cs.timeout_ms - << ", payload(byte): " << cs.payload_bytes << ", tmo/err/suc(#): " << cs.timeout_rounds - << "/" << cs.error_rounds << "/" << cs.succ_rounds - << ", latency(ns): " << cs.succ_latency_avg_ns << "(avg), " << cs.min_latency_ns << "(min), " - << cs.max_latency_ns << "(max)" - << ", qps: " << cs.succ_qps << "#/s" - << ", thp: " << cs.succ_throughput_MB_s << "MB/s"; - - dwarn(ss.str().c_str()); - - start_next_case(); -} - -void perf_client_helper::start_next_case() -{ - ++_current_case_index; - - // switch to next suit - if (_current_suit_index == -1 || - _current_case_index >= (int)_suits[_current_suit_index].cases.size()) { - _current_suit_index++; - _current_case_index = 0; - - if (_current_suit_index >= (int)_suits.size()) { - uint64_t ts = dsn_now_ns(); - char str[24]; - ::dsn::utils::time_ms_to_string(ts / 1000000, str); - std::stringstream ss; - - ss << "TEST end at " << str << std::endl; - for (auto &s : _suits) { - for (auto &cs : s.cases) { - ss << "TEST " << s.name << "(" << cs.id << "/" << _case_count << ")::" - << " concurency: " << cs.concurrency << ", timeout(ms): " << cs.timeout_ms - << ", payload(byte): " << cs.payload_bytes - << ", tmo/err/suc(#): " << cs.timeout_rounds << "/" << cs.error_rounds << "/" - << cs.succ_rounds << ", latency(ns): " << cs.succ_latency_avg_ns << "(avg), " - << cs.min_latency_ns << "(min), " << cs.max_latency_ns << "(max)" - << ", qps: " << cs.succ_qps << "#/s" - << ", thp: " << cs.succ_throughput_MB_s << "MB/s" << std::endl; - ; - } - } - - dwarn(ss.str().c_str()); - return; - } - } - - std::this_thread::sleep_for(std::chrono::seconds(2)); - - // get next case - auto &suit = _suits[_current_suit_index]; - auto &cs = suit.cases[_current_case_index]; - cs.timeout_rounds = 0; - cs.error_rounds = 0; - cs.max_latency_ns = 0; - cs.min_latency_ns = std::numeric_limits::max(); - - // setup for the case - _current_case = &cs; - _name = suit.name; - _timeout = std::chrono::milliseconds(cs.timeout_ms); - _case_start_ts_ns = dsn_now_ns(); - _case_end_ts_ns = _case_start_ts_ns + (uint64_t)cs.seconds * 1000 * 1000 * 1000; - _quiting_current_case = false; - dassert(_live_rpc_count == 0, "all live requests must be completed"); - - std::stringstream ss; - ss << "TEST " << _name << "(" << cs.id << "/" << _case_count << ")::" - << " concurrency " << _current_case->concurrency << ", timeout(ms) " - << _current_case->timeout_ms << ", payload(byte) " << _current_case->payload_bytes; - dwarn(ss.str().c_str()); - - // start - send_one(_current_case->payload_bytes, _current_case->key_space_size, _current_case->ratios); -} -} -} diff --git a/src/core/perf.tests/CMakeLists.txt b/src/core/perf.tests/CMakeLists.txt deleted file mode 100644 index 64001ec9e9..0000000000 --- a/src/core/perf.tests/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -set(MY_PROJ_NAME dsn.core.perf.tests) - -# Search mode for source files under CURRENT project directory? -# "GLOB_RECURSE" for recursive search -# "GLOB" for non-recursive search -set(MY_SRC_SEARCH_MODE "GLOB") - -set(MY_PROJ_INC_PATH - ${GTEST_INCLUDE_DIR} - ../core ../tools/common ../tools/simulator ../tools/hpc ../tools/nfs - ) - -set(MY_BOOST_PACKAGES system filesystem) - -set(MY_PROJ_LIBS gtest - dsn_runtime -) - -set(MY_PROJ_LIB_PATH "${GTEST_LIB_DIR}") - -# Extra files that will be installed -set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config-test.ini") - -dsn_add_executable() diff --git a/src/core/perf.tests/aio.cpp b/src/core/perf.tests/aio.cpp deleted file mode 100644 index 02b82b5b9a..0000000000 --- a/src/core/perf.tests/aio.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * Disk IO performance test - * - * Revision history: - * 2016-01-05, Tianyi Wang, first version - */ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include "test_utils.h" -#include - -DEFINE_TASK_CODE_AIO(LPC_AIO_TEST, TASK_PRIORITY_COMMON, THREAD_POOL_TEST_SERVER) -void aio_testcase(uint64_t block_size, size_t concurrency, bool is_write, bool random_offset) -{ - std::chrono::steady_clock clock; - std::unique_ptr buffer(new char[block_size]); - std::atomic_uint remain_concurrency; - remain_concurrency = concurrency; - if (is_write && utils::filesystem::file_exists("temp")) { - utils::filesystem::remove_path("temp"); - dassert(!utils::filesystem::file_exists("temp"), ""); - } - auto file_handle = dsn_file_open("temp", O_CREAT | O_RDWR, 0666); - auto total_size_mb = 64; - auto total_size_bytes = total_size_mb * 1024 * 1024; - auto tic = clock.now(); - - for (int bytes_written = 0; bytes_written < total_size_bytes;) { - while (true) { - if (remain_concurrency.fetch_sub(1, std::memory_order_acquire) <= 0) { - remain_concurrency.fetch_add(1, std::memory_order_relaxed); - } else { - break; - } - } - auto cb = [&](error_code ec, int sz) { - dassert(ec == ERR_OK && uint64_t(sz) == block_size, - "ec = %s, sz = %d, block_size = %" PRId64 "", - ec.to_string(), - sz, - block_size); - remain_concurrency.fetch_add(1, std::memory_order_relaxed); - }; - auto offset = - random_offset ? dsn_random64(0, total_size_bytes - block_size) : bytes_written; - if (is_write) { - file::write(file_handle, buffer.get(), block_size, offset, LPC_AIO_TEST, nullptr, cb); - } else { - file::read(file_handle, buffer.get(), block_size, offset, LPC_AIO_TEST, nullptr, cb); - } - - bytes_written += block_size; - } - while (remain_concurrency != concurrency) { - ; - } - dsn_file_flush(file_handle); - auto toc = clock.now(); - dsn_file_close(file_handle); - std::cout << "is_write = " << is_write << " random_offset = " << random_offset - << " block_size = " << block_size << " concurrency = " << concurrency - << " throughput = " - << double(total_size_mb) * 1000000 / - std::chrono::duration_cast(toc - tic).count() - << " mB/s" << std::endl; -} -TEST(core, aio_perf_test) -{ - auto block_size_list = {64, 512, 4096, 512 * 1024}; - auto concurrency_list = {1, 4, 16}; - for (auto is_write : {true, false}) { - for (auto random_offset : {true, false}) { - for (auto block_size : block_size_list) { - for (auto concurrency : concurrency_list) { - aio_testcase(block_size, concurrency, is_write, random_offset); - } - } - } - } -} diff --git a/src/core/perf.tests/config-test.ini b/src/core/perf.tests/config-test.ini deleted file mode 100644 index 6104afef3e..0000000000 --- a/src/core/perf.tests/config-test.ini +++ /dev/null @@ -1,95 +0,0 @@ -[apps..default] -run = true -count = 1 -;network.client.RPC_CHANNEL_TCP = dsn::tools::sim_network_provider, 65536 -;network.client.RPC_CHANNEL_UDP = dsn::tools::sim_network_provider, 65536 -;network.server.0.RPC_CHANNEL_TCP = dsn::tools::sim_network_provider, 65536 - -[apps.client] -type = test -arguments = localhost 20101 -run = true -ports = -count = 1 -delay_seconds = 1 -pools = THREAD_POOL_DEFAULT, THREAD_POOL_TEST_SERVER, THREAD_POOL_TEST_TASK_QUEUE_1, THREAD_POOL_TEST_TASK_QUEUE_2 - -[apps.server] -type = test -arguments = -ports = 20101 -run = true -count = 1 -pools = THREAD_POOL_DEFAULT, THREAD_POOL_TEST_SERVER - -[apps.server_group] -type = test -arguments = -ports = 20201 -run = true -count = 3 -pools = THREAD_POOL_DEFAULT, THREAD_POOL_TEST_SERVER - -[core] -;tool = simulator -tool = nativerun -;toollets = tracer, profiler, fault_injector -pause_on_start = false -cli_local = false -cli_remote = false - -logging_start_level = LOG_LEVEL_DEBUG -logging_factory_name = dsn::tools::simple_logger - -io_mode = IOE_PER_NODE -;io_mode = IOE_PER_QUEUE -io_worker_count = 1 - -[tools.simulator] -random_seed = 0 - -[network] -; how many network threads for network library (used by asio) -io_service_worker_count = 2 - -[task..default] -is_trace = true -is_profile = true -allow_inline = false -rpc_call_channel = RPC_CHANNEL_TCP -rpc_message_header_format = dsn -rpc_timeout_milliseconds = 5000 - -[task.LPC_AIO_IMMEDIATE_CALLBACK] -is_trace = false -is_profile = false -allow_inline = false - -[task.LPC_RPC_TIMEOUT] -is_trace = false -is_profile = false - -; specification for each thread pool -[threadpool..default] -queue_factory_name = dsn::tools::hpc_concurrent_task_queue -worker_count = 2 - -[threadpool.THREAD_POOL_DEFAULT] -partitioned = false -; max_input_queue_length = 1024 -worker_priority = THREAD_xPRIORITY_NORMAL - -[threadpool.THREAD_POOL_TEST_SERVER] -partitioned = false - -[threadpool.THREAD_POOL_TEST_TASK_QUEUE_1] -worker_count = 1 -partitioned = false - -[threadpool.THREAD_POOL_TEST_TASK_QUEUE_2] -worker_count = 1 -partitioned = false - -[core.test] -count = 1 -run = true diff --git a/src/core/perf.tests/logger.cpp b/src/core/perf.tests/logger.cpp deleted file mode 100644 index 991cb33301..0000000000 --- a/src/core/perf.tests/logger.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "service_engine.h" -#include "test_utils.h" -#include "../tools/common/simple_logger.h" - -using namespace ::dsn; -const char str[64] = "this is a logging test for log %010d @ thread %010d"; - -void logv(dsn::logging_provider *logger, const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - logger->dsn_logv(__FILENAME__, __FUNCTION__, __LINE__, LOG_LEVEL_DEBUG, str, ap); - va_end(ap); -} - -template -void logger_test(int thread_count, int record_count) -{ - std::list threads; - TLOGGER logger("./"); - - uint64_t nts = dsn_now_ns(); - uint64_t nts_start = nts; - - for (int i = 0; i < thread_count; ++i) { - threads.push_back(new std::thread([&, i] { - task::set_tls_dsn_context(task::get_current_node2(), nullptr); - for (int j = 0; j < record_count; j++) { - logv(&logger, str, j, i); - } - - })); - } - - for (auto &thr : threads) { - thr->join(); - delete thr; - } - threads.clear(); - - nts = dsn_now_ns(); - - // one sample log - size_t size_per_log = strlen("13:11:02.678 (1446037862678885017 1d50) unknown.io-thrd.07504: " - "this is a logging test for log 0000000000 @ thread 000000000") + - 1; - - std::cout << thread_count << "\t\t\t " << record_count << "\t\t\t " - << static_cast(thread_count * record_count) * size_per_log / (1024 * 1024) / - (nts - nts_start) * 1000000000 - << "MB/s" << std::endl; - - // logger.flush(); -} - -TEST(core, simple_logger_test) -{ - std::cout << "thread_count\t\t record_count\t\t speed" << std::endl; - - auto threads_count = {1, 2, 5, 10}; - for (int i : threads_count) { - logger_test(i, 100000); - } -} diff --git a/src/core/perf.tests/main.cpp b/src/core/perf.tests/main.cpp deleted file mode 100644 index 8a793280a1..0000000000 --- a/src/core/perf.tests/main.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ - -#include -#include "gtest/gtest.h" -#include "test_utils.h" - -int g_test_count = 0; - -GTEST_API_ int main(int argc, char **argv) -{ - testing::InitGoogleTest(&argc, argv); - - // register all possible services - dsn::service_app::register_factory("test"); - - // specify what services and tools will run in config file, then run - dsn_run(argc, argv, false); - - // run in-rDSN tests - while (g_test_count == 0) { - std::this_thread::sleep_for(std::chrono::seconds(1)); - } - - // exit without any destruction - dsn_exit(0); - - return 0; -} diff --git a/src/core/perf.tests/rpc.cpp b/src/core/perf.tests/rpc.cpp deleted file mode 100644 index 0c6fc67348..0000000000 --- a/src/core/perf.tests/rpc.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * Description: - * Rpc performance test - * - * Revision history: - * 2016-01-05, Tianyi Wang, first version - */ -#include -#include - -#include - -#include -#include - -#include "test_utils.h" - -TEST(core, rpc_perf_test) -{ - rpc_address localhost("localhost", 20101); - - rpc_read_stream response; - std::mutex lock; - for (auto concurrency : {10, 100, 1000, 10000}) { - std::atomic_int remain_concurrency; - remain_concurrency = concurrency; - size_t total_query_count = 1000000; - std::chrono::steady_clock clock; - auto tic = clock.now(); - for (auto remain_query_count = total_query_count; remain_query_count--;) { - while (true) { - if (remain_concurrency.fetch_sub(1, std::memory_order_relaxed) <= 0) { - remain_concurrency.fetch_add(1, std::memory_order_relaxed); - } else { - break; - } - } - rpc::call(localhost, - RPC_TEST_HASH, - 0, - nullptr, - [&remain_concurrency](error_code ec, const std::string &) { - remain_concurrency.fetch_add(1, std::memory_order_relaxed); - }); - } - while (remain_concurrency != concurrency) { - ; - } - auto toc = clock.now(); - auto time_us = std::chrono::duration_cast(toc - tic).count(); - std::cout << "rpc perf test: concurrency = " << concurrency - << " throughput = " << total_query_count * 1000000llu / time_us << "call/sec" - << std::endl; - } -} - -TEST(core, rpc_perf_test_sync) -{ - rpc_address localhost("localhost", 20101); - - std::chrono::steady_clock clock; - auto tic = clock.now(); - - auto round = 100000; - auto concurrency = 10; - auto total_query_count = round * concurrency; - - std::vector tasks; - for (auto i = 0; i < round; i++) { - for (auto j = 0; j < concurrency; j++) { - auto req = 0; - auto task = rpc::call( - localhost, RPC_TEST_HASH, req, nullptr, [](error_code err, std::string &&result) { - // nothing to do - }); - - tasks.push_back(task); - } - - for (auto &t : tasks) - t->wait(); - - tasks.clear(); - } - - auto toc = clock.now(); - auto time_us = std::chrono::duration_cast(toc - tic).count(); - std::cout << "rpc-sync perf test: throughput = " << total_query_count * 1000000llu / time_us - << " #/s, avg latency = " << time_us / total_query_count << " us" << std::endl; -} - -TEST(core, lpc_perf_test_sync) -{ - std::chrono::steady_clock clock; - auto tic = clock.now(); - - auto round = 1000000; - auto concurrency = 10; - auto total_query_count = round * concurrency; - std::vector tasks; - std::vector results; - for (auto i = 0; i < round; i++) { - results.resize(concurrency); - for (auto j = 0; j < concurrency; j++) { - auto task = tasking::enqueue(LPC_TEST_HASH, nullptr, [&results, j]() { - std::string r = service_app::current_service_app_info().data_dir; - results[j] = std::move(r); - }); - tasks.push_back(task); - } - - for (auto &t : tasks) - t->wait(); - - tasks.clear(); - } - - auto toc = clock.now(); - auto time_ns = std::chrono::duration_cast(toc - tic).count(); - std::cout << "lpc-sync perf test: throughput = " << total_query_count * 1000000000llu / time_ns - << " #/s, avg latency = " << time_ns / total_query_count << " ns" << std::endl; -} diff --git a/src/core/perf.tests/task_queue.cpp b/src/core/perf.tests/task_queue.cpp deleted file mode 100644 index 7935dd1c3e..0000000000 --- a/src/core/perf.tests/task_queue.cpp +++ /dev/null @@ -1,206 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * Rpc performance test - * - * Revision history: - * 2016-01-05, Tianyi Wang, first version - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include "test_utils.h" -#include -#include - -// worker = 1 -DEFINE_THREAD_POOL_CODE(THREAD_POOL_TEST_TASK_QUEUE_1) -// worker = 1 -DEFINE_THREAD_POOL_CODE(THREAD_POOL_TEST_TASK_QUEUE_2) -DEFINE_TASK_CODE(LPC_TEST_TASK_QUEUE_1, TASK_PRIORITY_HIGH, THREAD_POOL_TEST_TASK_QUEUE_1) -DEFINE_TASK_CODE(LPC_TEST_TASK_QUEUE_2, TASK_PRIORITY_HIGH, THREAD_POOL_TEST_TASK_QUEUE_2) - -struct auto_timer -{ - std::string prefix; - uint64_t delivery; - std::chrono::steady_clock clock; - decltype(std::chrono::steady_clock::now()) start_time; - std::vector waited_task; - auto_timer(const std::string &prefix, uint64_t delivery) : prefix(prefix), delivery(delivery) - { - start_time = clock.now(); - } - void wait_task(task_ptr ptask) { waited_task.push_back(ptask); } - ~auto_timer() - { - for (auto task : waited_task) { - task->wait(); - } - auto end_time = clock.now(); - std::cout << prefix << "throughput = " - << delivery * 1000 * 1000 / - std::chrono::duration_cast(end_time - - start_time) - .count() - << std::endl; - } -}; - -void empty_cb() {} -struct self_iterate_context -{ - std::mutex mut; - std::condition_variable cv; - bool done = false; - std::vector tsks; - std::vector::iterator it; -}; -void iterate_over_preallocated_tasks(void *ctx) -{ - auto context = reinterpret_cast(ctx); - if (context->it != context->tsks.end()) { - auto it_save = context->it; - ++context->it; - (*it_save)->enqueue(); - } else { - { - std::lock_guard _(context->mut); - context->done = true; - } - context->cv.notify_one(); - } -} - -void external_flooding(const int enqueue_time) -{ - std::vector tsks; - for (int i = 0; i < enqueue_time; i++) { - auto tsk = new raw_task(LPC_TEST_TASK_QUEUE_1, empty_cb); - tsks.push_back(tsk); - } - { - auto_timer t("inter-thread flooding test:", enqueue_time); - for (auto tsk : tsks) { - if (tsk == tsks.back()) { - tsk->add_ref(); - } - tsk->enqueue(); - } - tsks.back()->wait(); - tsks.back()->release_ref(); - } -} - -void self_flooding(const int enqueue_time) -{ - std::vector tsks; - for (int i = 0; i < enqueue_time; i++) { - auto tsk = new raw_task(LPC_TEST_TASK_QUEUE_1, empty_cb); - tsks.push_back(tsk); - } - { - auto_timer t("self-flooding test:", enqueue_time); - tasking::enqueue(LPC_TEST_TASK_QUEUE_1, nullptr, [&]() { - for (auto tsk : tsks) { - if (tsk == tsks.back()) { - tsk->add_ref(); - } - tsk->enqueue(); - } - t.start_time = t.clock.now(); - }); - tsks.back()->wait(); - tsks.back()->release_ref(); - } -} -void external_blocking(const int enqueue_time) -{ - std::vector tsks; - for (int i = 0; i < enqueue_time; i++) { - auto tsk = new raw_task(LPC_TEST_TASK_QUEUE_1, empty_cb); - tsks.push_back(tsk); - } - { - auto_timer t("inter-thread blocking test:", enqueue_time); - for (auto tsk : tsks) { - tsk->add_ref(); - tsk->enqueue(); - tsk->wait(); - tsk->release_ref(); - } - } -} -void self_iterating(const int enqueue_time) -{ - self_iterate_context ctx; - for (int i = 0; i < enqueue_time; i++) { - auto tsk = new raw_task(LPC_TEST_TASK_QUEUE_1, - [&ctx]() { iterate_over_preallocated_tasks(&ctx); }); - ctx.tsks.push_back(tsk); - } - ctx.it = ctx.tsks.begin(); - { - auto_timer t("self-iterating test:", enqueue_time); - iterate_over_preallocated_tasks(&ctx); - std::unique_lock _lk(ctx.mut); - ctx.cv.wait(_lk, [&] { return ctx.done; }); - } -} -void tic_tock_iterating(const int enqueue_time) -{ - self_iterate_context ctx; - for (int i = 0; i < enqueue_time; i++) { - auto tsk = new raw_task(i % 2 == 0 ? LPC_TEST_TASK_QUEUE_1 : LPC_TEST_TASK_QUEUE_2, - [&ctx] { iterate_over_preallocated_tasks(&ctx); }); - ctx.tsks.push_back(tsk); - } - ctx.it = ctx.tsks.begin(); - { - auto_timer t("tick-tock test:", enqueue_time); - iterate_over_preallocated_tasks(&ctx); - std::unique_lock _lk(ctx.mut); - ctx.cv.wait(_lk, [&] { return ctx.done; }); - } -} -TEST(core, task_queue_perf_test) -{ - const int enqueue_time = 10000000; - external_flooding(enqueue_time); - self_flooding(enqueue_time); - external_blocking(enqueue_time / 10); - self_iterating(enqueue_time); - tic_tock_iterating(enqueue_time / 10); -} diff --git a/src/core/perf.tests/test_utils.h b/src/core/perf.tests/test_utils.h deleted file mode 100644 index 639a90dd76..0000000000 --- a/src/core/perf.tests/test_utils.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ - -#pragma once - -#include -#include -#include - -using namespace ::dsn; - -#ifndef TEST_PORT_BEGIN -#define TEST_PORT_BEGIN 20201 -#define TEST_PORT_END 20203 -#endif - -DEFINE_THREAD_POOL_CODE(THREAD_POOL_TEST_SERVER) -DEFINE_TASK_CODE_RPC(RPC_TEST_HASH, TASK_PRIORITY_COMMON, THREAD_POOL_TEST_SERVER) -DEFINE_TASK_CODE(LPC_TEST_HASH, TASK_PRIORITY_COMMON, THREAD_POOL_TEST_SERVER) -DEFINE_TASK_CODE_RPC(RPC_TEST_STRING_COMMAND, TASK_PRIORITY_COMMON, THREAD_POOL_TEST_SERVER) - -extern int g_test_count; - -inline int exec_tests() -{ - auto ret = RUN_ALL_TESTS(); - g_test_count++; - return ret; -} - -class test_client : public ::dsn::serverlet, public ::dsn::service_app -{ -public: - test_client(const service_app_info *info) - : ::dsn::serverlet("test-server"), ::dsn::service_app(info) - { - } - - void on_rpc_test(const int &test_id, ::dsn::rpc_replier &replier) - { - std::string r = _info->data_dir; - replier(std::move(r)); - } - - void on_rpc_string_test(dsn_message_t message) - { - std::string command; - ::dsn::unmarshall(message, command); - - if (command == "expect_talk_to_others") { - dsn::rpc_address next_addr = dsn::service_app::primary_address(); - if (next_addr.port() != TEST_PORT_END) { - next_addr.assign_ipv4(next_addr.ip(), next_addr.port() + 1); - dsn_rpc_forward(message, next_addr); - } else { - reply(message, std::string(next_addr.to_string())); - } - } else if (command == "expect_no_reply") { - if (dsn::service_app::primary_address().port() == TEST_PORT_END) - reply(message, std::string(dsn::service_app::primary_address().to_string())); - } else if (command.substr(0, 5) == "echo ") { - reply(message, command.substr(5)); - } else { - derror("unknown command"); - } - } - - ::dsn::error_code start(const std::vector &args) - { - // server - if (args.size() == 1) { - register_async_rpc_handler(RPC_TEST_HASH, "rpc.test.hash", &test_client::on_rpc_test); - register_rpc_handler(RPC_TEST_STRING_COMMAND, - "rpc.test.string.command", - &test_client::on_rpc_string_test); - } - - // client - else { - std::cout << "=========================================================== " - << std::endl; - std::cout << "================== run in rDSN threads ==================== " - << std::endl; - std::cout << "=========================================================== " - << std::endl; - exec_tests(); - } - - return ::dsn::ERR_OK; - } - - ::dsn::error_code stop(bool cleanup = false) { return ERR_OK; } -}; diff --git a/src/dist/replication/test/simple_kv/case-000.ini b/src/dist/replication/test/simple_kv/case-000.ini index 1f02483fe2..9cd1013920 100644 --- a/src/dist/replication/test/simple_kv/case-000.ini +++ b/src/dist/replication/test/simple_kv/case-000.ini @@ -31,9 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 - [core] start_nfs = true @@ -50,7 +47,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +92,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-001.ini b/src/dist/replication/test/simple_kv/case-001.ini index 0edac51ea6..e38d5a6eb6 100644 --- a/src/dist/replication/test/simple_kv/case-001.ini +++ b/src/dist/replication/test/simple_kv/case-001.ini @@ -31,9 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 - [core] start_nfs = true @@ -50,7 +47,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +92,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-002.ini b/src/dist/replication/test/simple_kv/case-002.ini index 26fdcf3ac7..954c53deed 100644 --- a/src/dist/replication/test/simple_kv/case-002.ini +++ b/src/dist/replication/test/simple_kv/case-002.ini @@ -31,9 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 - [core] start_nfs = true @@ -50,7 +47,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +92,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-003.ini b/src/dist/replication/test/simple_kv/case-003.ini index 50cc09e54b..fbce996b06 100644 --- a/src/dist/replication/test/simple_kv/case-003.ini +++ b/src/dist/replication/test/simple_kv/case-003.ini @@ -31,9 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 - [core] start_nfs = true @@ -50,7 +47,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +92,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-004.ini b/src/dist/replication/test/simple_kv/case-004.ini index 2a5b1d3d77..3da94d6156 100644 --- a/src/dist/replication/test/simple_kv/case-004.ini +++ b/src/dist/replication/test/simple_kv/case-004.ini @@ -31,9 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 - [core] start_nfs = true @@ -50,7 +47,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +92,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-005.ini b/src/dist/replication/test/simple_kv/case-005.ini index d115021ee3..c260d65779 100644 --- a/src/dist/replication/test/simple_kv/case-005.ini +++ b/src/dist/replication/test/simple_kv/case-005.ini @@ -31,9 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 - [core] start_nfs = true @@ -50,7 +47,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +92,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-006.ini b/src/dist/replication/test/simple_kv/case-006.ini index 0edac51ea6..ee4f955517 100644 --- a/src/dist/replication/test/simple_kv/case-006.ini +++ b/src/dist/replication/test/simple_kv/case-006.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-100.ini b/src/dist/replication/test/simple_kv/case-100.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-100.ini +++ b/src/dist/replication/test/simple_kv/case-100.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-101.ini b/src/dist/replication/test/simple_kv/case-101.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-101.ini +++ b/src/dist/replication/test/simple_kv/case-101.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-102.ini b/src/dist/replication/test/simple_kv/case-102.ini index 5bafe318ec..9dfcf77c59 100644 --- a/src/dist/replication/test/simple_kv/case-102.ini +++ b/src/dist/replication/test/simple_kv/case-102.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-103.ini b/src/dist/replication/test/simple_kv/case-103.ini index 7459a02f8e..4223583409 100644 --- a/src/dist/replication/test/simple_kv/case-103.ini +++ b/src/dist/replication/test/simple_kv/case-103.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-104.ini b/src/dist/replication/test/simple_kv/case-104.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-104.ini +++ b/src/dist/replication/test/simple_kv/case-104.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-105.ini b/src/dist/replication/test/simple_kv/case-105.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-105.ini +++ b/src/dist/replication/test/simple_kv/case-105.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-106.ini b/src/dist/replication/test/simple_kv/case-106.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-106.ini +++ b/src/dist/replication/test/simple_kv/case-106.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-107.ini b/src/dist/replication/test/simple_kv/case-107.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-107.ini +++ b/src/dist/replication/test/simple_kv/case-107.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-108.ini b/src/dist/replication/test/simple_kv/case-108.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-108.ini +++ b/src/dist/replication/test/simple_kv/case-108.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-109.ini b/src/dist/replication/test/simple_kv/case-109.ini index 00d5325609..9b5b84807f 100644 --- a/src/dist/replication/test/simple_kv/case-109.ini +++ b/src/dist/replication/test/simple_kv/case-109.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-200.ini b/src/dist/replication/test/simple_kv/case-200.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-200.ini +++ b/src/dist/replication/test/simple_kv/case-200.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-201.ini b/src/dist/replication/test/simple_kv/case-201.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-201.ini +++ b/src/dist/replication/test/simple_kv/case-201.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-202-0.ini b/src/dist/replication/test/simple_kv/case-202-0.ini index 28be2b25c5..3fd7e0d44d 100644 --- a/src/dist/replication/test/simple_kv/case-202-0.ini +++ b/src/dist/replication/test/simple_kv/case-202-0.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-202-1.ini b/src/dist/replication/test/simple_kv/case-202-1.ini index 28be2b25c5..3fd7e0d44d 100644 --- a/src/dist/replication/test/simple_kv/case-202-1.ini +++ b/src/dist/replication/test/simple_kv/case-202-1.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-203-0.ini b/src/dist/replication/test/simple_kv/case-203-0.ini index e123d13c3b..1e0024f9d5 100644 --- a/src/dist/replication/test/simple_kv/case-203-0.ini +++ b/src/dist/replication/test/simple_kv/case-203-0.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-203-1.ini b/src/dist/replication/test/simple_kv/case-203-1.ini index e123d13c3b..1e0024f9d5 100644 --- a/src/dist/replication/test/simple_kv/case-203-1.ini +++ b/src/dist/replication/test/simple_kv/case-203-1.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-204.ini b/src/dist/replication/test/simple_kv/case-204.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-204.ini +++ b/src/dist/replication/test/simple_kv/case-204.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-205.ini b/src/dist/replication/test/simple_kv/case-205.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-205.ini +++ b/src/dist/replication/test/simple_kv/case-205.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-206.ini b/src/dist/replication/test/simple_kv/case-206.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-206.ini +++ b/src/dist/replication/test/simple_kv/case-206.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-207.ini b/src/dist/replication/test/simple_kv/case-207.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-207.ini +++ b/src/dist/replication/test/simple_kv/case-207.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-208.ini b/src/dist/replication/test/simple_kv/case-208.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-208.ini +++ b/src/dist/replication/test/simple_kv/case-208.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-209.ini b/src/dist/replication/test/simple_kv/case-209.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-209.ini +++ b/src/dist/replication/test/simple_kv/case-209.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-210.ini b/src/dist/replication/test/simple_kv/case-210.ini index 22add149b7..ab16d72431 100644 --- a/src/dist/replication/test/simple_kv/case-210.ini +++ b/src/dist/replication/test/simple_kv/case-210.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-211.ini b/src/dist/replication/test/simple_kv/case-211.ini index 22add149b7..ab16d72431 100644 --- a/src/dist/replication/test/simple_kv/case-211.ini +++ b/src/dist/replication/test/simple_kv/case-211.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-212.ini b/src/dist/replication/test/simple_kv/case-212.ini index 22add149b7..ab16d72431 100644 --- a/src/dist/replication/test/simple_kv/case-212.ini +++ b/src/dist/replication/test/simple_kv/case-212.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-213.ini b/src/dist/replication/test/simple_kv/case-213.ini index 554f28a7a7..09a3f02324 100644 --- a/src/dist/replication/test/simple_kv/case-213.ini +++ b/src/dist/replication/test/simple_kv/case-213.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-214.ini b/src/dist/replication/test/simple_kv/case-214.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-214.ini +++ b/src/dist/replication/test/simple_kv/case-214.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-215.ini b/src/dist/replication/test/simple_kv/case-215.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-215.ini +++ b/src/dist/replication/test/simple_kv/case-215.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-216.ini b/src/dist/replication/test/simple_kv/case-216.ini index a4a4310c3e..f0fb1a5973 100644 --- a/src/dist/replication/test/simple_kv/case-216.ini +++ b/src/dist/replication/test/simple_kv/case-216.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-300-0.ini b/src/dist/replication/test/simple_kv/case-300-0.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-300-0.ini +++ b/src/dist/replication/test/simple_kv/case-300-0.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-300-1.ini b/src/dist/replication/test/simple_kv/case-300-1.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-300-1.ini +++ b/src/dist/replication/test/simple_kv/case-300-1.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-300-2.ini b/src/dist/replication/test/simple_kv/case-300-2.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-300-2.ini +++ b/src/dist/replication/test/simple_kv/case-300-2.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-301.ini b/src/dist/replication/test/simple_kv/case-301.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-301.ini +++ b/src/dist/replication/test/simple_kv/case-301.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-302.ini b/src/dist/replication/test/simple_kv/case-302.ini index 361bf821ed..ba1d0ffce1 100644 --- a/src/dist/replication/test/simple_kv/case-302.ini +++ b/src/dist/replication/test/simple_kv/case-302.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-303.ini b/src/dist/replication/test/simple_kv/case-303.ini index 6d34011852..5f7d91c1b3 100644 --- a/src/dist/replication/test/simple_kv/case-303.ini +++ b/src/dist/replication/test/simple_kv/case-303.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-304.ini b/src/dist/replication/test/simple_kv/case-304.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-304.ini +++ b/src/dist/replication/test/simple_kv/case-304.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-305.ini b/src/dist/replication/test/simple_kv/case-305.ini index 6d34011852..5f7d91c1b3 100644 --- a/src/dist/replication/test/simple_kv/case-305.ini +++ b/src/dist/replication/test/simple_kv/case-305.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-306.ini b/src/dist/replication/test/simple_kv/case-306.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-306.ini +++ b/src/dist/replication/test/simple_kv/case-306.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-307.ini b/src/dist/replication/test/simple_kv/case-307.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-307.ini +++ b/src/dist/replication/test/simple_kv/case-307.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-400.ini b/src/dist/replication/test/simple_kv/case-400.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-400.ini +++ b/src/dist/replication/test/simple_kv/case-400.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-401.ini b/src/dist/replication/test/simple_kv/case-401.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-401.ini +++ b/src/dist/replication/test/simple_kv/case-401.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-402.ini b/src/dist/replication/test/simple_kv/case-402.ini index 1f02483fe2..b6fbf03a87 100644 --- a/src/dist/replication/test/simple_kv/case-402.ini +++ b/src/dist/replication/test/simple_kv/case-402.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-600.ini b/src/dist/replication/test/simple_kv/case-600.ini index 0edac51ea6..ee4f955517 100644 --- a/src/dist/replication/test/simple_kv/case-600.ini +++ b/src/dist/replication/test/simple_kv/case-600.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-601.ini b/src/dist/replication/test/simple_kv/case-601.ini index 63dc3f91b4..0a8ca8f1cd 100644 --- a/src/dist/replication/test/simple_kv/case-601.ini +++ b/src/dist/replication/test/simple_kv/case-601.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-602.ini b/src/dist/replication/test/simple_kv/case-602.ini index 0edac51ea6..ee4f955517 100644 --- a/src/dist/replication/test/simple_kv/case-602.ini +++ b/src/dist/replication/test/simple_kv/case-602.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/case-603.ini b/src/dist/replication/test/simple_kv/case-603.ini index 9e012574ea..ddca4d0ac2 100644 --- a/src/dist/replication/test/simple_kv/case-603.ini +++ b/src/dist/replication/test/simple_kv/case-603.ini @@ -31,8 +31,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 20480000 [core] start_nfs = true @@ -50,7 +48,6 @@ cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] @@ -96,8 +93,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 -perf_test_rounds = 1000000 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/dist/replication/test/simple_kv/config.ini b/src/dist/replication/test/simple_kv/config.ini index ccde4f922e..2d81336ab3 100644 --- a/src/dist/replication/test/simple_kv/config.ini +++ b/src/dist/replication/test/simple_kv/config.ini @@ -48,8 +48,6 @@ run = true count = 1 pools = THREAD_POOL_DEFAULT -[tools.hpc_tail_logger] -per_thread_buffer_bytes = 2048000 [core] start_nfs = true @@ -65,7 +63,6 @@ pause_on_start = false ;logging_start_level = LOG_LEVEL_WARNING ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_tail_logger ;logging_factory_name = dsn::tools::hpc_logger ;aio_factory_name = dsn::tools::empty_aio_provider @@ -107,8 +104,6 @@ rpc_timeout_milliseconds = 5000 disk_write_fail_ratio = 0.0 disk_read_fail_ratio = 0.00001 -perf_test_seconds = 30 -perf_test_payload_bytes = 1,128,1024 [task.LPC_AIO_IMMEDIATE_CALLBACK] is_trace = false diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index a94a3104d6..f52dff446e 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,4 +1 @@ add_subdirectory(dsn) -if(WIN32) - add_subdirectory(idl) -endif() diff --git a/src/tests/idl/CMakeLists.txt b/src/tests/idl/CMakeLists.txt deleted file mode 100644 index ed57e42a40..0000000000 --- a/src/tests/idl/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -set(MY_PROJ_NAME dsn.idl.tests) - -# Source files under CURRENT project directory will be automatically included. -# You can manually set MY_PROJ_SRC to include source files under other directories. -set(MY_PROJ_SRC "") - -# Search mode for source files under CURRENT project directory? -# "GLOB_RECURSE" for recursive search -# "GLOB" for non-recursive search -set(MY_SRC_SEARCH_MODE "GLOB") - -set(MY_PROJ_INC_PATH - ${GTEST_INCLUDE_DIR} -) - -set(MY_PROJ_LIBS gtest -) - -set(MY_PROJ_LIB_PATH - "${GTEST_LIB_DIR}" -) - -set(MY_BOOST_PACKAGES system filesystem) - -# Extra files that will be installed - -if (UNIX) - set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/run.sh") -endif () - -set(MY_PROJ_BINDIRS - "${CMAKE_CURRENT_SOURCE_DIR}/resources" -) - -# For Windows style path -if (WIN32) - STRING(REGEX REPLACE "/" "\\\\" WIN_THRIFT_INCLUDE_DIR ${THRIFT_INCLUDE_DIR}) - STRING(REGEX REPLACE "/" "\\\\" WIN_THRIFT_LIB_DIR ${THRIFT_LIB_DIR}) - STRING(REGEX REPLACE "/" "\\\\" WIN_PROTOBUF_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIR}) - STRING(REGEX REPLACE "/" "\\\\" WIN_PROTOBUF_LIB_DIR ${PROTOBUF_LIB_DIR}) - STRING(REGEX REPLACE "/" "\\\\" WIN_PROTOBUF_BIN_DIR ${PROTOBUF_BIN_DIR}) - STRING(REGEX REPLACE "/" "\\\\" WIN_BOOST_INCLUDE_DIR ${BOOST_INCLUDEDIR}) - STRING(REGEX REPLACE "/" "\\\\" WIN_SOURCE_TOP_DIR ${CMAKE_SOURCE_DIR}) - STRING(REGEX REPLACE "/" "\\\\" WIN_BINARY_TOP_DIR ${CMAKE_BINARY_DIR}) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/resources/sbin/mock_install.cmd.template" "${CMAKE_CURRENT_SOURCE_DIR}/resources/sbin/mock_install.cmd") -else () - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/resources/sbin/run.sh.template" "${CMAKE_CURRENT_SOURCE_DIR}/run.sh") -endif () - -set(MY_SERIALIZATION_TYPE - "thrift" - "protobuf" -) - -dsn_add_executable() diff --git a/src/tests/idl/idl_test.main.cpp b/src/tests/idl/idl_test.main.cpp deleted file mode 100644 index a40cec6844..0000000000 --- a/src/tests/idl/idl_test.main.cpp +++ /dev/null @@ -1,497 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015 Microsoft Corporation - * - * -=- Robust Distributed System Nucleus (rDSN) -=- - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ - -#include -#include -#include -#include - -#include "idl_test.types.h" - -#include -#include -#include "stdlib.h" - -//#define DSN_IDL_TESTS_DEBUG - -enum Language -{ - lang_cpp, - lang_csharp -}; -enum IDL -{ - idl_protobuf, - idl_thrift -}; -enum Format -{ - format_binary, - format_json -}; - -std::string DSN_ROOT; -std::string RESOURCE_ROOT; - -std::string file(const std::string &val) -{ - std::string nval; - dsn::utils::filesystem::get_normalized_path(val, nval); - return nval; -} - -std::string file(const char *val) { return file(std::string(val)); } - -std::string combine(const std::string &dir, const char *sub) -{ - return dsn::utils::filesystem::path_combine(file(dir), file(sub)); -} - -std::string combine(const std::string &dir, const std::string &sub) -{ - return dsn::utils::filesystem::path_combine(file(dir), file(sub)); -} - -void execute(std::string cmd, bool &result) -{ -#ifdef DSN_IDL_TESTS_DEBUG - std::cout << cmd << std::endl; -#else - cmd = cmd + std::string(" >> log"); -#endif - bool ret = !((bool)system(cmd.c_str())); - result = result && ret; -} - -void copy_file(const std::string &src, const std::string &dst, bool &result) -{ -#ifdef _WIN32 - std::string cmd = std::string("copy /Y "); -#else - std::string cmd = std::string("cp -f "); -#endif - cmd += src + " " + dst; - execute(cmd, result); -} - -void create_dir(const char *dir, bool &result) -{ - bool ret = dsn::utils::filesystem::create_directory(file(dir)); - result = result && ret; -} - -void rm_dir(const char *dir, bool &result) -{ -#ifdef _WIN32 - std::string cmd = std::string("rd /S /Q ") + file(dir); -#else - std::string cmd = std::string("rm -rf ") + file(dir); -#endif - execute(cmd, result); -} - -void cmake(Language lang, bool &result) -{ - create_dir("builder", result); - std::string cmake_cmd = std::string("cd builder && cmake ") + file("../src"); -#ifdef _WIN32 - cmake_cmd += std::string(" -DCMAKE_GENERATOR_PLATFORM=x64"); -#endif - execute(cmake_cmd, result); - if (lang == lang_cpp) { -#ifdef _WIN32 - execute(std::string("msbuild ") + file("builder/counter.sln"), result); - execute(file("builder/bin/counter/Debug/counter.exe") + " " + - file("builder/bin/counter/config.ini"), - result); -#else - execute(std::string("cd builder && make "), result); - execute(file("builder/bin/counter/counter") + " " + file("builder/bin/counter/config.ini"), - result); -#endif - } else { - execute(file("builder/bin/counter/counter.exe") + " " + - file("builder/bin/counter/config.ini"), - result); - } -} - -bool test_code_generation(Language lang, IDL idl, Format format) -{ - bool result = true; -#ifdef _WIN32 - std::string codegen_bash("bin/dsn.cg.bat"); -#else - std::string codegen_bash("bin/dsn.cg.sh"); -#endif - std::string codegen_cmd = combine(DSN_ROOT, codegen_bash) + std::string(" counter.") + - (idl == idl_protobuf ? "proto" : "thrift") + - (lang == lang_cpp ? " cpp" : " csharp") + " src " + - (format == format_binary ? "binary" : "json") + " single"; - create_dir("src", result); - execute(codegen_cmd, result); - std::vector src_files; - std::string src_root(lang == lang_cpp ? "repo/cpp" : "repo/csharp"); - if (lang == lang_cpp) { - src_files.push_back("counter.main.cpp"); - } else { - src_files.push_back("counter.main.cs"); - } - for (auto i : src_files) { - copy_file(combine(combine(RESOURCE_ROOT, src_root), i), file("src"), result); - } - cmake(lang, result); - rm_dir("data", result); - rm_dir("builder", result); - rm_dir("src", result); - return result; -} - -template -void thrift_basic_type_serialization_checker(std::vector &data, Format fmt) -{ - const int bufsize = 2000; - char buf[bufsize]; - for (const T &i : data) { - T input = i; - dsn::blob b(buf, 0, bufsize); - dsn::binary_writer writer(b); - if (fmt == format_binary) { - dsn::marshall_thrift_binary(writer, input); - } else { - dsn::marshall_thrift_json(writer, input); - } - dsn::binary_reader reader(b); - T output; - if (fmt == format_binary) { - dsn::unmarshall_thrift_binary(reader, output); - } else { - dsn::unmarshall_thrift_json(reader, output); - } - EXPECT_TRUE(input == output); - } -} -void test_thrift_basic_type_serialization(Format fmt) -{ - std::vector data_bool_t{true, false}; - thrift_basic_type_serialization_checker(data_bool_t, fmt); - - std::vector data_int8_t{ - std::numeric_limits::min(), std::numeric_limits::max(), 0, 1, -1, 13, -13}; - thrift_basic_type_serialization_checker(data_int8_t, fmt); - - std::vector data_int16_t{std::numeric_limits::min(), - std::numeric_limits::max(), - 0, - 1, - -1, - 13, - -13}; - thrift_basic_type_serialization_checker(data_int16_t, fmt); - - std::vector data_int32_t{std::numeric_limits::min(), - std::numeric_limits::max(), - 0, - 1, - -1, - 13, - -13}; - thrift_basic_type_serialization_checker(data_int32_t, fmt); - - std::vector data_int64_t{std::numeric_limits::min(), - std::numeric_limits::max(), - 0, - 1, - -1, - 13, - -13}; - thrift_basic_type_serialization_checker(data_int32_t, fmt); - - std::vector data_string_t{ - std::string("hello"), std::string("world"), std::string("")}; - thrift_basic_type_serialization_checker(data_string_t, fmt); - - // TODO:: test double type - - std::vector> data_vec_int32_t{data_int32_t, std::vector()}; - thrift_basic_type_serialization_checker(data_vec_int32_t, fmt); - - std::map m1; - m1[1] = "hello"; - m1[233] = "world"; - m1[-22] = ""; - std::map m2; - std::vector> data_map_int32_str_t{m1, m2}; - thrift_basic_type_serialization_checker(data_map_int32_str_t, fmt); -} - -void check_thrift_generated_type_serialization(const dsn::idl::test::test_thrift_item &input, - Format fmt) -{ - const int bufsize = 2000; - char buf[bufsize]; - dsn::blob b(buf, 0, bufsize); - dsn::binary_writer writer(b); - if (fmt == format_binary) { - dsn::marshall_thrift_binary(writer, input); - } else { - dsn::marshall_thrift_json(writer, input); - } - dsn::binary_reader reader(b); - dsn::idl::test::test_thrift_item output; - if (fmt == format_binary) { - dsn::unmarshall_thrift_binary(reader, output); - } else { - dsn::unmarshall_thrift_json(reader, output); - } - EXPECT_EQ(input.bool_item, output.bool_item); - EXPECT_EQ(input.byte_item, output.byte_item); - EXPECT_EQ(input.i16_item, output.i16_item); - EXPECT_EQ(input.i32_item, output.i32_item); - EXPECT_EQ(input.i64_item, output.i64_item); - EXPECT_EQ(input.list_i32_item, output.list_i32_item); - EXPECT_EQ(input.set_i32_item, output.set_i32_item); - EXPECT_EQ(input.map_i32_item, output.map_i32_item); - EXPECT_DOUBLE_EQ(input.double_item, output.double_item); -} - -void test_thrift_generated_type_serialization(Format fmt) -{ - const int container_n = 10; - dsn::idl::test::test_thrift_item item; - - item.bool_item = false; - item.byte_item = 0; - item.i16_item = 0; - item.i32_item = 0; - item.i64_item = 0; - item.double_item = 0.0; - check_thrift_generated_type_serialization(item, fmt); - - item.bool_item = true; - item.byte_item = std::numeric_limits::max(); - item.i16_item = std::numeric_limits::max(); - item.i32_item = std::numeric_limits::max(); - item.i64_item = std::numeric_limits::max(); - item.double_item = 123.321; - item.string_item = "hello world"; - for (int i = 0; i < container_n; i++) { - item.list_i32_item.push_back(i); - } - for (int i = 0; i < container_n; i++) { - item.set_i32_item.insert(item.set_i32_item.begin(), i + 1); - } - for (int i = 0; i < container_n; i++) { - item.map_i32_item[i] = i * 2; - } - check_thrift_generated_type_serialization(item, fmt); -} - -void check_protobuf_generated_type_serialization(const dsn::idl::test::test_protobuf_item &input, - Format fmt) -{ - const int bufsize = 2000; - char buf[bufsize]; - dsn::blob b(buf, 0, bufsize); - dsn::binary_writer writer(b); - if (fmt == format_binary) { - dsn::marshall_protobuf_binary(writer, input); - } else { - dsn::marshall_protobuf_json(writer, input); - } - dsn::binary_reader reader(b); - dsn::idl::test::test_protobuf_item output; - if (fmt == format_binary) { - dsn::unmarshall_protobuf_binary(reader, output); - } else { - dsn::unmarshall_protobuf_json(reader, output); - } - EXPECT_EQ(input.bool_item(), output.bool_item()); - EXPECT_EQ(input.int32_item(), output.int32_item()); - EXPECT_EQ(input.int64_item(), output.int64_item()); - EXPECT_EQ(input.uint32_item(), output.uint32_item()); - EXPECT_EQ(input.uint64_item(), output.uint64_item()); - EXPECT_EQ(input.string_item(), output.string_item()); - EXPECT_FLOAT_EQ(input.float_item(), output.float_item()); - EXPECT_DOUBLE_EQ(input.double_item(), output.double_item()); - for (int i = 0; i < input.repeated_int32_item_size(); i++) { - EXPECT_EQ(input.repeated_int32_item().Get(i), output.repeated_int32_item().Get(i)); - } - EXPECT_EQ(input.map_int32_item_size(), output.map_int32_item_size()); - for (auto i = input.map_int32_item().begin(); i != input.map_int32_item().end(); i++) { - EXPECT_TRUE(output.map_int32_item().find(i->first) != output.map_int32_item().end()); - if (output.map_int32_item().find(i->first) != output.map_int32_item().end()) { - EXPECT_EQ(i->second, output.map_int32_item().at(i->first)); - } - } -} - -void test_protobuf_generated_type_serialization(Format fmt) -{ - const int container_n = 10; - dsn::idl::test::test_protobuf_item item; - - check_protobuf_generated_type_serialization(item, fmt); - - item.set_bool_item(true); - item.set_int32_item(std::numeric_limits::max()); - item.set_int64_item(std::numeric_limits::max()); - item.set_uint32_item(std::numeric_limits::max()); - item.set_uint64_item(std::numeric_limits::max()); - item.set_float_item(123.321); - item.set_double_item(1234.4321); - item.set_string_item("hello world"); - for (int i = 0; i < container_n; i++) { - item.add_repeated_int32_item(i); - } - for (int i = 0; i < container_n; i++) { - auto mp = item.mutable_map_int32_item(); - (*mp)[i] = 2 * i; - } - check_protobuf_generated_type_serialization(item, fmt); -} - -bool prepare() -{ - bool ret = true; - std::vector idl_files; - idl_files.push_back("repo/counter.proto"); - idl_files.push_back("repo/counter.proto.annotations"); - idl_files.push_back("repo/counter.thrift"); - idl_files.push_back("repo/counter.thrift.annotations"); - for (auto i : idl_files) { - copy_file(combine(RESOURCE_ROOT, i), file("./"), ret); - } - return ret; -} - -/* -#ifdef WIN32 - -TEST(TEST_PROTOBUF_HELPER, CSHARP_BINARY) -{ - EXPECT_TRUE(test_code_generation(lang_csharp, idl_protobuf, format_binary)); -} - -TEST(TEST_PROTOBUF_HELPER, CSHARP_JSON) -{ - EXPECT_TRUE(test_code_generation(lang_csharp, idl_protobuf, format_json)); -} - -#endif -*/ - -TEST(thrift_helper, cpp_binary_basic_type_serialization) -{ - test_thrift_basic_type_serialization(format_binary); -} - -TEST(thrift_helper, cpp_binary_generated_type_serialization) -{ - test_thrift_generated_type_serialization(format_binary); -} - -TEST(thrift_helper, cpp_json_basic_type_serialization) -{ - test_thrift_basic_type_serialization(format_json); -} - -TEST(thrift_helper, cpp_json_generated_type_serialization) -{ - test_thrift_generated_type_serialization(format_json); -} - -TEST(thrift_helper, cpp_binary_code_generation) -{ - EXPECT_TRUE(test_code_generation(lang_cpp, idl_thrift, format_binary)); -} - -TEST(thrift_helper, cpp_json_code_generation) -{ - EXPECT_TRUE(test_code_generation(lang_cpp, idl_thrift, format_json)); -} - -TEST(protobuf_helper, cpp_binary_generated_type_serialization) -{ - test_protobuf_generated_type_serialization(format_binary); -} - -TEST(protobuf_helper, cpp_json_generated_type_serialization) -{ - test_protobuf_generated_type_serialization(format_json); -} - -TEST(protobuf_helper, cpp_binary_code_generation) -{ - EXPECT_TRUE(test_code_generation(lang_cpp, idl_protobuf, format_binary)); -} - -TEST(protobuf_helper, cpp_json_code_generation) -{ - EXPECT_TRUE(test_code_generation(lang_cpp, idl_protobuf, format_json)); -} - -/* -#ifdef WIN32 - -TEST(TEST_THRIFT_HELPER, CSHARP_BINARY) -{ - EXPECT_TRUE(test_code_generation(lang_csharp, idl_thrift, format_binary)); -} - -TEST(TEST_THRIFT_HELPER, CSHARP_JSON) -{ - EXPECT_TRUE(test_code_generation(lang_csharp, idl_thrift, format_json)); -} - -#endif -*/ - -GTEST_API_ int main(int argc, char **argv) -{ - if (argc < 3) { - std::cout << "invalid parameters" << std::endl; - return 1; - } - // DSN_ROOT is the path where directory "rdsn" exists - // RESOURCE_ROOT is the path where directory "repo" exists - DSN_ROOT = std::string(argv[1]); - RESOURCE_ROOT = std::string(argv[2]); - if (!prepare()) { - return 1; - } - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/src/tests/idl/idl_test.pb.cc b/src/tests/idl/idl_test.pb.cc deleted file mode 100644 index 528e342eeb..0000000000 --- a/src/tests/idl/idl_test.pb.cc +++ /dev/null @@ -1,1022 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: idl_test.proto - -#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION -#include "idl_test.pb.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -// @@protoc_insertion_point(includes) - -namespace dsn { -namespace idl { -namespace test { - -namespace { - -const ::google::protobuf::Descriptor *test_protobuf_item_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection *test_protobuf_item_reflection_ = - NULL; -const ::google::protobuf::Descriptor *test_protobuf_item_MapInt32ItemEntry_descriptor_ = NULL; - -} // namespace - -void protobuf_AssignDesc_idl_5ftest_2eproto() -{ - protobuf_AddDesc_idl_5ftest_2eproto(); - const ::google::protobuf::FileDescriptor *file = - ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName("idl_test.proto"); - GOOGLE_CHECK(file != NULL); - test_protobuf_item_descriptor_ = file->message_type(0); - static const int test_protobuf_item_offsets_[10] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, bool_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, int32_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, int64_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, uint32_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, uint64_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, float_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, double_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, string_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, map_int32_item_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, repeated_int32_item_), - }; - test_protobuf_item_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - test_protobuf_item_descriptor_, - test_protobuf_item::default_instance_, - test_protobuf_item_offsets_, - -1, - -1, - -1, - sizeof(test_protobuf_item), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, _internal_metadata_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(test_protobuf_item, - _is_default_instance_)); - test_protobuf_item_MapInt32ItemEntry_descriptor_ = - test_protobuf_item_descriptor_->nested_type(0); -} - -namespace { - -GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_); -inline void protobuf_AssignDescriptorsOnce() -{ - ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_, - &protobuf_AssignDesc_idl_5ftest_2eproto); -} - -void protobuf_RegisterTypes(const ::std::string &) -{ - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - test_protobuf_item_descriptor_, &test_protobuf_item::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - test_protobuf_item_MapInt32ItemEntry_descriptor_, - ::google::protobuf::internal::MapEntry< - ::google::protobuf::int32, - ::google::protobuf::int32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32, - 0>::CreateDefaultInstance(test_protobuf_item_MapInt32ItemEntry_descriptor_)); -} - -} // namespace - -void protobuf_ShutdownFile_idl_5ftest_2eproto() -{ - delete test_protobuf_item::default_instance_; - delete test_protobuf_item_reflection_; -} - -void protobuf_AddDesc_idl_5ftest_2eproto() -{ - static bool already_here = false; - if (already_here) - return; - already_here = true; - GOOGLE_PROTOBUF_VERIFY_VERSION; - - ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\016idl_test.proto\022\014dsn.idl.test\"\325\002\n\022test_" - "protobuf_item\022\021\n\tbool_item\030\001 \001(\010\022\022\n\nint3" - "2_item\030\002 \001(\005\022\022\n\nint64_item\030\003 \001(\003\022\023\n\013uint" - "32_item\030\004 \001(\r\022\023\n\013uint64_item\030\005 \001(\004\022\022\n\nfl" - "oat_item\030\006 \001(\002\022\023\n\013double_item\030\007 \001(\001\022\023\n\013s" - "tring_item\030\010 \001(\t\022J\n\016map_int32_item\030\t \003(\013" - "22.dsn.idl.test.test_protobuf_item.MapIn" - "t32ItemEntry\022\033\n\023repeated_int32_item\030\n \003(" - "\005\0323\n\021MapInt32ItemEntry\022\013\n\003key\030\001 \001(\005\022\r\n\005v" - "alue\030\002 \001(\005:\0028\001b\006proto3", - 382); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile("idl_test.proto", - &protobuf_RegisterTypes); - test_protobuf_item::default_instance_ = new test_protobuf_item(); - test_protobuf_item::default_instance_->InitAsDefaultInstance(); - ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_idl_5ftest_2eproto); -} - -// Force AddDescriptors() to be called at static initialization time. -struct StaticDescriptorInitializer_idl_5ftest_2eproto -{ - StaticDescriptorInitializer_idl_5ftest_2eproto() { protobuf_AddDesc_idl_5ftest_2eproto(); } -} static_descriptor_initializer_idl_5ftest_2eproto_; - -namespace { - -static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD; -static void MergeFromFail(int line) { GOOGLE_CHECK(false) << __FILE__ << ":" << line; } - -} // namespace - -// =================================================================== - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int test_protobuf_item::kBoolItemFieldNumber; -const int test_protobuf_item::kInt32ItemFieldNumber; -const int test_protobuf_item::kInt64ItemFieldNumber; -const int test_protobuf_item::kUint32ItemFieldNumber; -const int test_protobuf_item::kUint64ItemFieldNumber; -const int test_protobuf_item::kFloatItemFieldNumber; -const int test_protobuf_item::kDoubleItemFieldNumber; -const int test_protobuf_item::kStringItemFieldNumber; -const int test_protobuf_item::kMapInt32ItemFieldNumber; -const int test_protobuf_item::kRepeatedInt32ItemFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - -test_protobuf_item::test_protobuf_item() : ::google::protobuf::Message(), _internal_metadata_(NULL) -{ - SharedCtor(); - // @@protoc_insertion_point(constructor:dsn.idl.test.test_protobuf_item) -} - -void test_protobuf_item::InitAsDefaultInstance() { _is_default_instance_ = true; } - -test_protobuf_item::test_protobuf_item(const test_protobuf_item &from) - : ::google::protobuf::Message(), _internal_metadata_(NULL) -{ - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:dsn.idl.test.test_protobuf_item) -} - -void test_protobuf_item::SharedCtor() -{ - _is_default_instance_ = false; - ::google::protobuf::internal::GetEmptyString(); - _cached_size_ = 0; - bool_item_ = false; - int32_item_ = 0; - int64_item_ = GOOGLE_LONGLONG(0); - uint32_item_ = 0u; - uint64_item_ = GOOGLE_ULONGLONG(0); - float_item_ = 0; - double_item_ = 0; - string_item_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - map_int32_item_.SetAssignDescriptorCallback(protobuf_AssignDescriptorsOnce); - map_int32_item_.SetEntryDescriptor( - &::dsn::idl::test::test_protobuf_item_MapInt32ItemEntry_descriptor_); -} - -test_protobuf_item::~test_protobuf_item() -{ - // @@protoc_insertion_point(destructor:dsn.idl.test.test_protobuf_item) - SharedDtor(); -} - -void test_protobuf_item::SharedDtor() -{ - string_item_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } -} - -void test_protobuf_item::SetCachedSize(int size) const -{ - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ::google::protobuf::Descriptor *test_protobuf_item::descriptor() -{ - protobuf_AssignDescriptorsOnce(); - return test_protobuf_item_descriptor_; -} - -const test_protobuf_item &test_protobuf_item::default_instance() -{ - if (default_instance_ == NULL) - protobuf_AddDesc_idl_5ftest_2eproto(); - return *default_instance_; -} - -test_protobuf_item *test_protobuf_item::default_instance_ = NULL; - -test_protobuf_item *test_protobuf_item::New(::google::protobuf::Arena *arena) const -{ - test_protobuf_item *n = new test_protobuf_item; - if (arena != NULL) { - arena->Own(n); - } - return n; -} - -void test_protobuf_item::Clear() -{ -#define ZR_HELPER_(f) reinterpret_cast(&reinterpret_cast(16)->f) - -#define ZR_(first, last) \ - do { \ - ::memset(&first, 0, ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last)); \ - } while (0) - - ZR_(bool_item_, double_item_); - string_item_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - -#undef ZR_HELPER_ -#undef ZR_ - - map_int32_item_.Clear(); - repeated_int32_item_.Clear(); -} - -bool test_protobuf_item::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream *input) -{ -#define DO_(EXPRESSION) \ - if (!(EXPRESSION)) \ - goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:dsn.idl.test.test_protobuf_item) - for (;;) { - ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); - tag = p.first; - if (!p.second) - goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bool bool_item = 1; - case 1: { - if (tag == 8) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, - ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(input, &bool_item_))); - - } else { - goto handle_unusual; - } - if (input->ExpectTag(16)) - goto parse_int32_item; - break; - } - - // optional int32 int32_item = 2; - case 2: { - if (tag == 16) { - parse_int32_item: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(input, - &int32_item_))); - - } else { - goto handle_unusual; - } - if (input->ExpectTag(24)) - goto parse_int64_item; - break; - } - - // optional int64 int64_item = 3; - case 3: { - if (tag == 24) { - parse_int64_item: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, - ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(input, - &int64_item_))); - - } else { - goto handle_unusual; - } - if (input->ExpectTag(32)) - goto parse_uint32_item; - break; - } - - // optional uint32 uint32_item = 4; - case 4: { - if (tag == 32) { - parse_uint32_item: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, - ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(input, - &uint32_item_))); - - } else { - goto handle_unusual; - } - if (input->ExpectTag(40)) - goto parse_uint64_item; - break; - } - - // optional uint64 uint64_item = 5; - case 5: { - if (tag == 40) { - parse_uint64_item: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, - ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(input, - &uint64_item_))); - - } else { - goto handle_unusual; - } - if (input->ExpectTag(53)) - goto parse_float_item; - break; - } - - // optional float float_item = 6; - case 6: { - if (tag == 53) { - parse_float_item: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - float, - ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(input, - &float_item_))); - - } else { - goto handle_unusual; - } - if (input->ExpectTag(57)) - goto parse_double_item; - break; - } - - // optional double double_item = 7; - case 7: { - if (tag == 57) { - parse_double_item: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, - ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(input, - &double_item_))); - - } else { - goto handle_unusual; - } - if (input->ExpectTag(66)) - goto parse_string_item; - break; - } - - // optional string string_item = 8; - case 8: { - if (tag == 66) { - parse_string_item: - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_string_item())); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->string_item().data(), - this->string_item().length(), - ::google::protobuf::internal::WireFormatLite::PARSE, - "dsn.idl.test.test_protobuf_item.string_item")); - } else { - goto handle_unusual; - } - if (input->ExpectTag(74)) - goto parse_map_int32_item; - break; - } - - // map map_int32_item = 9; - case 9: { - if (tag == 74) { - parse_map_int32_item: - DO_(input->IncrementRecursionDepth()); - parse_loop_map_int32_item: - ::google::protobuf::scoped_ptr entry( - map_int32_item_.NewEntry()); - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, entry.get())); - (*mutable_map_int32_item())[entry->key()] = *entry->mutable_value(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(74)) - goto parse_loop_map_int32_item; - input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(82)) - goto parse_repeated_int32_item; - break; - } - - // repeated int32 repeated_int32_item = 10; - case 10: { - if (tag == 82) { - parse_repeated_int32_item: - DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< - ::google::protobuf::int32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, this->mutable_repeated_int32_item()))); - } else if (tag == 80) { - DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< - ::google::protobuf::int32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 82, input, this->mutable_repeated_int32_item()))); - } else { - goto handle_unusual; - } - if (input->ExpectAtEnd()) - goto success; - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:dsn.idl.test.test_protobuf_item) - return true; -failure: - // @@protoc_insertion_point(parse_failure:dsn.idl.test.test_protobuf_item) - return false; -#undef DO_ -} - -void test_protobuf_item::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream *output) const -{ - // @@protoc_insertion_point(serialize_start:dsn.idl.test.test_protobuf_item) - // optional bool bool_item = 1; - if (this->bool_item() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->bool_item(), output); - } - - // optional int32 int32_item = 2; - if (this->int32_item() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->int32_item(), output); - } - - // optional int64 int64_item = 3; - if (this->int64_item() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(3, this->int64_item(), output); - } - - // optional uint32 uint32_item = 4; - if (this->uint32_item() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->uint32_item(), output); - } - - // optional uint64 uint64_item = 5; - if (this->uint64_item() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(5, this->uint64_item(), output); - } - - // optional float float_item = 6; - if (this->float_item() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteFloat(6, this->float_item(), output); - } - - // optional double double_item = 7; - if (this->double_item() != 0) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(7, this->double_item(), output); - } - - // optional string string_item = 8; - if (this->string_item().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->string_item().data(), - this->string_item().length(), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "dsn.idl.test.test_protobuf_item.string_item"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 8, this->string_item(), output); - } - - // map map_int32_item = 9; - { - ::google::protobuf::scoped_ptr entry; - for (::google::protobuf::Map<::google::protobuf::int32, - ::google::protobuf::int32>::const_iterator it = - this->map_int32_item().begin(); - it != this->map_int32_item().end(); - ++it) { - entry.reset(map_int32_item_.NewEntryWrapper(it->first, it->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 9, *entry, output); - } - } - - // repeated int32 repeated_int32_item = 10; - if (this->repeated_int32_item_size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteTag( - 10, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); - output->WriteVarint32(_repeated_int32_item_cached_byte_size_); - } - for (int i = 0; i < this->repeated_int32_item_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag(this->repeated_int32_item(i), - output); - } - - // @@protoc_insertion_point(serialize_end:dsn.idl.test.test_protobuf_item) -} - -::google::protobuf::uint8 * -test_protobuf_item::SerializeWithCachedSizesToArray(::google::protobuf::uint8 *target) const -{ - // @@protoc_insertion_point(serialize_to_array_start:dsn.idl.test.test_protobuf_item) - // optional bool bool_item = 1; - if (this->bool_item() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray( - 1, this->bool_item(), target); - } - - // optional int32 int32_item = 2; - if (this->int32_item() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray( - 2, this->int32_item(), target); - } - - // optional int64 int64_item = 3; - if (this->int64_item() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray( - 3, this->int64_item(), target); - } - - // optional uint32 uint32_item = 4; - if (this->uint32_item() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray( - 4, this->uint32_item(), target); - } - - // optional uint64 uint64_item = 5; - if (this->uint64_item() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray( - 5, this->uint64_item(), target); - } - - // optional float float_item = 6; - if (this->float_item() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray( - 6, this->float_item(), target); - } - - // optional double double_item = 7; - if (this->double_item() != 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray( - 7, this->double_item(), target); - } - - // optional string string_item = 8; - if (this->string_item().size() > 0) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - this->string_item().data(), - this->string_item().length(), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "dsn.idl.test.test_protobuf_item.string_item"); - target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 8, this->string_item(), target); - } - - // map map_int32_item = 9; - { - ::google::protobuf::scoped_ptr entry; - for (::google::protobuf::Map<::google::protobuf::int32, - ::google::protobuf::int32>::const_iterator it = - this->map_int32_item().begin(); - it != this->map_int32_item().end(); - ++it) { - entry.reset(map_int32_item_.NewEntryWrapper(it->first, it->second)); - target = ::google::protobuf::internal::WireFormatLite::WriteMessageNoVirtualToArray( - 9, *entry, target); - } - } - - // repeated int32 repeated_int32_item = 10; - if (this->repeated_int32_item_size() > 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( - 10, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, target); - target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( - _repeated_int32_item_cached_byte_size_, target); - } - for (int i = 0; i < this->repeated_int32_item_size(); i++) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt32NoTagToArray( - this->repeated_int32_item(i), target); - } - - // @@protoc_insertion_point(serialize_to_array_end:dsn.idl.test.test_protobuf_item) - return target; -} - -int test_protobuf_item::ByteSize() const -{ - int total_size = 0; - - // optional bool bool_item = 1; - if (this->bool_item() != 0) { - total_size += 1 + 1; - } - - // optional int32 int32_item = 2; - if (this->int32_item() != 0) { - total_size += - 1 + ::google::protobuf::internal::WireFormatLite::Int32Size(this->int32_item()); - } - - // optional int64 int64_item = 3; - if (this->int64_item() != 0) { - total_size += - 1 + ::google::protobuf::internal::WireFormatLite::Int64Size(this->int64_item()); - } - - // optional uint32 uint32_item = 4; - if (this->uint32_item() != 0) { - total_size += - 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size(this->uint32_item()); - } - - // optional uint64 uint64_item = 5; - if (this->uint64_item() != 0) { - total_size += - 1 + ::google::protobuf::internal::WireFormatLite::UInt64Size(this->uint64_item()); - } - - // optional float float_item = 6; - if (this->float_item() != 0) { - total_size += 1 + 4; - } - - // optional double double_item = 7; - if (this->double_item() != 0) { - total_size += 1 + 8; - } - - // optional string string_item = 8; - if (this->string_item().size() > 0) { - total_size += - 1 + ::google::protobuf::internal::WireFormatLite::StringSize(this->string_item()); - } - - // map map_int32_item = 9; - total_size += 1 * this->map_int32_item_size(); - { - ::google::protobuf::scoped_ptr entry; - for (::google::protobuf::Map<::google::protobuf::int32, - ::google::protobuf::int32>::const_iterator it = - this->map_int32_item().begin(); - it != this->map_int32_item().end(); - ++it) { - entry.reset(map_int32_item_.NewEntryWrapper(it->first, it->second)); - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(*entry); - } - } - - // repeated int32 repeated_int32_item = 10; - { - int data_size = 0; - for (int i = 0; i < this->repeated_int32_item_size(); i++) { - data_size += ::google::protobuf::internal::WireFormatLite::Int32Size( - this->repeated_int32_item(i)); - } - if (data_size > 0) { - total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _repeated_int32_item_cached_byte_size_ = data_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - total_size += data_size; - } - - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void test_protobuf_item::MergeFrom(const ::google::protobuf::Message &from) -{ - if (GOOGLE_PREDICT_FALSE(&from == this)) - MergeFromFail(__LINE__); - const test_protobuf_item *source = - ::google::protobuf::internal::DynamicCastToGenerated(&from); - if (source == NULL) { - ::google::protobuf::internal::ReflectionOps::Merge(from, this); - } else { - MergeFrom(*source); - } -} - -void test_protobuf_item::MergeFrom(const test_protobuf_item &from) -{ - if (GOOGLE_PREDICT_FALSE(&from == this)) - MergeFromFail(__LINE__); - map_int32_item_.MergeFrom(from.map_int32_item_); - repeated_int32_item_.MergeFrom(from.repeated_int32_item_); - if (from.bool_item() != 0) { - set_bool_item(from.bool_item()); - } - if (from.int32_item() != 0) { - set_int32_item(from.int32_item()); - } - if (from.int64_item() != 0) { - set_int64_item(from.int64_item()); - } - if (from.uint32_item() != 0) { - set_uint32_item(from.uint32_item()); - } - if (from.uint64_item() != 0) { - set_uint64_item(from.uint64_item()); - } - if (from.float_item() != 0) { - set_float_item(from.float_item()); - } - if (from.double_item() != 0) { - set_double_item(from.double_item()); - } - if (from.string_item().size() > 0) { - - string_item_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - from.string_item_); - } -} - -void test_protobuf_item::CopyFrom(const ::google::protobuf::Message &from) -{ - if (&from == this) - return; - Clear(); - MergeFrom(from); -} - -void test_protobuf_item::CopyFrom(const test_protobuf_item &from) -{ - if (&from == this) - return; - Clear(); - MergeFrom(from); -} - -bool test_protobuf_item::IsInitialized() const { return true; } - -void test_protobuf_item::Swap(test_protobuf_item *other) -{ - if (other == this) - return; - InternalSwap(other); -} -void test_protobuf_item::InternalSwap(test_protobuf_item *other) -{ - std::swap(bool_item_, other->bool_item_); - std::swap(int32_item_, other->int32_item_); - std::swap(int64_item_, other->int64_item_); - std::swap(uint32_item_, other->uint32_item_); - std::swap(uint64_item_, other->uint64_item_); - std::swap(float_item_, other->float_item_); - std::swap(double_item_, other->double_item_); - string_item_.Swap(&other->string_item_); - map_int32_item_.Swap(&other->map_int32_item_); - repeated_int32_item_.UnsafeArenaSwap(&other->repeated_int32_item_); - _internal_metadata_.Swap(&other->_internal_metadata_); - std::swap(_cached_size_, other->_cached_size_); -} - -::google::protobuf::Metadata test_protobuf_item::GetMetadata() const -{ - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = test_protobuf_item_descriptor_; - metadata.reflection = test_protobuf_item_reflection_; - return metadata; -} - -#if PROTOBUF_INLINE_NOT_IN_HEADERS -// test_protobuf_item - -// optional bool bool_item = 1; -void test_protobuf_item::clear_bool_item() { bool_item_ = false; } -bool test_protobuf_item::bool_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.bool_item) - return bool_item_; -} -void test_protobuf_item::set_bool_item(bool value) -{ - - bool_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.bool_item) -} - -// optional int32 int32_item = 2; -void test_protobuf_item::clear_int32_item() { int32_item_ = 0; } -::google::protobuf::int32 test_protobuf_item::int32_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.int32_item) - return int32_item_; -} -void test_protobuf_item::set_int32_item(::google::protobuf::int32 value) -{ - - int32_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.int32_item) -} - -// optional int64 int64_item = 3; -void test_protobuf_item::clear_int64_item() { int64_item_ = GOOGLE_LONGLONG(0); } -::google::protobuf::int64 test_protobuf_item::int64_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.int64_item) - return int64_item_; -} -void test_protobuf_item::set_int64_item(::google::protobuf::int64 value) -{ - - int64_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.int64_item) -} - -// optional uint32 uint32_item = 4; -void test_protobuf_item::clear_uint32_item() { uint32_item_ = 0u; } -::google::protobuf::uint32 test_protobuf_item::uint32_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.uint32_item) - return uint32_item_; -} -void test_protobuf_item::set_uint32_item(::google::protobuf::uint32 value) -{ - - uint32_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.uint32_item) -} - -// optional uint64 uint64_item = 5; -void test_protobuf_item::clear_uint64_item() { uint64_item_ = GOOGLE_ULONGLONG(0); } -::google::protobuf::uint64 test_protobuf_item::uint64_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.uint64_item) - return uint64_item_; -} -void test_protobuf_item::set_uint64_item(::google::protobuf::uint64 value) -{ - - uint64_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.uint64_item) -} - -// optional float float_item = 6; -void test_protobuf_item::clear_float_item() { float_item_ = 0; } -float test_protobuf_item::float_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.float_item) - return float_item_; -} -void test_protobuf_item::set_float_item(float value) -{ - - float_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.float_item) -} - -// optional double double_item = 7; -void test_protobuf_item::clear_double_item() { double_item_ = 0; } -double test_protobuf_item::double_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.double_item) - return double_item_; -} -void test_protobuf_item::set_double_item(double value) -{ - - double_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.double_item) -} - -// optional string string_item = 8; -void test_protobuf_item::clear_string_item() -{ - string_item_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -const ::std::string &test_protobuf_item::string_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.string_item) - return string_item_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -void test_protobuf_item::set_string_item(const ::std::string &value) -{ - - string_item_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.string_item) -} -void test_protobuf_item::set_string_item(const char *value) -{ - - string_item_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(value)); - // @@protoc_insertion_point(field_set_char:dsn.idl.test.test_protobuf_item.string_item) -} -void test_protobuf_item::set_string_item(const char *value, size_t size) -{ - - string_item_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:dsn.idl.test.test_protobuf_item.string_item) -} -::std::string *test_protobuf_item::mutable_string_item() -{ - - // @@protoc_insertion_point(field_mutable:dsn.idl.test.test_protobuf_item.string_item) - return string_item_.MutableNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -::std::string *test_protobuf_item::release_string_item() -{ - - return string_item_.ReleaseNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -void test_protobuf_item::set_allocated_string_item(::std::string *string_item) -{ - if (string_item != NULL) { - - } else { - } - string_item_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - string_item); - // @@protoc_insertion_point(field_set_allocated:dsn.idl.test.test_protobuf_item.string_item) -} - -// map map_int32_item = 9; -int test_protobuf_item::map_int32_item_size() const { return map_int32_item_.size(); } -void test_protobuf_item::clear_map_int32_item() { map_int32_item_.Clear(); } -const ::google::protobuf::Map<::google::protobuf::int32, ::google::protobuf::int32> & -test_protobuf_item::map_int32_item() const -{ - // @@protoc_insertion_point(field_map:dsn.idl.test.test_protobuf_item.map_int32_item) - return map_int32_item_.GetMap(); -} -::google::protobuf::Map<::google::protobuf::int32, ::google::protobuf::int32> * -test_protobuf_item::mutable_map_int32_item() -{ - // @@protoc_insertion_point(field_mutable_map:dsn.idl.test.test_protobuf_item.map_int32_item) - return map_int32_item_.MutableMap(); -} - -// repeated int32 repeated_int32_item = 10; -int test_protobuf_item::repeated_int32_item_size() const { return repeated_int32_item_.size(); } -void test_protobuf_item::clear_repeated_int32_item() { repeated_int32_item_.Clear(); } -::google::protobuf::int32 test_protobuf_item::repeated_int32_item(int index) const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.repeated_int32_item) - return repeated_int32_item_.Get(index); -} -void test_protobuf_item::set_repeated_int32_item(int index, ::google::protobuf::int32 value) -{ - repeated_int32_item_.Set(index, value); - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.repeated_int32_item) -} -void test_protobuf_item::add_repeated_int32_item(::google::protobuf::int32 value) -{ - repeated_int32_item_.Add(value); - // @@protoc_insertion_point(field_add:dsn.idl.test.test_protobuf_item.repeated_int32_item) -} -const ::google::protobuf::RepeatedField<::google::protobuf::int32> & -test_protobuf_item::repeated_int32_item() const -{ - // @@protoc_insertion_point(field_list:dsn.idl.test.test_protobuf_item.repeated_int32_item) - return repeated_int32_item_; -} -::google::protobuf::RepeatedField<::google::protobuf::int32> * -test_protobuf_item::mutable_repeated_int32_item() -{ - // @@protoc_insertion_point(field_mutable_list:dsn.idl.test.test_protobuf_item.repeated_int32_item) - return &repeated_int32_item_; -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS - -// @@protoc_insertion_point(namespace_scope) - -} // namespace test -} // namespace idl -} // namespace dsn - -// @@protoc_insertion_point(global_scope) diff --git a/src/tests/idl/idl_test.pb.h b/src/tests/idl/idl_test.pb.h deleted file mode 100644 index 605ba2086c..0000000000 --- a/src/tests/idl/idl_test.pb.h +++ /dev/null @@ -1,429 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: idl_test.proto - -#ifndef PROTOBUF_idl_5ftest_2eproto__INCLUDED -#define PROTOBUF_idl_5ftest_2eproto__INCLUDED - -#include - -#include - -#if GOOGLE_PROTOBUF_VERSION < 3000000 -#error This file was generated by a newer version of protoc which is -#error incompatible with your Protocol Buffer headers. Please update -#error your headers. -#endif -#if 3000000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION -#error This file was generated by an older version of protoc which is -#error incompatible with your Protocol Buffer headers. Please -#error regenerate this file with a newer version of protoc. -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// @@protoc_insertion_point(includes) - -namespace dsn { -namespace idl { -namespace test { - -// Internal implementation detail -- do not call these. -void protobuf_AddDesc_idl_5ftest_2eproto(); -void protobuf_AssignDesc_idl_5ftest_2eproto(); -void protobuf_ShutdownFile_idl_5ftest_2eproto(); - -class test_protobuf_item; - -// =================================================================== - -class test_protobuf_item : public ::google::protobuf::Message -{ -public: - test_protobuf_item(); - virtual ~test_protobuf_item(); - - test_protobuf_item(const test_protobuf_item &from); - - inline test_protobuf_item &operator=(const test_protobuf_item &from) - { - CopyFrom(from); - return *this; - } - - static const ::google::protobuf::Descriptor *descriptor(); - static const test_protobuf_item &default_instance(); - - void Swap(test_protobuf_item *other); - - // implements Message ---------------------------------------------- - - inline test_protobuf_item *New() const { return New(NULL); } - - test_protobuf_item *New(::google::protobuf::Arena *arena) const; - void CopyFrom(const ::google::protobuf::Message &from); - void MergeFrom(const ::google::protobuf::Message &from); - void CopyFrom(const test_protobuf_item &from); - void MergeFrom(const test_protobuf_item &from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream(::google::protobuf::io::CodedInputStream *input); - void SerializeWithCachedSizes(::google::protobuf::io::CodedOutputStream *output) const; - ::google::protobuf::uint8 * - SerializeWithCachedSizesToArray(::google::protobuf::uint8 *output) const; - int GetCachedSize() const { return _cached_size_; } -private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - void InternalSwap(test_protobuf_item *other); - -private: - inline ::google::protobuf::Arena *GetArenaNoVirtual() const - { - return _internal_metadata_.arena(); - } - inline void *MaybeArenaPtr() const { return _internal_metadata_.raw_arena_ptr(); } -public: - ::google::protobuf::Metadata GetMetadata() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // optional bool bool_item = 1; - void clear_bool_item(); - static const int kBoolItemFieldNumber = 1; - bool bool_item() const; - void set_bool_item(bool value); - - // optional int32 int32_item = 2; - void clear_int32_item(); - static const int kInt32ItemFieldNumber = 2; - ::google::protobuf::int32 int32_item() const; - void set_int32_item(::google::protobuf::int32 value); - - // optional int64 int64_item = 3; - void clear_int64_item(); - static const int kInt64ItemFieldNumber = 3; - ::google::protobuf::int64 int64_item() const; - void set_int64_item(::google::protobuf::int64 value); - - // optional uint32 uint32_item = 4; - void clear_uint32_item(); - static const int kUint32ItemFieldNumber = 4; - ::google::protobuf::uint32 uint32_item() const; - void set_uint32_item(::google::protobuf::uint32 value); - - // optional uint64 uint64_item = 5; - void clear_uint64_item(); - static const int kUint64ItemFieldNumber = 5; - ::google::protobuf::uint64 uint64_item() const; - void set_uint64_item(::google::protobuf::uint64 value); - - // optional float float_item = 6; - void clear_float_item(); - static const int kFloatItemFieldNumber = 6; - float float_item() const; - void set_float_item(float value); - - // optional double double_item = 7; - void clear_double_item(); - static const int kDoubleItemFieldNumber = 7; - double double_item() const; - void set_double_item(double value); - - // optional string string_item = 8; - void clear_string_item(); - static const int kStringItemFieldNumber = 8; - const ::std::string &string_item() const; - void set_string_item(const ::std::string &value); - void set_string_item(const char *value); - void set_string_item(const char *value, size_t size); - ::std::string *mutable_string_item(); - ::std::string *release_string_item(); - void set_allocated_string_item(::std::string *string_item); - - // map map_int32_item = 9; - int map_int32_item_size() const; - void clear_map_int32_item(); - static const int kMapInt32ItemFieldNumber = 9; - const ::google::protobuf::Map<::google::protobuf::int32, ::google::protobuf::int32> & - map_int32_item() const; - ::google::protobuf::Map<::google::protobuf::int32, ::google::protobuf::int32> * - mutable_map_int32_item(); - - // repeated int32 repeated_int32_item = 10; - int repeated_int32_item_size() const; - void clear_repeated_int32_item(); - static const int kRepeatedInt32ItemFieldNumber = 10; - ::google::protobuf::int32 repeated_int32_item(int index) const; - void set_repeated_int32_item(int index, ::google::protobuf::int32 value); - void add_repeated_int32_item(::google::protobuf::int32 value); - const ::google::protobuf::RepeatedField<::google::protobuf::int32> &repeated_int32_item() const; - ::google::protobuf::RepeatedField<::google::protobuf::int32> *mutable_repeated_int32_item(); - - // @@protoc_insertion_point(class_scope:dsn.idl.test.test_protobuf_item) -private: - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; - bool _is_default_instance_; - bool bool_item_; - ::google::protobuf::int32 int32_item_; - ::google::protobuf::int64 int64_item_; - ::google::protobuf::uint64 uint64_item_; - ::google::protobuf::uint32 uint32_item_; - float float_item_; - double double_item_; - ::google::protobuf::internal::ArenaStringPtr string_item_; - typedef ::google::protobuf::internal::MapEntryLite< - ::google::protobuf::int32, - ::google::protobuf::int32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32, - 0> - test_protobuf_item_MapInt32ItemEntry; - ::google::protobuf::internal::MapField<::google::protobuf::int32, - ::google::protobuf::int32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32, - ::google::protobuf::internal::WireFormatLite::TYPE_INT32, - 0> - map_int32_item_; - ::google::protobuf::RepeatedField<::google::protobuf::int32> repeated_int32_item_; - mutable int _repeated_int32_item_cached_byte_size_; - mutable int _cached_size_; - friend void protobuf_AddDesc_idl_5ftest_2eproto(); - friend void protobuf_AssignDesc_idl_5ftest_2eproto(); - friend void protobuf_ShutdownFile_idl_5ftest_2eproto(); - - void InitAsDefaultInstance(); - static test_protobuf_item *default_instance_; -}; -// =================================================================== - -// =================================================================== - -#if !PROTOBUF_INLINE_NOT_IN_HEADERS -// test_protobuf_item - -// optional bool bool_item = 1; -inline void test_protobuf_item::clear_bool_item() { bool_item_ = false; } -inline bool test_protobuf_item::bool_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.bool_item) - return bool_item_; -} -inline void test_protobuf_item::set_bool_item(bool value) -{ - - bool_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.bool_item) -} - -// optional int32 int32_item = 2; -inline void test_protobuf_item::clear_int32_item() { int32_item_ = 0; } -inline ::google::protobuf::int32 test_protobuf_item::int32_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.int32_item) - return int32_item_; -} -inline void test_protobuf_item::set_int32_item(::google::protobuf::int32 value) -{ - - int32_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.int32_item) -} - -// optional int64 int64_item = 3; -inline void test_protobuf_item::clear_int64_item() { int64_item_ = GOOGLE_LONGLONG(0); } -inline ::google::protobuf::int64 test_protobuf_item::int64_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.int64_item) - return int64_item_; -} -inline void test_protobuf_item::set_int64_item(::google::protobuf::int64 value) -{ - - int64_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.int64_item) -} - -// optional uint32 uint32_item = 4; -inline void test_protobuf_item::clear_uint32_item() { uint32_item_ = 0u; } -inline ::google::protobuf::uint32 test_protobuf_item::uint32_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.uint32_item) - return uint32_item_; -} -inline void test_protobuf_item::set_uint32_item(::google::protobuf::uint32 value) -{ - - uint32_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.uint32_item) -} - -// optional uint64 uint64_item = 5; -inline void test_protobuf_item::clear_uint64_item() { uint64_item_ = GOOGLE_ULONGLONG(0); } -inline ::google::protobuf::uint64 test_protobuf_item::uint64_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.uint64_item) - return uint64_item_; -} -inline void test_protobuf_item::set_uint64_item(::google::protobuf::uint64 value) -{ - - uint64_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.uint64_item) -} - -// optional float float_item = 6; -inline void test_protobuf_item::clear_float_item() { float_item_ = 0; } -inline float test_protobuf_item::float_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.float_item) - return float_item_; -} -inline void test_protobuf_item::set_float_item(float value) -{ - - float_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.float_item) -} - -// optional double double_item = 7; -inline void test_protobuf_item::clear_double_item() { double_item_ = 0; } -inline double test_protobuf_item::double_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.double_item) - return double_item_; -} -inline void test_protobuf_item::set_double_item(double value) -{ - - double_item_ = value; - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.double_item) -} - -// optional string string_item = 8; -inline void test_protobuf_item::clear_string_item() -{ - string_item_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -inline const ::std::string &test_protobuf_item::string_item() const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.string_item) - return string_item_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -inline void test_protobuf_item::set_string_item(const ::std::string &value) -{ - - string_item_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.string_item) -} -inline void test_protobuf_item::set_string_item(const char *value) -{ - - string_item_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(value)); - // @@protoc_insertion_point(field_set_char:dsn.idl.test.test_protobuf_item.string_item) -} -inline void test_protobuf_item::set_string_item(const char *value, size_t size) -{ - - string_item_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:dsn.idl.test.test_protobuf_item.string_item) -} -inline ::std::string *test_protobuf_item::mutable_string_item() -{ - - // @@protoc_insertion_point(field_mutable:dsn.idl.test.test_protobuf_item.string_item) - return string_item_.MutableNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -inline ::std::string *test_protobuf_item::release_string_item() -{ - - return string_item_.ReleaseNoArena( - &::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} -inline void test_protobuf_item::set_allocated_string_item(::std::string *string_item) -{ - if (string_item != NULL) { - - } else { - } - string_item_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - string_item); - // @@protoc_insertion_point(field_set_allocated:dsn.idl.test.test_protobuf_item.string_item) -} - -// map map_int32_item = 9; -inline int test_protobuf_item::map_int32_item_size() const { return map_int32_item_.size(); } -inline void test_protobuf_item::clear_map_int32_item() { map_int32_item_.Clear(); } -inline const ::google::protobuf::Map<::google::protobuf::int32, ::google::protobuf::int32> & -test_protobuf_item::map_int32_item() const -{ - // @@protoc_insertion_point(field_map:dsn.idl.test.test_protobuf_item.map_int32_item) - return map_int32_item_.GetMap(); -} -inline ::google::protobuf::Map<::google::protobuf::int32, ::google::protobuf::int32> * -test_protobuf_item::mutable_map_int32_item() -{ - // @@protoc_insertion_point(field_mutable_map:dsn.idl.test.test_protobuf_item.map_int32_item) - return map_int32_item_.MutableMap(); -} - -// repeated int32 repeated_int32_item = 10; -inline int test_protobuf_item::repeated_int32_item_size() const -{ - return repeated_int32_item_.size(); -} -inline void test_protobuf_item::clear_repeated_int32_item() { repeated_int32_item_.Clear(); } -inline ::google::protobuf::int32 test_protobuf_item::repeated_int32_item(int index) const -{ - // @@protoc_insertion_point(field_get:dsn.idl.test.test_protobuf_item.repeated_int32_item) - return repeated_int32_item_.Get(index); -} -inline void test_protobuf_item::set_repeated_int32_item(int index, ::google::protobuf::int32 value) -{ - repeated_int32_item_.Set(index, value); - // @@protoc_insertion_point(field_set:dsn.idl.test.test_protobuf_item.repeated_int32_item) -} -inline void test_protobuf_item::add_repeated_int32_item(::google::protobuf::int32 value) -{ - repeated_int32_item_.Add(value); - // @@protoc_insertion_point(field_add:dsn.idl.test.test_protobuf_item.repeated_int32_item) -} -inline const ::google::protobuf::RepeatedField<::google::protobuf::int32> & -test_protobuf_item::repeated_int32_item() const -{ - // @@protoc_insertion_point(field_list:dsn.idl.test.test_protobuf_item.repeated_int32_item) - return repeated_int32_item_; -} -inline ::google::protobuf::RepeatedField<::google::protobuf::int32> * -test_protobuf_item::mutable_repeated_int32_item() -{ - // @@protoc_insertion_point(field_mutable_list:dsn.idl.test.test_protobuf_item.repeated_int32_item) - return &repeated_int32_item_; -} - -#endif // !PROTOBUF_INLINE_NOT_IN_HEADERS - -// @@protoc_insertion_point(namespace_scope) - -} // namespace test -} // namespace idl -} // namespace dsn - -// @@protoc_insertion_point(global_scope) - -#endif // PROTOBUF_idl_5ftest_2eproto__INCLUDED diff --git a/src/tests/idl/idl_test.proto b/src/tests/idl/idl_test.proto deleted file mode 100644 index 2cc1389355..0000000000 --- a/src/tests/idl/idl_test.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; -package dsn.idl.test; - -message test_protobuf_item -{ - bool bool_item = 1; - int32 int32_item = 2; - int64 int64_item = 3; - uint32 uint32_item = 4; - uint64 uint64_item = 5; - float float_item = 6; - double double_item = 7; - string string_item = 8; - map map_int32_item = 9; - repeated int32 repeated_int32_item = 10; -} \ No newline at end of file diff --git a/src/tests/idl/idl_test.thrift b/src/tests/idl/idl_test.thrift deleted file mode 100644 index 7fa6b9a6be..0000000000 --- a/src/tests/idl/idl_test.thrift +++ /dev/null @@ -1,15 +0,0 @@ -namespace cpp dsn.idl.test - -struct test_thrift_item -{ - 1: bool bool_item; - 2: byte byte_item; - 3: i16 i16_item; - 4: i32 i32_item; - 5: i64 i64_item; - 6: double double_item; - 7: string string_item; - 8: list list_i32_item; - 9: set set_i32_item; - 10: map map_i32_item; -} \ No newline at end of file diff --git a/src/tests/idl/idl_test.types.h b/src/tests/idl/idl_test.types.h deleted file mode 100644 index ebedf95f1a..0000000000 --- a/src/tests/idl/idl_test.types.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once -#include -#include - -#include "idl_test_types.h" -#include "idl_test.pb.h" - -namespace dsn { -namespace idl { -namespace test { -GENERATED_TYPE_SERIALIZATION(test_thrift_item, THRIFT) -GENERATED_TYPE_SERIALIZATION(test_protobuf_item, PROTOBUF) -} -} -} \ No newline at end of file diff --git a/src/tests/idl/idl_test_types.cpp b/src/tests/idl/idl_test_types.cpp deleted file mode 100644 index 4dd443f63b..0000000000 --- a/src/tests/idl/idl_test_types.cpp +++ /dev/null @@ -1,347 +0,0 @@ -/** - * Autogenerated by Thrift Compiler (@PACKAGE_VERSION@) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -#include "idl_test_types.h" - -#include -#include - -#include - -namespace dsn { -namespace idl { -namespace test { - -test_thrift_item::~test_thrift_item() throw() {} - -void test_thrift_item::__set_bool_item(const bool val) { this->bool_item = val; } - -void test_thrift_item::__set_byte_item(const int8_t val) { this->byte_item = val; } - -void test_thrift_item::__set_i16_item(const int16_t val) { this->i16_item = val; } - -void test_thrift_item::__set_i32_item(const int32_t val) { this->i32_item = val; } - -void test_thrift_item::__set_i64_item(const int64_t val) { this->i64_item = val; } - -void test_thrift_item::__set_double_item(const double val) { this->double_item = val; } - -void test_thrift_item::__set_string_item(const std::string &val) { this->string_item = val; } - -void test_thrift_item::__set_list_i32_item(const std::vector &val) -{ - this->list_i32_item = val; -} - -void test_thrift_item::__set_set_i32_item(const std::set &val) -{ - this->set_i32_item = val; -} - -void test_thrift_item::__set_map_i32_item(const std::map &val) -{ - this->map_i32_item = val; -} - -uint32_t test_thrift_item::read(::apache::thrift::protocol::TProtocol *iprot) -{ - - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); - uint32_t xfer = 0; - std::string fname; - ::apache::thrift::protocol::TType ftype; - int16_t fid; - - xfer += iprot->readStructBegin(fname); - - using ::apache::thrift::protocol::TProtocolException; - - while (true) { - xfer += iprot->readFieldBegin(fname, ftype, fid); - if (ftype == ::apache::thrift::protocol::T_STOP) { - break; - } - switch (fid) { - case 1: - if (ftype == ::apache::thrift::protocol::T_BOOL) { - xfer += iprot->readBool(this->bool_item); - this->__isset.bool_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 2: - if (ftype == ::apache::thrift::protocol::T_BYTE) { - xfer += iprot->readByte(this->byte_item); - this->__isset.byte_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 3: - if (ftype == ::apache::thrift::protocol::T_I16) { - xfer += iprot->readI16(this->i16_item); - this->__isset.i16_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 4: - if (ftype == ::apache::thrift::protocol::T_I32) { - xfer += iprot->readI32(this->i32_item); - this->__isset.i32_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 5: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->i64_item); - this->__isset.i64_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 6: - if (ftype == ::apache::thrift::protocol::T_DOUBLE) { - xfer += iprot->readDouble(this->double_item); - this->__isset.double_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 7: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->string_item); - this->__isset.string_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 8: - if (ftype == ::apache::thrift::protocol::T_LIST) { - { - this->list_i32_item.clear(); - uint32_t _size0; - ::apache::thrift::protocol::TType _etype3; - xfer += iprot->readListBegin(_etype3, _size0); - this->list_i32_item.resize(_size0); - uint32_t _i4; - for (_i4 = 0; _i4 < _size0; ++_i4) { - xfer += iprot->readI32(this->list_i32_item[_i4]); - } - xfer += iprot->readListEnd(); - } - this->__isset.list_i32_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 9: - if (ftype == ::apache::thrift::protocol::T_SET) { - { - this->set_i32_item.clear(); - uint32_t _size5; - ::apache::thrift::protocol::TType _etype8; - xfer += iprot->readSetBegin(_etype8, _size5); - uint32_t _i9; - for (_i9 = 0; _i9 < _size5; ++_i9) { - int32_t _elem10; - xfer += iprot->readI32(_elem10); - this->set_i32_item.insert(_elem10); - } - xfer += iprot->readSetEnd(); - } - this->__isset.set_i32_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 10: - if (ftype == ::apache::thrift::protocol::T_MAP) { - { - this->map_i32_item.clear(); - uint32_t _size11; - ::apache::thrift::protocol::TType _ktype12; - ::apache::thrift::protocol::TType _vtype13; - xfer += iprot->readMapBegin(_ktype12, _vtype13, _size11); - uint32_t _i15; - for (_i15 = 0; _i15 < _size11; ++_i15) { - int32_t _key16; - xfer += iprot->readI32(_key16); - int32_t &_val17 = this->map_i32_item[_key16]; - xfer += iprot->readI32(_val17); - } - xfer += iprot->readMapEnd(); - } - this->__isset.map_i32_item = true; - } else { - xfer += iprot->skip(ftype); - } - break; - default: - xfer += iprot->skip(ftype); - break; - } - xfer += iprot->readFieldEnd(); - } - - xfer += iprot->readStructEnd(); - - return xfer; -} - -uint32_t test_thrift_item::write(::apache::thrift::protocol::TProtocol *oprot) const -{ - uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("test_thrift_item"); - - xfer += oprot->writeFieldBegin("bool_item", ::apache::thrift::protocol::T_BOOL, 1); - xfer += oprot->writeBool(this->bool_item); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("byte_item", ::apache::thrift::protocol::T_BYTE, 2); - xfer += oprot->writeByte(this->byte_item); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("i16_item", ::apache::thrift::protocol::T_I16, 3); - xfer += oprot->writeI16(this->i16_item); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("i32_item", ::apache::thrift::protocol::T_I32, 4); - xfer += oprot->writeI32(this->i32_item); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("i64_item", ::apache::thrift::protocol::T_I64, 5); - xfer += oprot->writeI64(this->i64_item); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("double_item", ::apache::thrift::protocol::T_DOUBLE, 6); - xfer += oprot->writeDouble(this->double_item); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("string_item", ::apache::thrift::protocol::T_STRING, 7); - xfer += oprot->writeString(this->string_item); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("list_i32_item", ::apache::thrift::protocol::T_LIST, 8); - { - xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, - static_cast(this->list_i32_item.size())); - std::vector::const_iterator _iter18; - for (_iter18 = this->list_i32_item.begin(); _iter18 != this->list_i32_item.end(); - ++_iter18) { - xfer += oprot->writeI32((*_iter18)); - } - xfer += oprot->writeListEnd(); - } - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("set_i32_item", ::apache::thrift::protocol::T_SET, 9); - { - xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, - static_cast(this->set_i32_item.size())); - std::set::const_iterator _iter19; - for (_iter19 = this->set_i32_item.begin(); _iter19 != this->set_i32_item.end(); ++_iter19) { - xfer += oprot->writeI32((*_iter19)); - } - xfer += oprot->writeSetEnd(); - } - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("map_i32_item", ::apache::thrift::protocol::T_MAP, 10); - { - xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, - ::apache::thrift::protocol::T_I32, - static_cast(this->map_i32_item.size())); - std::map::const_iterator _iter20; - for (_iter20 = this->map_i32_item.begin(); _iter20 != this->map_i32_item.end(); ++_iter20) { - xfer += oprot->writeI32(_iter20->first); - xfer += oprot->writeI32(_iter20->second); - } - xfer += oprot->writeMapEnd(); - } - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldStop(); - xfer += oprot->writeStructEnd(); - return xfer; -} - -void swap(test_thrift_item &a, test_thrift_item &b) -{ - using ::std::swap; - swap(a.bool_item, b.bool_item); - swap(a.byte_item, b.byte_item); - swap(a.i16_item, b.i16_item); - swap(a.i32_item, b.i32_item); - swap(a.i64_item, b.i64_item); - swap(a.double_item, b.double_item); - swap(a.string_item, b.string_item); - swap(a.list_i32_item, b.list_i32_item); - swap(a.set_i32_item, b.set_i32_item); - swap(a.map_i32_item, b.map_i32_item); - swap(a.__isset, b.__isset); -} - -test_thrift_item::test_thrift_item(const test_thrift_item &other21) -{ - bool_item = other21.bool_item; - byte_item = other21.byte_item; - i16_item = other21.i16_item; - i32_item = other21.i32_item; - i64_item = other21.i64_item; - double_item = other21.double_item; - string_item = other21.string_item; - list_i32_item = other21.list_i32_item; - set_i32_item = other21.set_i32_item; - map_i32_item = other21.map_i32_item; - __isset = other21.__isset; -} -test_thrift_item &test_thrift_item::operator=(const test_thrift_item &other22) -{ - bool_item = other22.bool_item; - byte_item = other22.byte_item; - i16_item = other22.i16_item; - i32_item = other22.i32_item; - i64_item = other22.i64_item; - double_item = other22.double_item; - string_item = other22.string_item; - list_i32_item = other22.list_i32_item; - set_i32_item = other22.set_i32_item; - map_i32_item = other22.map_i32_item; - __isset = other22.__isset; - return *this; -} -void test_thrift_item::printTo(std::ostream &out) const -{ - using ::apache::thrift::to_string; - out << "test_thrift_item("; - out << "bool_item=" << to_string(bool_item); - out << ", " - << "byte_item=" << to_string(byte_item); - out << ", " - << "i16_item=" << to_string(i16_item); - out << ", " - << "i32_item=" << to_string(i32_item); - out << ", " - << "i64_item=" << to_string(i64_item); - out << ", " - << "double_item=" << to_string(double_item); - out << ", " - << "string_item=" << to_string(string_item); - out << ", " - << "list_i32_item=" << to_string(list_i32_item); - out << ", " - << "set_i32_item=" << to_string(set_i32_item); - out << ", " - << "map_i32_item=" << to_string(map_i32_item); - out << ")"; -} -} -} -} // namespace diff --git a/src/tests/idl/idl_test_types.h b/src/tests/idl/idl_test_types.h deleted file mode 100644 index 0c99ce2d0b..0000000000 --- a/src/tests/idl/idl_test_types.h +++ /dev/null @@ -1,147 +0,0 @@ -/** - * Autogenerated by Thrift Compiler (@PACKAGE_VERSION@) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -#ifndef idl_test_TYPES_H -#define idl_test_TYPES_H - -#include - -#include -#include -#include -#include - -#include - -namespace dsn { -namespace idl { -namespace test { - -class test_thrift_item; - -typedef struct _test_thrift_item__isset -{ - _test_thrift_item__isset() - : bool_item(false), - byte_item(false), - i16_item(false), - i32_item(false), - i64_item(false), - double_item(false), - string_item(false), - list_i32_item(false), - set_i32_item(false), - map_i32_item(false) - { - } - bool bool_item : 1; - bool byte_item : 1; - bool i16_item : 1; - bool i32_item : 1; - bool i64_item : 1; - bool double_item : 1; - bool string_item : 1; - bool list_i32_item : 1; - bool set_i32_item : 1; - bool map_i32_item : 1; -} _test_thrift_item__isset; - -class test_thrift_item -{ -public: - test_thrift_item(const test_thrift_item &); - test_thrift_item &operator=(const test_thrift_item &); - test_thrift_item() - : bool_item(0), - byte_item(0), - i16_item(0), - i32_item(0), - i64_item(0), - double_item(0), - string_item() - { - } - - virtual ~test_thrift_item() throw(); - bool bool_item; - int8_t byte_item; - int16_t i16_item; - int32_t i32_item; - int64_t i64_item; - double double_item; - std::string string_item; - std::vector list_i32_item; - std::set set_i32_item; - std::map map_i32_item; - - _test_thrift_item__isset __isset; - - void __set_bool_item(const bool val); - - void __set_byte_item(const int8_t val); - - void __set_i16_item(const int16_t val); - - void __set_i32_item(const int32_t val); - - void __set_i64_item(const int64_t val); - - void __set_double_item(const double val); - - void __set_string_item(const std::string &val); - - void __set_list_i32_item(const std::vector &val); - - void __set_set_i32_item(const std::set &val); - - void __set_map_i32_item(const std::map &val); - - bool operator==(const test_thrift_item &rhs) const - { - if (!(bool_item == rhs.bool_item)) - return false; - if (!(byte_item == rhs.byte_item)) - return false; - if (!(i16_item == rhs.i16_item)) - return false; - if (!(i32_item == rhs.i32_item)) - return false; - if (!(i64_item == rhs.i64_item)) - return false; - if (!(double_item == rhs.double_item)) - return false; - if (!(string_item == rhs.string_item)) - return false; - if (!(list_i32_item == rhs.list_i32_item)) - return false; - if (!(set_i32_item == rhs.set_i32_item)) - return false; - if (!(map_i32_item == rhs.map_i32_item)) - return false; - return true; - } - bool operator!=(const test_thrift_item &rhs) const { return !(*this == rhs); } - - bool operator<(const test_thrift_item &) const; - - uint32_t read(::apache::thrift::protocol::TProtocol *iprot); - uint32_t write(::apache::thrift::protocol::TProtocol *oprot) const; - - virtual void printTo(std::ostream &out) const; -}; - -void swap(test_thrift_item &a, test_thrift_item &b); - -inline std::ostream &operator<<(std::ostream &out, const test_thrift_item &obj) -{ - obj.printTo(out); - return out; -} -} -} -} // namespace - -#endif diff --git a/src/tests/idl/resources/repo/counter.proto b/src/tests/idl/resources/repo/counter.proto deleted file mode 100644 index 8a383517eb..0000000000 --- a/src/tests/idl/resources/repo/counter.proto +++ /dev/null @@ -1,25 +0,0 @@ -syntax = "proto3"; -package dsn.example; - -message count_op -{ - string name = 1; - int32 operand = 2; -} - -message count_name -{ - string name = 1; -} - -message count_result -{ - int32 value = 1; -} - -service counter -{ - rpc add (count_op) returns (count_result); - rpc read (count_name) returns (count_result); -} - diff --git a/src/tests/idl/resources/repo/counter.proto.annotations b/src/tests/idl/resources/repo/counter.proto.annotations deleted file mode 100644 index 001b55558e..0000000000 --- a/src/tests/idl/resources/repo/counter.proto.annotations +++ /dev/null @@ -1,12 +0,0 @@ -; annotation format -;[type.name[[.subname]...]] -;key = vlaue - -[service.counter] -stateful = true ; counter is a stateful service - -[function.counter.add] -write = true ; counter.add is a write function - -[function.counter.read] -write = false diff --git a/src/tests/idl/resources/repo/counter.thrift b/src/tests/idl/resources/repo/counter.thrift deleted file mode 100644 index 166775fac9..0000000000 --- a/src/tests/idl/resources/repo/counter.thrift +++ /dev/null @@ -1,13 +0,0 @@ -namespace cpp dsn.example - -struct count_op -{ - 1: string name; - 2: i32 operand; -} - -service counter -{ - i32 add(1:count_op op); - i32 read(1:string name); -} diff --git a/src/tests/idl/resources/repo/counter.thrift.annotations b/src/tests/idl/resources/repo/counter.thrift.annotations deleted file mode 100644 index 001b55558e..0000000000 --- a/src/tests/idl/resources/repo/counter.thrift.annotations +++ /dev/null @@ -1,12 +0,0 @@ -; annotation format -;[type.name[[.subname]...]] -;key = vlaue - -[service.counter] -stateful = true ; counter is a stateful service - -[function.counter.add] -write = true ; counter.add is a write function - -[function.counter.read] -write = false diff --git a/src/tests/idl/resources/repo/cpp/counter.main.cpp b/src/tests/idl/resources/repo/cpp/counter.main.cpp deleted file mode 100644 index 74bafa6888..0000000000 --- a/src/tests/idl/resources/repo/cpp/counter.main.cpp +++ /dev/null @@ -1,41 +0,0 @@ -// apps -#include "counter.app.example.h" - -#ifdef _WIN32 -#include - -void mysleep() { Sleep(3000); } -#else -#include - -void mysleep() { sleep(3); } -#endif - -void dsn_app_registration_counter() -{ - // register all possible service apps - dsn::service_app::register_factory<::dsn::example::counter_server_app>("server"); - dsn::service_app::register_factory<::dsn::example::counter_client_app>("client"); - dsn::service_app::register_factory<::dsn::example::counter_perf_test_client_app>("client.perf.counter"); -} - -#ifndef DSN_RUN_USE_SVCHOST - -int main(int argc, char **argv) -{ - dsn_app_registration_counter(); - - dsn_run_config(argv[1], false); - mysleep(); - dsn_exit(0); -} - -#else - -#include - -MODULE_INIT_BEGIN -dsn_app_registration_counter(); -MODULE_INIT_END - -#endif diff --git a/src/tests/idl/resources/repo/csharp/counter.main.cs b/src/tests/idl/resources/repo/csharp/counter.main.cs deleted file mode 100644 index c868e353dc..0000000000 --- a/src/tests/idl/resources/repo/csharp/counter.main.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Threading; -using System.Collections.Generic; - -using dsn.dev.csharp; - -namespace dsn.example -{ - class Program - { - static void Main(string[] args) - { - counterHelper.InitCodes(); - testHelper.init(); - - ServiceApp.RegisterApp("server"); - ServiceApp.RegisterApp("client"); - - string[] args2 = (new string[] { "counter" }).Union(args).ToArray(); - Native.dsn_run(args2.Length, args2, false); - // Native.dsn_run_config("config.ini", false); - int counter = 0; - while (testHelper.finished_test() != 4) - { - Thread.Sleep(1000); - if (++counter > 10) - { - Console.WriteLine("it takes too long to complete..."); - Native.dsn_exit(1); - } - } - bool passed = true; - Dictionary result = testHelper.result(); - foreach (KeyValuePair entry in result) - { - string name = entry.Key; - bool ok = entry.Value; - passed = passed && ok; - Console.WriteLine(name + " " + (ok ? "passed" : "failed")); - } - int ret = passed ? 0 : 1; - Native.dsn_exit(ret); - } - } -} diff --git a/src/tests/idl/resources/sbin/clear.cmd b/src/tests/idl/resources/sbin/clear.cmd deleted file mode 100644 index d91129a535..0000000000 --- a/src/tests/idl/resources/sbin/clear.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@ECHO OFF -@rmdir /Q /S rdsn -DEL /Q counter.* -DEL /Q log \ No newline at end of file diff --git a/src/tests/idl/resources/sbin/mock_install.cmd.template b/src/tests/idl/resources/sbin/mock_install.cmd.template deleted file mode 100644 index 1dcba8bef7..0000000000 --- a/src/tests/idl/resources/sbin/mock_install.cmd.template +++ /dev/null @@ -1,16 +0,0 @@ -@ECHO OFF -mkdir rdsn -mkdir rdsn\include -mkdir rdsn\include\ext -mkdir rdsn\lib -mkdir rdsn\bin -xcopy /E /Y /Q ${WIN_SOURCE_TOP_DIR}\bin rdsn\bin -xcopy /E /Y /Q ${WIN_SOURCE_TOP_DIR}\include rdsn\include -xcopy /E /Y /Q ${WIN_BINARY_TOP_DIR}\lib rdsn\lib -xcopy /E /Y /Q ${WIN_BINARY_TOP_DIR}\bin\${CMAKE_BUILD_TYPE} rdsn\lib -xcopy /E /Y /Q ${WIN_THRIFT_INCLUDE_DIR} rdsn\include\ext -xcopy /E /Y /Q ${WIN_THRIFT_LIB_DIR} rdsn\lib -xcopy /E /Y /Q ${WIN_PROTOBUF_LIB_DIR} rdsn\lib -copy /Y ${WIN_PROTOBUF_BIN_DIR}\protoc.exe rdsn\bin\Windows -xcopy /E /Y /Q ${WIN_PROTOBUF_INCLUDE_DIR} rdsn\include\ext -xcopy /E /Y /Q ${WIN_BOOST_INCLUDE_DIR} rdsn\include\ext \ No newline at end of file diff --git a/src/tests/idl/resources/sbin/run.sh.template b/src/tests/idl/resources/sbin/run.sh.template deleted file mode 100755 index 95552aa286..0000000000 --- a/src/tests/idl/resources/sbin/run.sh.template +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -export DSN_ROOT=${CMAKE_INSTALL_PREFIX} -export PATH=$DSN_ROOT/bin:$PATH -export LIBRARY_PATH=$DSN_ROOT/lib:$LIBRARY_PATH -export LD_LIBRARY_PATH=$DSN_ROOT/lib:$LD_LIBRARY_PATH - -if [ -z "$REPORT_DIR" ]; then - REPORT_DIR="." -fi -GTEST_OUTPUT="xml:$REPORT_DIR/dsn.idl.tests" - -./dsn.idl.tests $DSN_ROOT ./ --gtest_output=$GTEST_OUTPUT - -if [ $? -ne 0 ]; then - ret=-1 -else - ret=0 -fi - -rm counter.* -rm log - -exit $ret diff --git a/src/tests/idl/resources/sbin/test.cmd b/src/tests/idl/resources/sbin/test.cmd deleted file mode 100644 index 673ebbb684..0000000000 --- a/src/tests/idl/resources/sbin/test.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@ECHO OFF -SET MOCK_ROOT=%~f1 -SET CMAKE_PATH=%~f2 -SET DSN_ROOT=%MOCK_ROOT%\rdsn -SET PATH=%CMAKE_PATH%;%DSN_ROOT%\lib;%DSN_ROOT%\bin;%PATH% -CALL %bin_dir%\echoc.exe 2 %build_type%\dsn.idl.tests.exe %MOCK_ROOT% -CALL %build_type%\dsn.idl.tests.exe %DSN_ROOT% %MOCK_ROOT% \ No newline at end of file