XiaoMi · levy5307 · Jul 21, 2020 · Jul 20, 2020 · Jul 20, 2020 · Jul 20, 2020
diff --git a/compile_thrift.py b/compile_thrift.py
@@ -25,7 +25,7 @@
         },
         "file_move": {
             "_types.h": "include/dsn/cpp/serialization_helper",
-            "_types.cpp": "src/core/core"
+            "_types.cpp": "src/runtime"
         }
     },
     {

diff --git a/run.sh b/run.sh
@@ -59,7 +59,7 @@ function usage_build()
                                    type: address|leak|thread|undefined"
     if [ "$ONLY_BUILD" == "NO" ]; then
         echo "   -m|--test_module      specify modules to test, split by ',',"
-        echo "                         e.g., \"dsn.core.tests,dsn_meta_state_tests\","
+        echo "                         e.g., \"dsn_runtime_tests,dsn_meta_state_tests\","
         echo "                         if not set, then run all tests"
     fi
 }

diff --git a/scripts/linux/build.sh b/scripts/linux/build.sh
@@ -190,7 +190,7 @@ echo "################################# start testing ##########################
 if [ -z "$TEST_MODULE" ]
 then
     # supported test module
-    TEST_MODULE="dsn.core.tests,dsn_utils_tests,dsn_perf_counter_test,dsn.zookeeper.tests,dsn_aio_test,dsn.failure_detector.tests,dsn_meta_state_tests,dsn_nfs_test,dsn_block_service_test,dsn.replication.simple_kv,dsn.rep_tests.simple_kv,dsn.meta.test,dsn.replica.test,dsn_http_test,dsn_replica_dup_test,dsn_replica_backup_test,dsn_replica_bulk_load_test"
+    TEST_MODULE="dsn_runtime_tests,dsn_utils_tests,dsn_perf_counter_test,dsn.zookeeper.tests,dsn_aio_test,dsn.failure_detector.tests,dsn_meta_state_tests,dsn_nfs_test,dsn_block_service_test,dsn.replication.simple_kv,dsn.rep_tests.simple_kv,dsn.meta.test,dsn.replica.test,dsn_http_test,dsn_replica_dup_test,dsn_replica_backup_test,dsn_replica_bulk_load_test"
 fi
 
 echo "TEST_MODULE=$TEST_MODULE"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 if(UNIX)
     add_compile_options(-fPIC)
 endif()
-add_subdirectory(core)
+add_subdirectory(runtime)
 add_subdirectory(aio)
 add_subdirectory(zookeeper)
 add_subdirectory(perf_counter)

diff --git a/src/aio/aio_task.cpp b/src/aio/aio_task.cpp
@@ -2,7 +2,7 @@
 // This source code is licensed under the Apache License Version 2.0, which
 // can be found in the LICENSE file in the root directory of this source tree.
 
-#include "core/task/task_engine.h"
+#include "runtime/task/task_engine.h"
 #include <dsn/tool-api/file_io.h>
 #include <dsn/utility/error_code.h>
 

