diff --git a/src/core/tests/CMakeLists.txt b/src/core/tests/CMakeLists.txt index 04c08bd3a3..8e7a5779b3 100644 --- a/src/core/tests/CMakeLists.txt +++ b/src/core/tests/CMakeLists.txt @@ -22,7 +22,6 @@ set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config-bad-section.ini" "${CMAKE_CURRENT_SOURCE_DIR}/config-sample.ini" "${CMAKE_CURRENT_SOURCE_DIR}/config-test-corrupt-message.ini" "${CMAKE_CURRENT_SOURCE_DIR}/config-test.ini" - "${CMAKE_CURRENT_SOURCE_DIR}/config-test-posix-aio.ini" "${CMAKE_CURRENT_SOURCE_DIR}/config-test-sim.ini" "${CMAKE_CURRENT_SOURCE_DIR}/config-unmatch-section.ini" "${CMAKE_CURRENT_SOURCE_DIR}/command.txt" diff --git a/src/core/tests/config-test-posix-aio.ini b/src/core/tests/config-test-posix-aio.ini deleted file mode 100644 index 69f2bbf7a0..0000000000 --- a/src/core/tests/config-test-posix-aio.ini +++ /dev/null @@ -1,72 +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_FOR_TEST_1, THREAD_POOL_FOR_TEST_2 - -[core] -;tool = simulator -tool = nativerun - -toollets = tracer, profiler -pause_on_start = false - -logging_start_level = LOG_LEVEL_INFORMATION -logging_factory_name = dsn::tools::simple_logger - -aio_factory_name = dsn::tools::posix_aio_provider - - -[tools.simple_logger] -fast_flush = true -short_header = false -stderr_start_level = LOG_LEVEL_FATAL - -[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 = 1000 - -[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] -worker_count = 2 - -[threadpool.THREAD_POOL_DEFAULT] -partitioned = false -worker_priority = THREAD_xPRIORITY_NORMAL - -[threadpool.THREAD_POOL_TEST_SERVER] -partitioned = false - -[uri-resolver.http://localhost:8080] -factory = partition_resolver_simple -arguments = 127.0.0.1:8080 diff --git a/src/core/tests/gtest.filter b/src/core/tests/gtest.filter index e037173cf3..2d19ecb8aa 100644 --- a/src/core/tests/gtest.filter +++ b/src/core/tests/gtest.filter @@ -1,4 +1,3 @@ config-test.ini -core.corrupt_message:core.aio*:core.operation_failed:tools_hpc.* config-test-sim.ini -core.corrupt_message:core.aio*:core.operation_failed:tools_hpc.*:tools_simulator.*:task_test.signal_finished_task config-test-sim.ini tools_simulator.* -config-test-posix-aio.ini core.aio*:core.operation_failed diff --git a/src/core/tools/common/native_aio_provider.linux.cpp b/src/core/tools/common/native_aio_provider.linux.cpp index 59687cc551..5b90a485d6 100644 --- a/src/core/tools/common/native_aio_provider.linux.cpp +++ b/src/core/tools/common/native_aio_provider.linux.cpp @@ -24,16 +24,6 @@ * THE SOFTWARE. */ -/* - * Description: - * What is this file about? - * - * Revision history: - * xxxx-xx-xx, author, first version - * xxxx-xx-xx, author, fix bug about xxx - */ -#ifdef __linux__ - #include "native_aio_provider.linux.h" #include @@ -245,4 +235,3 @@ error_code native_linux_aio_provider::aio_internal(aio_task *aio_tsk, } // namespace tools } // namespace dsn -#endif diff --git a/src/core/tools/common/providers.common.cpp b/src/core/tools/common/providers.common.cpp index 61341a8b14..165119ebc2 100644 --- a/src/core/tools/common/providers.common.cpp +++ b/src/core/tools/common/providers.common.cpp @@ -36,12 +36,10 @@ #include "asio_net_provider.h" #include #include "lockp.std.h" -#include "native_aio_provider.posix.h" #include "native_aio_provider.linux.h" #include "simple_task_queue.h" #include "network.sim.h" #include "simple_logger.h" -#include "empty_aio_provider.h" #include "dsn_message_parser.h" #include "thrift_message_parser.h" #include "raw_message_parser.h" @@ -68,8 +66,6 @@ void register_common_providers() register_message_header_parser(NET_HDR_RAW, {"_RAW"}); register_component_provider("dsn::tools::native_aio_provider"); - register_component_provider("dsn::tools::posix_aio_provider"); - register_component_provider("dsn::tools::empty_aio_provider"); -} -} } +} // namespace tools +} // namespace dsn diff --git a/src/core/tools/simulator/diske.sim.cpp b/src/core/tools/simulator/diske.sim.cpp index 00f19c8d43..263bae9129 100644 --- a/src/core/tools/simulator/diske.sim.cpp +++ b/src/core/tools/simulator/diske.sim.cpp @@ -41,7 +41,7 @@ namespace tools { DEFINE_TASK_CODE(LPC_NATIVE_AIO_REDIRECT, TASK_PRIORITY_HIGH, THREAD_POOL_DEFAULT) sim_aio_provider::sim_aio_provider(disk_engine *disk, aio_provider *inner_provider) - : NATIVE_AIO_PROVIDER(disk, inner_provider) + : native_linux_aio_provider(disk, inner_provider) { } diff --git a/src/core/tools/simulator/diske.sim.h b/src/core/tools/simulator/diske.sim.h index 5574d243d3..a431afe228 100644 --- a/src/core/tools/simulator/diske.sim.h +++ b/src/core/tools/simulator/diske.sim.h @@ -36,21 +36,12 @@ #pragma once #include -#if defined(_WIN32) -#define NATIVE_AIO_PROVIDER native_win_aio_provider -#include "../common/native_aio_provider.win.h" -#elif defined(__linux__) -#define NATIVE_AIO_PROVIDER native_linux_aio_provider -#include "../common/native_aio_provider.linux.h" -#else -#define NATIVE_AIO_PROVIDER native_posix_aio_provider -#include "../common/native_aio_provider.posix.h" -#endif +#include "core/tools/common/native_aio_provider.linux.h" namespace dsn { namespace tools { -class sim_aio_provider : public NATIVE_AIO_PROVIDER +class sim_aio_provider : public native_linux_aio_provider { public: sim_aio_provider(disk_engine *disk, aio_provider *inner_provider); @@ -58,5 +49,5 @@ class sim_aio_provider : public NATIVE_AIO_PROVIDER virtual void aio(aio_task *aio) override; }; -} -} // end namespace +} // namespace tools +} // namespace dsn diff --git a/src/dist/replication/storage_engine/simple_kv/config.ini b/src/dist/replication/storage_engine/simple_kv/config.ini index 2ab3881bac..d656f1e252 100644 --- a/src/dist/replication/storage_engine/simple_kv/config.ini +++ b/src/dist/replication/storage_engine/simple_kv/config.ini @@ -42,7 +42,6 @@ pause_on_start = false ;logging_start_level = LOG_LEVEL_WARNING ;logging_factory_name = dsn::tools::screen_logger ;logging_factory_name = dsn::tools::hpc_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simulator] random_seed = 0 diff --git a/src/dist/replication/test/simple_kv/case-000.ini b/src/dist/replication/test/simple_kv/case-000.ini index 5481291e6f..59255c8af9 100644 --- a/src/dist/replication/test/simple_kv/case-000.ini +++ b/src/dist/replication/test/simple_kv/case-000.ini @@ -45,7 +45,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-001.ini b/src/dist/replication/test/simple_kv/case-001.ini index 9cee756efd..b408f94019 100644 --- a/src/dist/replication/test/simple_kv/case-001.ini +++ b/src/dist/replication/test/simple_kv/case-001.ini @@ -45,7 +45,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-002.ini b/src/dist/replication/test/simple_kv/case-002.ini index 50a0fbb98a..916438bdb7 100644 --- a/src/dist/replication/test/simple_kv/case-002.ini +++ b/src/dist/replication/test/simple_kv/case-002.ini @@ -45,7 +45,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-003.ini b/src/dist/replication/test/simple_kv/case-003.ini index 3087f1e308..a9c4a823c3 100644 --- a/src/dist/replication/test/simple_kv/case-003.ini +++ b/src/dist/replication/test/simple_kv/case-003.ini @@ -45,7 +45,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-004.ini b/src/dist/replication/test/simple_kv/case-004.ini index a5350ea821..625ea66d39 100644 --- a/src/dist/replication/test/simple_kv/case-004.ini +++ b/src/dist/replication/test/simple_kv/case-004.ini @@ -45,7 +45,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-005.ini b/src/dist/replication/test/simple_kv/case-005.ini index 717ce295e6..5b2c17d60f 100644 --- a/src/dist/replication/test/simple_kv/case-005.ini +++ b/src/dist/replication/test/simple_kv/case-005.ini @@ -45,7 +45,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-006.ini b/src/dist/replication/test/simple_kv/case-006.ini index 2a899bba7d..a182885314 100644 --- a/src/dist/replication/test/simple_kv/case-006.ini +++ b/src/dist/replication/test/simple_kv/case-006.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-100.ini b/src/dist/replication/test/simple_kv/case-100.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-100.ini +++ b/src/dist/replication/test/simple_kv/case-100.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-101.ini b/src/dist/replication/test/simple_kv/case-101.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-101.ini +++ b/src/dist/replication/test/simple_kv/case-101.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-102.ini b/src/dist/replication/test/simple_kv/case-102.ini index 86f7afefef..527b801a1d 100644 --- a/src/dist/replication/test/simple_kv/case-102.ini +++ b/src/dist/replication/test/simple_kv/case-102.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-103.ini b/src/dist/replication/test/simple_kv/case-103.ini index 2611f242d4..848aac9f2c 100644 --- a/src/dist/replication/test/simple_kv/case-103.ini +++ b/src/dist/replication/test/simple_kv/case-103.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-104.ini b/src/dist/replication/test/simple_kv/case-104.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-104.ini +++ b/src/dist/replication/test/simple_kv/case-104.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-105.ini b/src/dist/replication/test/simple_kv/case-105.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-105.ini +++ b/src/dist/replication/test/simple_kv/case-105.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-106.ini b/src/dist/replication/test/simple_kv/case-106.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-106.ini +++ b/src/dist/replication/test/simple_kv/case-106.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-107.ini b/src/dist/replication/test/simple_kv/case-107.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-107.ini +++ b/src/dist/replication/test/simple_kv/case-107.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-108.ini b/src/dist/replication/test/simple_kv/case-108.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-108.ini +++ b/src/dist/replication/test/simple_kv/case-108.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-109.ini b/src/dist/replication/test/simple_kv/case-109.ini index a10fd75865..ad97c70a3a 100644 --- a/src/dist/replication/test/simple_kv/case-109.ini +++ b/src/dist/replication/test/simple_kv/case-109.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-200.ini b/src/dist/replication/test/simple_kv/case-200.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-200.ini +++ b/src/dist/replication/test/simple_kv/case-200.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-201.ini b/src/dist/replication/test/simple_kv/case-201.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-201.ini +++ b/src/dist/replication/test/simple_kv/case-201.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = 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 d735641380..bf5a755007 100644 --- a/src/dist/replication/test/simple_kv/case-202-0.ini +++ b/src/dist/replication/test/simple_kv/case-202-0.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = 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 d735641380..bf5a755007 100644 --- a/src/dist/replication/test/simple_kv/case-202-1.ini +++ b/src/dist/replication/test/simple_kv/case-202-1.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = 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 f0212865a0..3b1894de3d 100644 --- a/src/dist/replication/test/simple_kv/case-203-0.ini +++ b/src/dist/replication/test/simple_kv/case-203-0.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = 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 f0212865a0..3b1894de3d 100644 --- a/src/dist/replication/test/simple_kv/case-203-1.ini +++ b/src/dist/replication/test/simple_kv/case-203-1.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-204.ini b/src/dist/replication/test/simple_kv/case-204.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-204.ini +++ b/src/dist/replication/test/simple_kv/case-204.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-205.ini b/src/dist/replication/test/simple_kv/case-205.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-205.ini +++ b/src/dist/replication/test/simple_kv/case-205.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-206.ini b/src/dist/replication/test/simple_kv/case-206.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-206.ini +++ b/src/dist/replication/test/simple_kv/case-206.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-207.ini b/src/dist/replication/test/simple_kv/case-207.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-207.ini +++ b/src/dist/replication/test/simple_kv/case-207.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-208.ini b/src/dist/replication/test/simple_kv/case-208.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-208.ini +++ b/src/dist/replication/test/simple_kv/case-208.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-209.ini b/src/dist/replication/test/simple_kv/case-209.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-209.ini +++ b/src/dist/replication/test/simple_kv/case-209.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-210.ini b/src/dist/replication/test/simple_kv/case-210.ini index 0826d52eee..44210c55a6 100644 --- a/src/dist/replication/test/simple_kv/case-210.ini +++ b/src/dist/replication/test/simple_kv/case-210.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-211.ini b/src/dist/replication/test/simple_kv/case-211.ini index 0826d52eee..44210c55a6 100644 --- a/src/dist/replication/test/simple_kv/case-211.ini +++ b/src/dist/replication/test/simple_kv/case-211.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-212.ini b/src/dist/replication/test/simple_kv/case-212.ini index 0826d52eee..44210c55a6 100644 --- a/src/dist/replication/test/simple_kv/case-212.ini +++ b/src/dist/replication/test/simple_kv/case-212.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-213.ini b/src/dist/replication/test/simple_kv/case-213.ini index ff226bc1a7..a77dfebfc6 100644 --- a/src/dist/replication/test/simple_kv/case-213.ini +++ b/src/dist/replication/test/simple_kv/case-213.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-214.ini b/src/dist/replication/test/simple_kv/case-214.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-214.ini +++ b/src/dist/replication/test/simple_kv/case-214.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-215.ini b/src/dist/replication/test/simple_kv/case-215.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-215.ini +++ b/src/dist/replication/test/simple_kv/case-215.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-216.ini b/src/dist/replication/test/simple_kv/case-216.ini index 4addde14bf..e7e1b65a5a 100644 --- a/src/dist/replication/test/simple_kv/case-216.ini +++ b/src/dist/replication/test/simple_kv/case-216.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = 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 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-300-0.ini +++ b/src/dist/replication/test/simple_kv/case-300-0.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = 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 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-300-1.ini +++ b/src/dist/replication/test/simple_kv/case-300-1.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = 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 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-300-2.ini +++ b/src/dist/replication/test/simple_kv/case-300-2.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-301.ini b/src/dist/replication/test/simple_kv/case-301.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-301.ini +++ b/src/dist/replication/test/simple_kv/case-301.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-302.ini b/src/dist/replication/test/simple_kv/case-302.ini index 931f843e25..38a58768a0 100644 --- a/src/dist/replication/test/simple_kv/case-302.ini +++ b/src/dist/replication/test/simple_kv/case-302.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-303.ini b/src/dist/replication/test/simple_kv/case-303.ini index 2ac9cda863..863c5cfb02 100644 --- a/src/dist/replication/test/simple_kv/case-303.ini +++ b/src/dist/replication/test/simple_kv/case-303.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-304.ini b/src/dist/replication/test/simple_kv/case-304.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-304.ini +++ b/src/dist/replication/test/simple_kv/case-304.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-305.ini b/src/dist/replication/test/simple_kv/case-305.ini index 2ac9cda863..863c5cfb02 100644 --- a/src/dist/replication/test/simple_kv/case-305.ini +++ b/src/dist/replication/test/simple_kv/case-305.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-306.ini b/src/dist/replication/test/simple_kv/case-306.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-306.ini +++ b/src/dist/replication/test/simple_kv/case-306.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-307.ini b/src/dist/replication/test/simple_kv/case-307.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-307.ini +++ b/src/dist/replication/test/simple_kv/case-307.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-400.ini b/src/dist/replication/test/simple_kv/case-400.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-400.ini +++ b/src/dist/replication/test/simple_kv/case-400.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-401.ini b/src/dist/replication/test/simple_kv/case-401.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-401.ini +++ b/src/dist/replication/test/simple_kv/case-401.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-402.ini b/src/dist/replication/test/simple_kv/case-402.ini index 23b6193e7f..d268289caf 100644 --- a/src/dist/replication/test/simple_kv/case-402.ini +++ b/src/dist/replication/test/simple_kv/case-402.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-600.ini b/src/dist/replication/test/simple_kv/case-600.ini index 2a899bba7d..a182885314 100644 --- a/src/dist/replication/test/simple_kv/case-600.ini +++ b/src/dist/replication/test/simple_kv/case-600.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-601.ini b/src/dist/replication/test/simple_kv/case-601.ini index 230bcaafc8..94c8cf8783 100644 --- a/src/dist/replication/test/simple_kv/case-601.ini +++ b/src/dist/replication/test/simple_kv/case-601.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-602.ini b/src/dist/replication/test/simple_kv/case-602.ini index 2a899bba7d..a182885314 100644 --- a/src/dist/replication/test/simple_kv/case-602.ini +++ b/src/dist/replication/test/simple_kv/case-602.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/case-603.ini b/src/dist/replication/test/simple_kv/case-603.ini index 071ba5df44..e872524db5 100644 --- a/src/dist/replication/test/simple_kv/case-603.ini +++ b/src/dist/replication/test/simple_kv/case-603.ini @@ -46,7 +46,6 @@ pause_on_start = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simple_logger] short_header = false diff --git a/src/dist/replication/test/simple_kv/config.ini b/src/dist/replication/test/simple_kv/config.ini index d65bfdda72..cb268dadee 100644 --- a/src/dist/replication/test/simple_kv/config.ini +++ b/src/dist/replication/test/simple_kv/config.ini @@ -64,7 +64,6 @@ pause_on_start = false ;logging_start_level = LOG_LEVEL_WARNING ;logging_factory_name = dsn::tools::screen_logger ;logging_factory_name = dsn::tools::hpc_logger -;aio_factory_name = dsn::tools::empty_aio_provider [tools.simulator] random_seed = 0