diff --git a/src/aio/disk_engine.cpp b/src/aio/disk_engine.cpp
@@ -28,7 +28,7 @@
 #include <dsn/tool-api/aio_task.h>
 #include "disk_engine.h"
 #include "sim_aio_provider.h"
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 
 using namespace dsn::utils;
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
diff --git a/src/core/core/CMakeLists.txt b/src/core/core/CMakeLists.txt
diff --git a/src/core/tests/run.sh b/src/core/tests/run.sh
diff --git a/src/core/tools/CMakeLists.txt b/src/core/tools/CMakeLists.txt
diff --git a/src/core/tools/common/CMakeLists.txt b/src/core/tools/common/CMakeLists.txt
diff --git a/src/core/tools/simulator/CMakeLists.txt b/src/core/tools/simulator/CMakeLists.txt
diff --git a/src/perf_counter/perf_counters.cpp b/src/perf_counter/perf_counters.cpp
@@ -40,7 +40,7 @@
 
 #include "perf_counter_atomic.h"
 #include "builtin_counters.h"
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 
 namespace dsn {
 

diff --git a/src/replica/storage/simple_kv/test/case.cpp b/src/replica/storage/simple_kv/test/case.cpp
@@ -40,7 +40,7 @@
 #include <dsn/tool-api/task.h>
 #include <dsn/tool-api/rpc_message.h>
 #include "replica/replica_stub.h"
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 #include "meta/server_load_balancer.h"
 
 #include <iostream>

diff --git a/src/replica/storage/simple_kv/test/checker.cpp b/src/replica/storage/simple_kv/test/checker.cpp
@@ -49,8 +49,8 @@
 #include "meta/server_state.h"
 #include "meta/server_load_balancer.h"
 
-#include "core/core/service_engine.h"
-#include "core/rpc/rpc_engine.h"
+#include "runtime/service_engine.h"
+#include "runtime/rpc/rpc_engine.h"
 
 namespace dsn {
 namespace replication {

diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
@@ -0,0 +1,32 @@
+add_subdirectory(test)
+add_subdirectory(rpc)
+add_subdirectory(task)
+
+# TODO(zlw) remove perf_counter from dsn_runtime after the refactor by WuTao
+add_library(dsn_runtime STATIC
+        $<TARGET_OBJECTS:dsn.rpc>
+        $<TARGET_OBJECTS:dsn.task>
+        $<TARGET_OBJECTS:dsn.perf_counter>
+        core_main.cpp
+        dsn.layer2_types.cpp
+        env.sim.cpp
+        explorer.cpp
+        fault_injector.cpp
+        global_config.cpp
+        message_utils.cpp
+        nativerun.cpp
+        profiler.cpp
+        profiler_command.cpp
+        profiler_output.cpp
+        providers.common.cpp
+        scheduler.cpp
+        service_api_c.cpp
+        service_engine.cpp
+        simulator.cpp
+        threadpool_code.cpp
+        tool_api.cpp
+        tracer.cpp
+        zlocks.cpp
+        )
+target_link_libraries(dsn_runtime dsn_utils)
+install(TARGETS dsn_runtime DESTINATION "lib")
diff --git a/src/core/core/build_config.h → src/runtime/build_config.h b/src/core/core/build_config.h → src/runtime/build_config.h
diff --git a/src/core/core/core_main.cpp → src/runtime/core_main.cpp b/src/core/core/core_main.cpp → src/runtime/core_main.cpp
diff --git a/src/core/core/dsn.layer2_types.cpp → src/runtime/dsn.layer2_types.cpp b/src/core/core/dsn.layer2_types.cpp → src/runtime/dsn.layer2_types.cpp
diff --git a/src/core/tools/simulator/env.sim.cpp → src/runtime/env.sim.cpp b/src/core/tools/simulator/env.sim.cpp → src/runtime/env.sim.cpp
diff --git a/src/core/tools/simulator/env.sim.h → src/runtime/env.sim.h b/src/core/tools/simulator/env.sim.h → src/runtime/env.sim.h
diff --git a/src/core/tools/common/explorer.cpp → src/runtime/explorer.cpp b/src/core/tools/common/explorer.cpp → src/runtime/explorer.cpp
diff --git a/src/core/tools/common/fault_injector.cpp → src/runtime/fault_injector.cpp b/src/core/tools/common/fault_injector.cpp → src/runtime/fault_injector.cpp
diff --git a/src/core/core/global_config.cpp → src/runtime/global_config.cpp b/src/core/core/global_config.cpp → src/runtime/global_config.cpp
diff --git a/src/core/core/message_utils.cpp → src/runtime/message_utils.cpp b/src/core/core/message_utils.cpp → src/runtime/message_utils.cpp
diff --git a/src/core/tools/common/nativerun.cpp → src/runtime/nativerun.cpp b/src/core/tools/common/nativerun.cpp → src/runtime/nativerun.cpp
diff --git a/src/core/tools/common/profiler.cpp → src/runtime/profiler.cpp b/src/core/tools/common/profiler.cpp → src/runtime/profiler.cpp
diff --git a/src/core/tools/common/profiler_command.cpp → src/runtime/profiler_command.cpp b/src/core/tools/common/profiler_command.cpp → src/runtime/profiler_command.cpp
diff --git a/src/core/tools/common/profiler_header.h → src/runtime/profiler_header.h b/src/core/tools/common/profiler_header.h → src/runtime/profiler_header.h
diff --git a/src/core/tools/common/profiler_output.cpp → src/runtime/profiler_output.cpp b/src/core/tools/common/profiler_output.cpp → src/runtime/profiler_output.cpp
diff --git a/src/core/tools/common/providers.common.cpp → src/runtime/providers.common.cpp b/src/core/tools/common/providers.common.cpp → src/runtime/providers.common.cpp
@@ -33,16 +33,16 @@
  *     xxxx-xx-xx, author, fix bug about xxx
  */
 
-#include "core/rpc/asio_net_provider.h"
+#include "runtime/rpc/asio_net_provider.h"
 #include <dsn/tool/providers.common.h>
 #include "utils/lockp.std.h"
-#include "core/task/simple_task_queue.h"
-#include "core/task/hpc_task_queue.h"
-#include "core/rpc/network.sim.h"
+#include "runtime/task/simple_task_queue.h"
+#include "runtime/task/hpc_task_queue.h"
+#include "runtime/rpc/network.sim.h"
 #include "utils/simple_logger.h"
-#include "core/rpc/dsn_message_parser.h"
-#include "core/rpc/thrift_message_parser.h"
-#include "core/rpc/raw_message_parser.h"
+#include "runtime/rpc/dsn_message_parser.h"
+#include "runtime/rpc/thrift_message_parser.h"
+#include "runtime/rpc/raw_message_parser.h"
 
 namespace dsn {
 namespace tools {

diff --git a/src/core/rpc/CMakeLists.txt → src/runtime/rpc/CMakeLists.txt b/src/core/rpc/CMakeLists.txt → src/runtime/rpc/CMakeLists.txt
diff --git a/src/core/rpc/asio_net_provider.cpp → src/runtime/rpc/asio_net_provider.cpp b/src/core/rpc/asio_net_provider.cpp → src/runtime/rpc/asio_net_provider.cpp
diff --git a/src/core/rpc/asio_net_provider.h → src/runtime/rpc/asio_net_provider.h b/src/core/rpc/asio_net_provider.h → src/runtime/rpc/asio_net_provider.h
diff --git a/src/core/rpc/asio_rpc_session.cpp → src/runtime/rpc/asio_rpc_session.cpp b/src/core/rpc/asio_rpc_session.cpp → src/runtime/rpc/asio_rpc_session.cpp
diff --git a/src/core/rpc/asio_rpc_session.h → src/runtime/rpc/asio_rpc_session.h b/src/core/rpc/asio_rpc_session.h → src/runtime/rpc/asio_rpc_session.h
diff --git a/src/core/rpc/dsn_message_parser.cpp → src/runtime/rpc/dsn_message_parser.cpp b/src/core/rpc/dsn_message_parser.cpp → src/runtime/rpc/dsn_message_parser.cpp
diff --git a/src/core/rpc/dsn_message_parser.h → src/runtime/rpc/dsn_message_parser.h b/src/core/rpc/dsn_message_parser.h → src/runtime/rpc/dsn_message_parser.h
diff --git a/src/core/rpc/message_parser.cpp → src/runtime/rpc/message_parser.cpp b/src/core/rpc/message_parser.cpp → src/runtime/rpc/message_parser.cpp
diff --git a/src/core/rpc/message_parser_manager.h → src/runtime/rpc/message_parser_manager.h b/src/core/rpc/message_parser_manager.h → src/runtime/rpc/message_parser_manager.h
diff --git a/src/core/rpc/network.cpp → src/runtime/rpc/network.cpp b/src/core/rpc/network.cpp → src/runtime/rpc/network.cpp
@@ -27,7 +27,7 @@
 #include <dsn/tool-api/network.h>
 #include <dsn/utility/factory_store.h>
 #include "message_parser_manager.h"
-#include "core/rpc/rpc_engine.h"
+#include "runtime/rpc/rpc_engine.h"
 
 namespace dsn {
 /*static*/ join_point<void, rpc_session *>

diff --git a/src/core/rpc/network.sim.cpp → src/runtime/rpc/network.sim.cpp b/src/core/rpc/network.sim.cpp → src/runtime/rpc/network.sim.cpp
diff --git a/src/core/rpc/network.sim.h → src/runtime/rpc/network.sim.h b/src/core/rpc/network.sim.h → src/runtime/rpc/network.sim.h
diff --git a/src/core/rpc/raw_message_parser.cpp → src/runtime/rpc/raw_message_parser.cpp b/src/core/rpc/raw_message_parser.cpp → src/runtime/rpc/raw_message_parser.cpp
diff --git a/src/core/rpc/raw_message_parser.h → src/runtime/rpc/raw_message_parser.h b/src/core/rpc/raw_message_parser.h → src/runtime/rpc/raw_message_parser.h
diff --git a/src/core/rpc/rpc_engine.cpp → src/runtime/rpc/rpc_engine.cpp b/src/core/rpc/rpc_engine.cpp → src/runtime/rpc/rpc_engine.cpp
@@ -31,7 +31,7 @@
 #include <arpa/inet.h>
 
 #include "rpc_engine.h"
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 #include <dsn/utility/factory_store.h>
 #include <dsn/tool-api/group_address.h>
 #include <dsn/tool-api/task_queue.h>

diff --git a/src/core/rpc/rpc_engine.h → src/runtime/rpc/rpc_engine.h b/src/core/rpc/rpc_engine.h → src/runtime/rpc/rpc_engine.h
diff --git a/src/core/rpc/rpc_message.cpp → src/runtime/rpc/rpc_message.cpp b/src/core/rpc/rpc_message.cpp → src/runtime/rpc/rpc_message.cpp
@@ -41,7 +41,7 @@
 #include <dsn/tool-api/message_parser.h>
 #include <cctype>
 
-#include "core/task/task_engine.h"
+#include "runtime/task/task_engine.h"
 
 using namespace dsn::utils;
 

diff --git a/src/core/rpc/rpc_task.cpp → src/runtime/rpc/rpc_task.cpp b/src/core/rpc/rpc_task.cpp → src/runtime/rpc/rpc_task.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "core/task/task_engine.h"
+#include "runtime/task/task_engine.h"
 #include <dsn/tool-api/task.h>
 
 namespace dsn {

diff --git a/src/core/rpc/thrift_message_parser.cpp → src/runtime/rpc/thrift_message_parser.cpp b/src/core/rpc/thrift_message_parser.cpp → src/runtime/rpc/thrift_message_parser.cpp
diff --git a/src/core/rpc/thrift_message_parser.h → src/runtime/rpc/thrift_message_parser.h b/src/core/rpc/thrift_message_parser.h → src/runtime/rpc/thrift_message_parser.h
diff --git a/src/core/tools/simulator/scheduler.cpp → src/runtime/scheduler.cpp b/src/core/tools/simulator/scheduler.cpp → src/runtime/scheduler.cpp
diff --git a/src/core/tools/simulator/scheduler.h → src/runtime/scheduler.h b/src/core/tools/simulator/scheduler.h → src/runtime/scheduler.h
diff --git a/src/core/core/service_api_c.cpp → src/runtime/service_api_c.cpp b/src/core/core/service_api_c.cpp → src/runtime/service_api_c.cpp
@@ -39,8 +39,8 @@
 #endif
 
 #include "service_engine.h"
-#include "core/rpc/rpc_engine.h"
-#include "core/task/task_engine.h"
+#include "runtime/rpc/rpc_engine.h"
+#include "runtime/task/task_engine.h"
 #include "utils/coredump.h"
 
 //

diff --git a/src/core/core/service_engine.cpp → src/runtime/service_engine.cpp b/src/core/core/service_engine.cpp → src/runtime/service_engine.cpp
@@ -25,8 +25,8 @@
  */
 
 #include "service_engine.h"
-#include "core/task/task_engine.h"
-#include "core/rpc/rpc_engine.h"
+#include "runtime/task/task_engine.h"
+#include "runtime/rpc/rpc_engine.h"
 
 #include <dsn/utility/filesystem.h>
 #include <dsn/utility/smart_pointers.h>

diff --git a/src/core/core/service_engine.h → src/runtime/service_engine.h b/src/core/core/service_engine.h → src/runtime/service_engine.h
diff --git a/src/core/tools/simulator/sim_clock.h → src/runtime/sim_clock.h b/src/core/tools/simulator/sim_clock.h → src/runtime/sim_clock.h
diff --git a/src/core/tools/simulator/simulator.cpp → src/runtime/simulator.cpp b/src/core/tools/simulator/simulator.cpp → src/runtime/simulator.cpp
@@ -37,7 +37,7 @@
 #include "scheduler.h"
 
 #include "env.sim.h"
-#include "core/task/task_engine.sim.h"
+#include "runtime/task/task_engine.sim.h"
 #include "sim_clock.h"
 
 namespace dsn {

diff --git a/src/core/task/CMakeLists.txt → src/runtime/task/CMakeLists.txt b/src/core/task/CMakeLists.txt → src/runtime/task/CMakeLists.txt
diff --git a/src/core/task/hpc_task_queue.cpp → src/runtime/task/hpc_task_queue.cpp b/src/core/task/hpc_task_queue.cpp → src/runtime/task/hpc_task_queue.cpp
diff --git a/src/core/task/hpc_task_queue.h → src/runtime/task/hpc_task_queue.h b/src/core/task/hpc_task_queue.h → src/runtime/task/hpc_task_queue.h
diff --git a/src/core/task/simple_task_queue.cpp → src/runtime/task/simple_task_queue.cpp b/src/core/task/simple_task_queue.cpp → src/runtime/task/simple_task_queue.cpp
diff --git a/src/core/task/simple_task_queue.h → src/runtime/task/simple_task_queue.h b/src/core/task/simple_task_queue.h → src/runtime/task/simple_task_queue.h
diff --git a/src/core/task/task.cpp → src/runtime/task/task.cpp b/src/core/task/task.cpp → src/runtime/task/task.cpp
@@ -44,8 +44,8 @@
 #include <dsn/dist/fmt_logging.h>
 
 #include "task_engine.h"
-#include "core/core/service_engine.h"
-#include "core/rpc/rpc_engine.h"
+#include "runtime/service_engine.h"
+#include "runtime/rpc/rpc_engine.h"
 
 namespace dsn {
 __thread struct __tls_dsn__ tls_dsn;

diff --git a/src/core/task/task_code.cpp → src/runtime/task/task_code.cpp b/src/core/task/task_code.cpp → src/runtime/task/task_code.cpp
diff --git a/src/core/task/task_engine.cpp → src/runtime/task/task_engine.cpp b/src/core/task/task_engine.cpp → src/runtime/task/task_engine.cpp
diff --git a/src/core/task/task_engine.h → src/runtime/task/task_engine.h b/src/core/task/task_engine.h → src/runtime/task/task_engine.h
@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 #include <dsn/tool-api/task_queue.h>
 #include <dsn/tool-api/admission_controller.h>
 #include <dsn/tool-api/task_worker.h>

diff --git a/src/core/task/task_engine.sim.cpp → src/runtime/task/task_engine.sim.cpp b/src/core/task/task_engine.sim.cpp → src/runtime/task/task_engine.sim.cpp
@@ -35,7 +35,7 @@
 
 #include <dsn/utility/rand.h>
 #include "task_engine.sim.h"
-#include "core/tools/simulator/scheduler.h"
+#include "runtime/scheduler.h"
 
 namespace dsn {
 namespace tools {

diff --git a/src/core/task/task_engine.sim.h → src/runtime/task/task_engine.sim.h b/src/core/task/task_engine.sim.h → src/runtime/task/task_engine.sim.h
diff --git a/src/core/task/task_queue.cpp → src/runtime/task/task_queue.cpp b/src/core/task/task_queue.cpp → src/runtime/task/task_queue.cpp
@@ -27,7 +27,7 @@
 #include <dsn/tool-api/task_queue.h>
 #include "task_engine.h"
 #include <dsn/tool-api/network.h>
-#include "core/rpc/rpc_engine.h"
+#include "runtime/rpc/rpc_engine.h"
 
 namespace dsn {
 

diff --git a/src/core/task/task_spec.cpp → src/runtime/task/task_spec.cpp b/src/core/task/task_spec.cpp → src/runtime/task/task_spec.cpp
diff --git a/src/core/task/task_tracker.cpp → src/runtime/task/task_tracker.cpp b/src/core/task/task_tracker.cpp → src/runtime/task/task_tracker.cpp
diff --git a/src/core/task/task_worker.cpp → src/runtime/task/task_worker.cpp b/src/core/task/task_worker.cpp → src/runtime/task/task_worker.cpp
diff --git a/src/core/tests/CMakeLists.txt → src/runtime/test/CMakeLists.txt b/src/core/tests/CMakeLists.txt → src/runtime/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MY_PROJ_NAME dsn.core.tests)
+set(MY_PROJ_NAME dsn_runtime_tests)
 
 # Search mode for source files under CURRENT project directory?
 # "GLOB_RECURSE" for recursive search

diff --git a/src/core/tests/async_call.cpp → src/runtime/test/async_call.cpp b/src/core/tests/async_call.cpp → src/runtime/test/async_call.cpp
diff --git a/src/core/tests/clear.sh → src/runtime/test/clear.sh b/src/core/tests/clear.sh → src/runtime/test/clear.sh
diff --git a/src/core/tests/command.txt → src/runtime/test/command.txt b/src/core/tests/command.txt → src/runtime/test/command.txt
diff --git a/...ore/tests/config-test-corrupt-message.ini → ...time/test/config-test-corrupt-message.ini b/...ore/tests/config-test-corrupt-message.ini → ...time/test/config-test-corrupt-message.ini
diff --git a/src/core/tests/config-test-sim.ini → src/runtime/test/config-test-sim.ini b/src/core/tests/config-test-sim.ini → src/runtime/test/config-test-sim.ini
diff --git a/src/core/tests/config-test.ini → src/runtime/test/config-test.ini b/src/core/tests/config-test.ini → src/runtime/test/config-test.ini
diff --git a/src/core/tests/corrupt_message.cpp → src/runtime/test/corrupt_message.cpp b/src/core/tests/corrupt_message.cpp → src/runtime/test/corrupt_message.cpp
diff --git a/src/core/tests/gtest.filter → src/runtime/test/gtest.filter b/src/core/tests/gtest.filter → src/runtime/test/gtest.filter
diff --git a/src/core/tests/lpc.cpp → src/runtime/test/lpc.cpp b/src/core/tests/lpc.cpp → src/runtime/test/lpc.cpp
diff --git a/src/core/tests/main.cpp → src/runtime/test/main.cpp b/src/core/tests/main.cpp → src/runtime/test/main.cpp
diff --git a/src/core/tests/message_reader_test.cpp → src/runtime/test/message_reader_test.cpp b/src/core/tests/message_reader_test.cpp → src/runtime/test/message_reader_test.cpp
diff --git a/src/core/tests/message_utils_test.cpp → src/runtime/test/message_utils_test.cpp b/src/core/tests/message_utils_test.cpp → src/runtime/test/message_utils_test.cpp
diff --git a/src/core/tests/netprovider.cpp → src/runtime/test/netprovider.cpp b/src/core/tests/netprovider.cpp → src/runtime/test/netprovider.cpp
@@ -43,10 +43,10 @@
 #include <dsn/tool-api/task.h>
 #include <dsn/tool-api/task_spec.h>
 
-#include "core/rpc/asio_net_provider.h"
-#include "core/rpc/network.sim.h"
-#include "core/core/service_engine.h"
-#include "core/rpc/rpc_engine.h"
+#include "runtime/rpc/asio_net_provider.h"
+#include "runtime/rpc/network.sim.h"
+#include "runtime/rpc/rpc_engine.h"
+#include "runtime/service_engine.h"
 #include "test_utils.h"
 
 using namespace dsn;

diff --git a/src/core/tests/pipeline_test.cpp → src/runtime/test/pipeline_test.cpp b/src/core/tests/pipeline_test.cpp → src/runtime/test/pipeline_test.cpp
diff --git a/src/core/tests/rpc.cpp → src/runtime/test/rpc.cpp b/src/core/tests/rpc.cpp → src/runtime/test/rpc.cpp
diff --git a/src/core/tests/rpc_holder_test.cpp → src/runtime/test/rpc_holder_test.cpp b/src/core/tests/rpc_holder_test.cpp → src/runtime/test/rpc_holder_test.cpp
diff --git a/src/core/tests/rpc_message.cpp → src/runtime/test/rpc_message.cpp b/src/core/tests/rpc_message.cpp → src/runtime/test/rpc_message.cpp
@@ -33,7 +33,7 @@
  *     xxxx-xx-xx, author, fix bug about xxx
  */
 
-#include "core/core/message_utils.cpp"
+#include "runtime/message_utils.cpp"
 #include <dsn/utility/crc.h>
 #include <dsn/utility/transient_memory.h>
 #include <dsn/tool-api/rpc_message.h>