From c7dcdba9c3381cb0bb5d5c5d61c507a15b815d6e Mon Sep 17 00:00:00 2001
From: levy <zlw5307@163.com>
Date: Mon, 20 Jul 2020 15:50:23 +0800
Subject: [PATCH 1/2] runtime

---
 compile_thrift.py                             |  2 +-
 run.sh                                        |  2 +-
 scripts/linux/build.sh                        |  2 +-
 src/CMakeLists.txt                            |  2 +-
 src/aio/aio_task.cpp                          |  2 +-
 src/aio/disk_engine.cpp                       |  2 +-
 src/core/CMakeLists.txt                       | 17 ----------
 src/core/core/CMakeLists.txt                  | 13 --------
 src/core/tests/run.sh                         | 33 -------------------
 src/core/tools/CMakeLists.txt                 |  2 --
 src/core/tools/common/CMakeLists.txt          | 17 ----------
 src/core/tools/simulator/CMakeLists.txt       | 17 ----------
 src/perf_counter/perf_counters.cpp            |  2 +-
 src/replica/storage/simple_kv/test/case.cpp   |  2 +-
 .../storage/simple_kv/test/checker.cpp        |  4 +--
 src/runtime/CMakeLists.txt                    | 32 ++++++++++++++++++
 src/{core/core => runtime}/build_config.h     |  0
 src/{core/core => runtime}/core_main.cpp      |  0
 .../core => runtime}/dsn.layer2_types.cpp     |  0
 .../tools/simulator => runtime}/env.sim.cpp   |  0
 .../tools/simulator => runtime}/env.sim.h     |  0
 .../tools/common => runtime}/explorer.cpp     |  0
 .../common => runtime}/fault_injector.cpp     |  0
 src/{core/core => runtime}/global_config.cpp  |  0
 src/{core/core => runtime}/message_utils.cpp  |  0
 .../tools/common => runtime}/nativerun.cpp    |  0
 .../tools/common => runtime}/profiler.cpp     |  0
 .../common => runtime}/profiler_command.cpp   |  0
 .../common => runtime}/profiler_header.h      |  0
 .../common => runtime}/profiler_output.cpp    |  0
 .../common => runtime}/providers.common.cpp   | 14 ++++----
 src/{core => runtime}/rpc/CMakeLists.txt      |  0
 .../rpc/asio_net_provider.cpp                 |  0
 src/{core => runtime}/rpc/asio_net_provider.h |  0
 .../rpc/asio_rpc_session.cpp                  |  0
 src/{core => runtime}/rpc/asio_rpc_session.h  |  0
 .../rpc/dsn_message_parser.cpp                |  0
 .../rpc/dsn_message_parser.h                  |  0
 src/{core => runtime}/rpc/message_parser.cpp  |  0
 .../rpc/message_parser_manager.h              |  0
 src/{core => runtime}/rpc/network.cpp         |  2 +-
 src/{core => runtime}/rpc/network.sim.cpp     |  0
 src/{core => runtime}/rpc/network.sim.h       |  0
 .../rpc/raw_message_parser.cpp                |  0
 .../rpc/raw_message_parser.h                  |  0
 src/{core => runtime}/rpc/rpc_engine.cpp      |  2 +-
 src/{core => runtime}/rpc/rpc_engine.h        |  0
 src/{core => runtime}/rpc/rpc_message.cpp     |  2 +-
 src/{core => runtime}/rpc/rpc_task.cpp        |  2 +-
 .../rpc/thrift_message_parser.cpp             |  0
 .../rpc/thrift_message_parser.h               |  0
 .../tools/simulator => runtime}/scheduler.cpp |  0
 .../tools/simulator => runtime}/scheduler.h   |  0
 src/{core/core => runtime}/service_api_c.cpp  |  4 +--
 src/{core/core => runtime}/service_engine.cpp |  4 +--
 src/{core/core => runtime}/service_engine.h   |  0
 .../tools/simulator => runtime}/sim_clock.h   |  0
 .../tools/simulator => runtime}/simulator.cpp |  2 +-
 src/{core => runtime}/task/CMakeLists.txt     |  0
 src/{core => runtime}/task/hpc_task_queue.cpp |  0
 src/{core => runtime}/task/hpc_task_queue.h   |  0
 .../task/simple_task_queue.cpp                |  0
 .../task/simple_task_queue.h                  |  0
 src/{core => runtime}/task/task.cpp           |  4 +--
 src/{core => runtime}/task/task_code.cpp      |  0
 src/{core => runtime}/task/task_engine.cpp    |  0
 src/{core => runtime}/task/task_engine.h      |  2 +-
 .../task/task_engine.sim.cpp                  |  2 +-
 src/{core => runtime}/task/task_engine.sim.h  |  0
 src/{core => runtime}/task/task_queue.cpp     |  2 +-
 src/{core => runtime}/task/task_spec.cpp      |  0
 src/{core => runtime}/task/task_tracker.cpp   |  0
 src/{core => runtime}/task/task_worker.cpp    |  0
 .../tests => runtime/test}/CMakeLists.txt     |  2 +-
 .../tests => runtime/test}/async_call.cpp     |  0
 src/{core/tests => runtime/test}/clear.sh     |  0
 src/{core/tests => runtime/test}/command.txt  |  0
 .../test}/config-test-corrupt-message.ini     |  0
 .../test}/config-test-sim.ini                 |  0
 .../tests => runtime/test}/config-test.ini    |  0
 .../test}/corrupt_message.cpp                 |  0
 src/{core/tests => runtime/test}/gtest.filter |  0
 src/{core/tests => runtime/test}/lpc.cpp      |  0
 src/{core/tests => runtime/test}/main.cpp     |  0
 .../test}/message_reader_test.cpp             |  0
 .../test}/message_utils_test.cpp              |  0
 .../tests => runtime/test}/netprovider.cpp    |  8 ++---
 .../tests => runtime/test}/pipeline_test.cpp  |  0
 src/{core/tests => runtime/test}/rpc.cpp      |  0
 .../test}/rpc_holder_test.cpp                 |  0
 .../tests => runtime/test}/rpc_message.cpp    |  2 +-
 src/runtime/test/run.sh                       | 33 +++++++++++++++++++
 .../tests => runtime/test}/service_api_c.cpp  |  2 +-
 src/{core/tests => runtime/test}/sim_lock.cpp |  6 ++--
 .../tests => runtime/test}/task_engine.cpp    |  2 +-
 .../tests => runtime/test}/task_test.cpp      |  0
 src/{core/tests => runtime/test}/test_utils.h |  0
 .../test}/thrift_message_parser_test.cpp      |  2 +-
 .../core => runtime}/threadpool_code.cpp      |  0
 src/{core/core => runtime}/tool_api.cpp       |  4 +--
 src/{core/tools/common => runtime}/tracer.cpp |  0
 src/{core/core => runtime}/zlocks.cpp         |  2 +-
 102 files changed, 111 insertions(+), 145 deletions(-)
 delete mode 100644 src/core/CMakeLists.txt
 delete mode 100644 src/core/core/CMakeLists.txt
 delete mode 100755 src/core/tests/run.sh
 delete mode 100644 src/core/tools/CMakeLists.txt
 delete mode 100644 src/core/tools/common/CMakeLists.txt
 delete mode 100644 src/core/tools/simulator/CMakeLists.txt
 create mode 100644 src/runtime/CMakeLists.txt
 rename src/{core/core => runtime}/build_config.h (100%)
 rename src/{core/core => runtime}/core_main.cpp (100%)
 rename src/{core/core => runtime}/dsn.layer2_types.cpp (100%)
 rename src/{core/tools/simulator => runtime}/env.sim.cpp (100%)
 rename src/{core/tools/simulator => runtime}/env.sim.h (100%)
 rename src/{core/tools/common => runtime}/explorer.cpp (100%)
 rename src/{core/tools/common => runtime}/fault_injector.cpp (100%)
 rename src/{core/core => runtime}/global_config.cpp (100%)
 rename src/{core/core => runtime}/message_utils.cpp (100%)
 rename src/{core/tools/common => runtime}/nativerun.cpp (100%)
 rename src/{core/tools/common => runtime}/profiler.cpp (100%)
 rename src/{core/tools/common => runtime}/profiler_command.cpp (100%)
 rename src/{core/tools/common => runtime}/profiler_header.h (100%)
 rename src/{core/tools/common => runtime}/profiler_output.cpp (100%)
 rename src/{core/tools/common => runtime}/providers.common.cpp (90%)
 rename src/{core => runtime}/rpc/CMakeLists.txt (100%)
 rename src/{core => runtime}/rpc/asio_net_provider.cpp (100%)
 rename src/{core => runtime}/rpc/asio_net_provider.h (100%)
 rename src/{core => runtime}/rpc/asio_rpc_session.cpp (100%)
 rename src/{core => runtime}/rpc/asio_rpc_session.h (100%)
 rename src/{core => runtime}/rpc/dsn_message_parser.cpp (100%)
 rename src/{core => runtime}/rpc/dsn_message_parser.h (100%)
 rename src/{core => runtime}/rpc/message_parser.cpp (100%)
 rename src/{core => runtime}/rpc/message_parser_manager.h (100%)
 rename src/{core => runtime}/rpc/network.cpp (99%)
 rename src/{core => runtime}/rpc/network.sim.cpp (100%)
 rename src/{core => runtime}/rpc/network.sim.h (100%)
 rename src/{core => runtime}/rpc/raw_message_parser.cpp (100%)
 rename src/{core => runtime}/rpc/raw_message_parser.h (100%)
 rename src/{core => runtime}/rpc/rpc_engine.cpp (99%)
 rename src/{core => runtime}/rpc/rpc_engine.h (100%)
 rename src/{core => runtime}/rpc/rpc_message.cpp (99%)
 rename src/{core => runtime}/rpc/rpc_task.cpp (99%)
 rename src/{core => runtime}/rpc/thrift_message_parser.cpp (100%)
 rename src/{core => runtime}/rpc/thrift_message_parser.h (100%)
 rename src/{core/tools/simulator => runtime}/scheduler.cpp (100%)
 rename src/{core/tools/simulator => runtime}/scheduler.h (100%)
 rename src/{core/core => runtime}/service_api_c.cpp (99%)
 rename src/{core/core => runtime}/service_engine.cpp (99%)
 rename src/{core/core => runtime}/service_engine.h (100%)
 rename src/{core/tools/simulator => runtime}/sim_clock.h (100%)
 rename src/{core/tools/simulator => runtime}/simulator.cpp (99%)
 rename src/{core => runtime}/task/CMakeLists.txt (100%)
 rename src/{core => runtime}/task/hpc_task_queue.cpp (100%)
 rename src/{core => runtime}/task/hpc_task_queue.h (100%)
 rename src/{core => runtime}/task/simple_task_queue.cpp (100%)
 rename src/{core => runtime}/task/simple_task_queue.h (100%)
 rename src/{core => runtime}/task/task.cpp (99%)
 rename src/{core => runtime}/task/task_code.cpp (100%)
 rename src/{core => runtime}/task/task_engine.cpp (100%)
 rename src/{core => runtime}/task/task_engine.h (99%)
 rename src/{core => runtime}/task/task_engine.sim.cpp (99%)
 rename src/{core => runtime}/task/task_engine.sim.h (100%)
 rename src/{core => runtime}/task/task_queue.cpp (99%)
 rename src/{core => runtime}/task/task_spec.cpp (100%)
 rename src/{core => runtime}/task/task_tracker.cpp (100%)
 rename src/{core => runtime}/task/task_worker.cpp (100%)
 rename src/{core/tests => runtime/test}/CMakeLists.txt (95%)
 rename src/{core/tests => runtime/test}/async_call.cpp (100%)
 rename src/{core/tests => runtime/test}/clear.sh (100%)
 rename src/{core/tests => runtime/test}/command.txt (100%)
 rename src/{core/tests => runtime/test}/config-test-corrupt-message.ini (100%)
 rename src/{core/tests => runtime/test}/config-test-sim.ini (100%)
 rename src/{core/tests => runtime/test}/config-test.ini (100%)
 rename src/{core/tests => runtime/test}/corrupt_message.cpp (100%)
 rename src/{core/tests => runtime/test}/gtest.filter (100%)
 rename src/{core/tests => runtime/test}/lpc.cpp (100%)
 rename src/{core/tests => runtime/test}/main.cpp (100%)
 rename src/{core/tests => runtime/test}/message_reader_test.cpp (100%)
 rename src/{core/tests => runtime/test}/message_utils_test.cpp (100%)
 rename src/{core/tests => runtime/test}/netprovider.cpp (98%)
 rename src/{core/tests => runtime/test}/pipeline_test.cpp (100%)
 rename src/{core/tests => runtime/test}/rpc.cpp (100%)
 rename src/{core/tests => runtime/test}/rpc_holder_test.cpp (100%)
 rename src/{core/tests => runtime/test}/rpc_message.cpp (99%)
 create mode 100755 src/runtime/test/run.sh
 rename src/{core/tests => runtime/test}/service_api_c.cpp (99%)
 rename src/{core/tests => runtime/test}/sim_lock.cpp (96%)
 rename src/{core/tests => runtime/test}/task_engine.cpp (99%)
 rename src/{core/tests => runtime/test}/task_test.cpp (100%)
 rename src/{core/tests => runtime/test}/test_utils.h (100%)
 rename src/{core/tests => runtime/test}/thrift_message_parser_test.cpp (99%)
 rename src/{core/core => runtime}/threadpool_code.cpp (100%)
 rename src/{core/core => runtime}/tool_api.cpp (98%)
 rename src/{core/tools/common => runtime}/tracer.cpp (100%)
 rename src/{core/core => runtime}/zlocks.cpp (99%)

diff --git a/compile_thrift.py b/compile_thrift.py
index fe41489b29..ea88e2866b 100755
--- 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
index 8136293b3c..fcb95e8386 100755
--- 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
index af777316a6..0f326d455f 100755
--- 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
index e46782fee0..0ddbbfae09 100644
--- 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
index 533b9deab6..e565c63368 100644
--- 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
index 9792521eb8..6bf7b09126 100644
--- 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
deleted file mode 100644
index f75eb8bcf5..0000000000
--- a/src/core/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-add_subdirectory(core)
-add_subdirectory(tools)
-add_subdirectory(tests)
-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.core>
-        $<TARGET_OBJECTS:dsn.rpc>
-        $<TARGET_OBJECTS:dsn.task>
-        $<TARGET_OBJECTS:dsn.perf_counter>
-        $<TARGET_OBJECTS:dsn.tools.common>
-        $<TARGET_OBJECTS:dsn.tools.simulator>
-        )
-target_link_libraries(dsn_runtime dsn_utils)
-install(TARGETS dsn_runtime DESTINATION "lib")
diff --git a/src/core/core/CMakeLists.txt b/src/core/core/CMakeLists.txt
deleted file mode 100644
index 950abf08a0..0000000000
--- a/src/core/core/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(MY_PROJ_NAME dsn.core)
-
-# 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_LIBS "")
-
-# Extra files that will be installed
-set(MY_BINPLACES "")
-
-dsn_add_object()
diff --git a/src/core/tests/run.sh b/src/core/tests/run.sh
deleted file mode 100755
index 923b22551e..0000000000
--- a/src/core/tests/run.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-if [ -z "${REPORT_DIR}" ]; then
-    REPORT_DIR="."
-fi
-
-while read -r -a line; do
-    test_case=${line[0]}
-    gtest_filter=${line[1]}
-    output_xml="${REPORT_DIR}/dsn.core.tests_${test_case/.ini/.xml}"
-    echo "============ run dsn.core.tests ${test_case} with gtest_filter ${gtest_filter} ============"
-    ./clear.sh
-    GTEST_OUTPUT="xml:${output_xml}" GTEST_FILTER=${gtest_filter} ./dsn.core.tests ${test_case} < command.txt
-
-    if [ $? -ne 0 ]; then
-        echo "run dsn.core.tests $test_case failed"
-        echo "---- ls ----"
-        ls -l
-        if find . -name log.1.txt; then
-            echo "---- tail -n 100 log.1.txt ----"
-            tail -n 100 `find . -name log.1.txt`
-        fi
-        if [ -f core ]; then
-            echo "---- gdb ./dsn.core.tests core ----"
-            gdb ./dsn.core.tests core -ex "thread apply all bt" -ex "set pagination 0" -batch
-        fi
-        exit 1
-    fi
-    echo "============ done dsn.core.tests ${test_case} with gtest_filter ${gtest_filter} ============"
-done <gtest.filter
-
-echo "============ done dsn.core.tests ============"
-
diff --git a/src/core/tools/CMakeLists.txt b/src/core/tools/CMakeLists.txt
deleted file mode 100644
index 7b8332837d..0000000000
--- a/src/core/tools/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(common)
-add_subdirectory(simulator)
diff --git a/src/core/tools/common/CMakeLists.txt b/src/core/tools/common/CMakeLists.txt
deleted file mode 100644
index 90553308f8..0000000000
--- a/src/core/tools/common/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(MY_PROJ_NAME dsn.tools.common)
-
-# 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_LIBS "")
-
-# Extra files that will be installed
-set(MY_BINPLACES "")
-
-dsn_add_object()
diff --git a/src/core/tools/simulator/CMakeLists.txt b/src/core/tools/simulator/CMakeLists.txt
deleted file mode 100644
index 72beaf1f87..0000000000
--- a/src/core/tools/simulator/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(MY_PROJ_NAME dsn.tools.simulator)
-
-# 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_LIBS "")
-
-# Extra files that will be installed
-set(MY_BINPLACES "")
-
-dsn_add_object()
diff --git a/src/perf_counter/perf_counters.cpp b/src/perf_counter/perf_counters.cpp
index 4ebc44ddb9..0afbcaf346 100644
--- 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
index 68a056c841..34cb45f119 100644
--- 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
index 6e146c8663..bb9d7a9e7b 100644
--- 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
new file mode 100644
index 0000000000..5ebbeda09d
--- /dev/null
+++ 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 b/src/runtime/build_config.h
similarity index 100%
rename from src/core/core/build_config.h
rename to src/runtime/build_config.h
diff --git a/src/core/core/core_main.cpp b/src/runtime/core_main.cpp
similarity index 100%
rename from src/core/core/core_main.cpp
rename to src/runtime/core_main.cpp
diff --git a/src/core/core/dsn.layer2_types.cpp b/src/runtime/dsn.layer2_types.cpp
similarity index 100%
rename from src/core/core/dsn.layer2_types.cpp
rename to src/runtime/dsn.layer2_types.cpp
diff --git a/src/core/tools/simulator/env.sim.cpp b/src/runtime/env.sim.cpp
similarity index 100%
rename from src/core/tools/simulator/env.sim.cpp
rename to src/runtime/env.sim.cpp
diff --git a/src/core/tools/simulator/env.sim.h b/src/runtime/env.sim.h
similarity index 100%
rename from src/core/tools/simulator/env.sim.h
rename to src/runtime/env.sim.h
diff --git a/src/core/tools/common/explorer.cpp b/src/runtime/explorer.cpp
similarity index 100%
rename from src/core/tools/common/explorer.cpp
rename to src/runtime/explorer.cpp
diff --git a/src/core/tools/common/fault_injector.cpp b/src/runtime/fault_injector.cpp
similarity index 100%
rename from src/core/tools/common/fault_injector.cpp
rename to src/runtime/fault_injector.cpp
diff --git a/src/core/core/global_config.cpp b/src/runtime/global_config.cpp
similarity index 100%
rename from src/core/core/global_config.cpp
rename to src/runtime/global_config.cpp
diff --git a/src/core/core/message_utils.cpp b/src/runtime/message_utils.cpp
similarity index 100%
rename from src/core/core/message_utils.cpp
rename to src/runtime/message_utils.cpp
diff --git a/src/core/tools/common/nativerun.cpp b/src/runtime/nativerun.cpp
similarity index 100%
rename from src/core/tools/common/nativerun.cpp
rename to src/runtime/nativerun.cpp
diff --git a/src/core/tools/common/profiler.cpp b/src/runtime/profiler.cpp
similarity index 100%
rename from src/core/tools/common/profiler.cpp
rename to src/runtime/profiler.cpp
diff --git a/src/core/tools/common/profiler_command.cpp b/src/runtime/profiler_command.cpp
similarity index 100%
rename from src/core/tools/common/profiler_command.cpp
rename to src/runtime/profiler_command.cpp
diff --git a/src/core/tools/common/profiler_header.h b/src/runtime/profiler_header.h
similarity index 100%
rename from src/core/tools/common/profiler_header.h
rename to src/runtime/profiler_header.h
diff --git a/src/core/tools/common/profiler_output.cpp b/src/runtime/profiler_output.cpp
similarity index 100%
rename from src/core/tools/common/profiler_output.cpp
rename to src/runtime/profiler_output.cpp
diff --git a/src/core/tools/common/providers.common.cpp b/src/runtime/providers.common.cpp
similarity index 90%
rename from src/core/tools/common/providers.common.cpp
rename to src/runtime/providers.common.cpp
index a52c150cdd..41dbb19485 100644
--- a/src/core/tools/common/providers.common.cpp
+++ b/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 b/src/runtime/rpc/CMakeLists.txt
similarity index 100%
rename from src/core/rpc/CMakeLists.txt
rename to src/runtime/rpc/CMakeLists.txt
diff --git a/src/core/rpc/asio_net_provider.cpp b/src/runtime/rpc/asio_net_provider.cpp
similarity index 100%
rename from src/core/rpc/asio_net_provider.cpp
rename to src/runtime/rpc/asio_net_provider.cpp
diff --git a/src/core/rpc/asio_net_provider.h b/src/runtime/rpc/asio_net_provider.h
similarity index 100%
rename from src/core/rpc/asio_net_provider.h
rename to src/runtime/rpc/asio_net_provider.h
diff --git a/src/core/rpc/asio_rpc_session.cpp b/src/runtime/rpc/asio_rpc_session.cpp
similarity index 100%
rename from src/core/rpc/asio_rpc_session.cpp
rename to src/runtime/rpc/asio_rpc_session.cpp
diff --git a/src/core/rpc/asio_rpc_session.h b/src/runtime/rpc/asio_rpc_session.h
similarity index 100%
rename from src/core/rpc/asio_rpc_session.h
rename to src/runtime/rpc/asio_rpc_session.h
diff --git a/src/core/rpc/dsn_message_parser.cpp b/src/runtime/rpc/dsn_message_parser.cpp
similarity index 100%
rename from src/core/rpc/dsn_message_parser.cpp
rename to src/runtime/rpc/dsn_message_parser.cpp
diff --git a/src/core/rpc/dsn_message_parser.h b/src/runtime/rpc/dsn_message_parser.h
similarity index 100%
rename from src/core/rpc/dsn_message_parser.h
rename to src/runtime/rpc/dsn_message_parser.h
diff --git a/src/core/rpc/message_parser.cpp b/src/runtime/rpc/message_parser.cpp
similarity index 100%
rename from src/core/rpc/message_parser.cpp
rename to src/runtime/rpc/message_parser.cpp
diff --git a/src/core/rpc/message_parser_manager.h b/src/runtime/rpc/message_parser_manager.h
similarity index 100%
rename from src/core/rpc/message_parser_manager.h
rename to src/runtime/rpc/message_parser_manager.h
diff --git a/src/core/rpc/network.cpp b/src/runtime/rpc/network.cpp
similarity index 99%
rename from src/core/rpc/network.cpp
rename to src/runtime/rpc/network.cpp
index cfce7a4fb7..d2456790a6 100644
--- a/src/core/rpc/network.cpp
+++ b/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 b/src/runtime/rpc/network.sim.cpp
similarity index 100%
rename from src/core/rpc/network.sim.cpp
rename to src/runtime/rpc/network.sim.cpp
diff --git a/src/core/rpc/network.sim.h b/src/runtime/rpc/network.sim.h
similarity index 100%
rename from src/core/rpc/network.sim.h
rename to src/runtime/rpc/network.sim.h
diff --git a/src/core/rpc/raw_message_parser.cpp b/src/runtime/rpc/raw_message_parser.cpp
similarity index 100%
rename from src/core/rpc/raw_message_parser.cpp
rename to src/runtime/rpc/raw_message_parser.cpp
diff --git a/src/core/rpc/raw_message_parser.h b/src/runtime/rpc/raw_message_parser.h
similarity index 100%
rename from src/core/rpc/raw_message_parser.h
rename to src/runtime/rpc/raw_message_parser.h
diff --git a/src/core/rpc/rpc_engine.cpp b/src/runtime/rpc/rpc_engine.cpp
similarity index 99%
rename from src/core/rpc/rpc_engine.cpp
rename to src/runtime/rpc/rpc_engine.cpp
index 2dd0972b4e..2bf70dec71 100644
--- a/src/core/rpc/rpc_engine.cpp
+++ b/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 b/src/runtime/rpc/rpc_engine.h
similarity index 100%
rename from src/core/rpc/rpc_engine.h
rename to src/runtime/rpc/rpc_engine.h
diff --git a/src/core/rpc/rpc_message.cpp b/src/runtime/rpc/rpc_message.cpp
similarity index 99%
rename from src/core/rpc/rpc_message.cpp
rename to src/runtime/rpc/rpc_message.cpp
index 16e926496e..1f884c531e 100644
--- a/src/core/rpc/rpc_message.cpp
+++ b/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 b/src/runtime/rpc/rpc_task.cpp
similarity index 99%
rename from src/core/rpc/rpc_task.cpp
rename to src/runtime/rpc/rpc_task.cpp
index b95578efa3..7b1dbee3d6 100644
--- a/src/core/rpc/rpc_task.cpp
+++ b/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 b/src/runtime/rpc/thrift_message_parser.cpp
similarity index 100%
rename from src/core/rpc/thrift_message_parser.cpp
rename to src/runtime/rpc/thrift_message_parser.cpp
diff --git a/src/core/rpc/thrift_message_parser.h b/src/runtime/rpc/thrift_message_parser.h
similarity index 100%
rename from src/core/rpc/thrift_message_parser.h
rename to src/runtime/rpc/thrift_message_parser.h
diff --git a/src/core/tools/simulator/scheduler.cpp b/src/runtime/scheduler.cpp
similarity index 100%
rename from src/core/tools/simulator/scheduler.cpp
rename to src/runtime/scheduler.cpp
diff --git a/src/core/tools/simulator/scheduler.h b/src/runtime/scheduler.h
similarity index 100%
rename from src/core/tools/simulator/scheduler.h
rename to src/runtime/scheduler.h
diff --git a/src/core/core/service_api_c.cpp b/src/runtime/service_api_c.cpp
similarity index 99%
rename from src/core/core/service_api_c.cpp
rename to src/runtime/service_api_c.cpp
index b955451e0c..194f3a8c40 100644
--- a/src/core/core/service_api_c.cpp
+++ b/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 b/src/runtime/service_engine.cpp
similarity index 99%
rename from src/core/core/service_engine.cpp
rename to src/runtime/service_engine.cpp
index 54f26c9eaf..5703fd0c10 100644
--- a/src/core/core/service_engine.cpp
+++ b/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 b/src/runtime/service_engine.h
similarity index 100%
rename from src/core/core/service_engine.h
rename to src/runtime/service_engine.h
diff --git a/src/core/tools/simulator/sim_clock.h b/src/runtime/sim_clock.h
similarity index 100%
rename from src/core/tools/simulator/sim_clock.h
rename to src/runtime/sim_clock.h
diff --git a/src/core/tools/simulator/simulator.cpp b/src/runtime/simulator.cpp
similarity index 99%
rename from src/core/tools/simulator/simulator.cpp
rename to src/runtime/simulator.cpp
index 06e12f0ef1..b78c8c27c1 100644
--- a/src/core/tools/simulator/simulator.cpp
+++ b/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 b/src/runtime/task/CMakeLists.txt
similarity index 100%
rename from src/core/task/CMakeLists.txt
rename to src/runtime/task/CMakeLists.txt
diff --git a/src/core/task/hpc_task_queue.cpp b/src/runtime/task/hpc_task_queue.cpp
similarity index 100%
rename from src/core/task/hpc_task_queue.cpp
rename to src/runtime/task/hpc_task_queue.cpp
diff --git a/src/core/task/hpc_task_queue.h b/src/runtime/task/hpc_task_queue.h
similarity index 100%
rename from src/core/task/hpc_task_queue.h
rename to src/runtime/task/hpc_task_queue.h
diff --git a/src/core/task/simple_task_queue.cpp b/src/runtime/task/simple_task_queue.cpp
similarity index 100%
rename from src/core/task/simple_task_queue.cpp
rename to src/runtime/task/simple_task_queue.cpp
diff --git a/src/core/task/simple_task_queue.h b/src/runtime/task/simple_task_queue.h
similarity index 100%
rename from src/core/task/simple_task_queue.h
rename to src/runtime/task/simple_task_queue.h
diff --git a/src/core/task/task.cpp b/src/runtime/task/task.cpp
similarity index 99%
rename from src/core/task/task.cpp
rename to src/runtime/task/task.cpp
index 9ee1df944b..792201b006 100644
--- a/src/core/task/task.cpp
+++ b/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 b/src/runtime/task/task_code.cpp
similarity index 100%
rename from src/core/task/task_code.cpp
rename to src/runtime/task/task_code.cpp
diff --git a/src/core/task/task_engine.cpp b/src/runtime/task/task_engine.cpp
similarity index 100%
rename from src/core/task/task_engine.cpp
rename to src/runtime/task/task_engine.cpp
diff --git a/src/core/task/task_engine.h b/src/runtime/task/task_engine.h
similarity index 99%
rename from src/core/task/task_engine.h
rename to src/runtime/task/task_engine.h
index 9726d10447..871bb079e5 100644
--- a/src/core/task/task_engine.h
+++ b/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 b/src/runtime/task/task_engine.sim.cpp
similarity index 99%
rename from src/core/task/task_engine.sim.cpp
rename to src/runtime/task/task_engine.sim.cpp
index 6eda4fec65..b7ce80cb56 100644
--- a/src/core/task/task_engine.sim.cpp
+++ b/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 b/src/runtime/task/task_engine.sim.h
similarity index 100%
rename from src/core/task/task_engine.sim.h
rename to src/runtime/task/task_engine.sim.h
diff --git a/src/core/task/task_queue.cpp b/src/runtime/task/task_queue.cpp
similarity index 99%
rename from src/core/task/task_queue.cpp
rename to src/runtime/task/task_queue.cpp
index 858fe21cee..a673d4968b 100644
--- a/src/core/task/task_queue.cpp
+++ b/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 b/src/runtime/task/task_spec.cpp
similarity index 100%
rename from src/core/task/task_spec.cpp
rename to src/runtime/task/task_spec.cpp
diff --git a/src/core/task/task_tracker.cpp b/src/runtime/task/task_tracker.cpp
similarity index 100%
rename from src/core/task/task_tracker.cpp
rename to src/runtime/task/task_tracker.cpp
diff --git a/src/core/task/task_worker.cpp b/src/runtime/task/task_worker.cpp
similarity index 100%
rename from src/core/task/task_worker.cpp
rename to src/runtime/task/task_worker.cpp
diff --git a/src/core/tests/CMakeLists.txt b/src/runtime/test/CMakeLists.txt
similarity index 95%
rename from src/core/tests/CMakeLists.txt
rename to src/runtime/test/CMakeLists.txt
index 3d0e95bf64..a6f0f47ee3 100644
--- a/src/core/tests/CMakeLists.txt
+++ b/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 b/src/runtime/test/async_call.cpp
similarity index 100%
rename from src/core/tests/async_call.cpp
rename to src/runtime/test/async_call.cpp
diff --git a/src/core/tests/clear.sh b/src/runtime/test/clear.sh
similarity index 100%
rename from src/core/tests/clear.sh
rename to src/runtime/test/clear.sh
diff --git a/src/core/tests/command.txt b/src/runtime/test/command.txt
similarity index 100%
rename from src/core/tests/command.txt
rename to src/runtime/test/command.txt
diff --git a/src/core/tests/config-test-corrupt-message.ini b/src/runtime/test/config-test-corrupt-message.ini
similarity index 100%
rename from src/core/tests/config-test-corrupt-message.ini
rename to src/runtime/test/config-test-corrupt-message.ini
diff --git a/src/core/tests/config-test-sim.ini b/src/runtime/test/config-test-sim.ini
similarity index 100%
rename from src/core/tests/config-test-sim.ini
rename to src/runtime/test/config-test-sim.ini
diff --git a/src/core/tests/config-test.ini b/src/runtime/test/config-test.ini
similarity index 100%
rename from src/core/tests/config-test.ini
rename to src/runtime/test/config-test.ini
diff --git a/src/core/tests/corrupt_message.cpp b/src/runtime/test/corrupt_message.cpp
similarity index 100%
rename from src/core/tests/corrupt_message.cpp
rename to src/runtime/test/corrupt_message.cpp
diff --git a/src/core/tests/gtest.filter b/src/runtime/test/gtest.filter
similarity index 100%
rename from src/core/tests/gtest.filter
rename to src/runtime/test/gtest.filter
diff --git a/src/core/tests/lpc.cpp b/src/runtime/test/lpc.cpp
similarity index 100%
rename from src/core/tests/lpc.cpp
rename to src/runtime/test/lpc.cpp
diff --git a/src/core/tests/main.cpp b/src/runtime/test/main.cpp
similarity index 100%
rename from src/core/tests/main.cpp
rename to src/runtime/test/main.cpp
diff --git a/src/core/tests/message_reader_test.cpp b/src/runtime/test/message_reader_test.cpp
similarity index 100%
rename from src/core/tests/message_reader_test.cpp
rename to src/runtime/test/message_reader_test.cpp
diff --git a/src/core/tests/message_utils_test.cpp b/src/runtime/test/message_utils_test.cpp
similarity index 100%
rename from src/core/tests/message_utils_test.cpp
rename to src/runtime/test/message_utils_test.cpp
diff --git a/src/core/tests/netprovider.cpp b/src/runtime/test/netprovider.cpp
similarity index 98%
rename from src/core/tests/netprovider.cpp
rename to src/runtime/test/netprovider.cpp
index 37d11065da..d3ca51392f 100644
--- a/src/core/tests/netprovider.cpp
+++ b/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 b/src/runtime/test/pipeline_test.cpp
similarity index 100%
rename from src/core/tests/pipeline_test.cpp
rename to src/runtime/test/pipeline_test.cpp
diff --git a/src/core/tests/rpc.cpp b/src/runtime/test/rpc.cpp
similarity index 100%
rename from src/core/tests/rpc.cpp
rename to src/runtime/test/rpc.cpp
diff --git a/src/core/tests/rpc_holder_test.cpp b/src/runtime/test/rpc_holder_test.cpp
similarity index 100%
rename from src/core/tests/rpc_holder_test.cpp
rename to src/runtime/test/rpc_holder_test.cpp
diff --git a/src/core/tests/rpc_message.cpp b/src/runtime/test/rpc_message.cpp
similarity index 99%
rename from src/core/tests/rpc_message.cpp
rename to src/runtime/test/rpc_message.cpp
index bb93b40db5..9dc28b4b34 100644
--- a/src/core/tests/rpc_message.cpp
+++ b/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>
diff --git a/src/runtime/test/run.sh b/src/runtime/test/run.sh
new file mode 100755
index 0000000000..1b0ab81bc3
--- /dev/null
+++ b/src/runtime/test/run.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+if [ -z "${REPORT_DIR}" ]; then
+    REPORT_DIR="."
+fi
+
+while read -r -a line; do
+    test_case=${line[0]}
+    gtest_filter=${line[1]}
+    output_xml="${REPORT_DIR}/dsn_runtime_tests_${test_case/.ini/.xml}"
+    echo "============ run dsn_runtime_tests ${test_case} with gtest_filter ${gtest_filter} ============"
+    ./clear.sh
+    GTEST_OUTPUT="xml:${output_xml}" GTEST_FILTER=${gtest_filter} ./dsn_runtime_tests ${test_case} < command.txt
+
+    if [ $? -ne 0 ]; then
+        echo "run dsn_runtime_tests $test_case failed"
+        echo "---- ls ----"
+        ls -l
+        if find . -name log.1.txt; then
+            echo "---- tail -n 100 log.1.txt ----"
+            tail -n 100 `find . -name log.1.txt`
+        fi
+        if [ -f core ]; then
+            echo "---- gdb ./dsn_runtime_tests core ----"
+            gdb ./dsn_runtime_tests core -ex "thread apply all bt" -ex "set pagination 0" -batch
+        fi
+        exit 1
+    fi
+    echo "============ done dsn_runtime_tests ${test_case} with gtest_filter ${gtest_filter} ============"
+done <gtest.filter
+
+echo "============ done dsn_runtime_tests ============"
+
diff --git a/src/core/tests/service_api_c.cpp b/src/runtime/test/service_api_c.cpp
similarity index 99%
rename from src/core/tests/service_api_c.cpp
rename to src/runtime/test/service_api_c.cpp
index 7593fe2320..6bb3a46b6b 100644
--- a/src/core/tests/service_api_c.cpp
+++ b/src/runtime/test/service_api_c.cpp
@@ -43,7 +43,7 @@
 #include <gtest/gtest.h>
 #include <thread>
 #include <dsn/utility/rand.h>
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 
 using namespace dsn;
 
diff --git a/src/core/tests/sim_lock.cpp b/src/runtime/test/sim_lock.cpp
similarity index 96%
rename from src/core/tests/sim_lock.cpp
rename to src/runtime/test/sim_lock.cpp
index 8ba86ba319..95b54ace03 100644
--- a/src/core/tests/sim_lock.cpp
+++ b/src/runtime/test/sim_lock.cpp
@@ -41,9 +41,9 @@
 #include <dsn/utility/synchronize.h>
 #include <gtest/gtest.h>
 #include <thread>
-#include "core/core/service_engine.h"
-#include "core/task/task_engine.sim.h"
-#include "core/tools/simulator/scheduler.h"
+#include "runtime/service_engine.h"
+#include "runtime/task/task_engine.sim.h"
+#include "runtime/scheduler.h"
 
 TEST(tools_simulator, dsn_semaphore)
 {
diff --git a/src/core/tests/task_engine.cpp b/src/runtime/test/task_engine.cpp
similarity index 99%
rename from src/core/tests/task_engine.cpp
rename to src/runtime/test/task_engine.cpp
index 8159bc3181..2fe98f7647 100644
--- a/src/core/tests/task_engine.cpp
+++ b/src/runtime/test/task_engine.cpp
@@ -33,7 +33,7 @@
  *     xxxx-xx-xx, author, fix bug about xxx
  */
 
-#include "core/task/task_engine.h"
+#include "runtime/task/task_engine.h"
 #include "test_utils.h"
 #include <dsn/tool_api.h>
 #include <gtest/gtest.h>
diff --git a/src/core/tests/task_test.cpp b/src/runtime/test/task_test.cpp
similarity index 100%
rename from src/core/tests/task_test.cpp
rename to src/runtime/test/task_test.cpp
diff --git a/src/core/tests/test_utils.h b/src/runtime/test/test_utils.h
similarity index 100%
rename from src/core/tests/test_utils.h
rename to src/runtime/test/test_utils.h
diff --git a/src/core/tests/thrift_message_parser_test.cpp b/src/runtime/test/thrift_message_parser_test.cpp
similarity index 99%
rename from src/core/tests/thrift_message_parser_test.cpp
rename to src/runtime/test/thrift_message_parser_test.cpp
index e5fdc77252..368cc292c8 100644
--- a/src/core/tests/thrift_message_parser_test.cpp
+++ b/src/runtime/test/thrift_message_parser_test.cpp
@@ -8,7 +8,7 @@
 #include <dsn/cpp/serialization_helper/thrift_helper.h>
 #include <dsn/cpp/serialization_helper/dsn.layer2_types.h>
 
-#include "core/rpc/thrift_message_parser.h"
+#include "runtime/rpc/thrift_message_parser.h"
 
 namespace dsn {
 
diff --git a/src/core/core/threadpool_code.cpp b/src/runtime/threadpool_code.cpp
similarity index 100%
rename from src/core/core/threadpool_code.cpp
rename to src/runtime/threadpool_code.cpp
diff --git a/src/core/core/tool_api.cpp b/src/runtime/tool_api.cpp
similarity index 98%
rename from src/core/core/tool_api.cpp
rename to src/runtime/tool_api.cpp
index 4c4d604929..0eab6cf3eb 100644
--- a/src/core/core/tool_api.cpp
+++ b/src/runtime/tool_api.cpp
@@ -36,8 +36,8 @@
 #include <dsn/tool_api.h>
 #include <dsn/utility/factory_store.h>
 #include <dsn/utility/singleton_store.h>
-#include "core/core/service_engine.h"
-#include "core/rpc/message_parser_manager.h"
+#include "runtime/service_engine.h"
+#include "runtime/rpc/message_parser_manager.h"
 
 namespace dsn {
 
diff --git a/src/core/tools/common/tracer.cpp b/src/runtime/tracer.cpp
similarity index 100%
rename from src/core/tools/common/tracer.cpp
rename to src/runtime/tracer.cpp
diff --git a/src/core/core/zlocks.cpp b/src/runtime/zlocks.cpp
similarity index 99%
rename from src/core/core/zlocks.cpp
rename to src/runtime/zlocks.cpp
index 08b7322ad0..88bceb6c35 100644
--- a/src/core/core/zlocks.cpp
+++ b/src/runtime/zlocks.cpp
@@ -36,7 +36,7 @@
 #include <dsn/utility/factory_store.h>
 #include <dsn/tool-api/zlocks.h>
 #include "utils/zlock_provider.h"
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 
 namespace dsn {
 

From 5e0faf2ab81edf7f860f4341847f893ff2884dd1 Mon Sep 17 00:00:00 2001
From: levy <zlw5307@163.com>
Date: Mon, 20 Jul 2020 15:50:23 +0800
Subject: [PATCH 2/2] refactor: runtime

---
 compile_thrift.py                             |  2 +-
 run.sh                                        |  2 +-
 scripts/linux/build.sh                        |  2 +-
 src/CMakeLists.txt                            |  2 +-
 src/aio/aio_task.cpp                          |  2 +-
 src/aio/disk_engine.cpp                       |  2 +-
 src/core/CMakeLists.txt                       | 17 ----------
 src/core/core/CMakeLists.txt                  | 13 --------
 src/core/tests/run.sh                         | 33 -------------------
 src/core/tools/CMakeLists.txt                 |  2 --
 src/core/tools/common/CMakeLists.txt          | 17 ----------
 src/core/tools/simulator/CMakeLists.txt       | 17 ----------
 src/perf_counter/perf_counters.cpp            |  2 +-
 src/replica/storage/simple_kv/test/case.cpp   |  2 +-
 .../storage/simple_kv/test/checker.cpp        |  4 +--
 src/runtime/CMakeLists.txt                    | 32 ++++++++++++++++++
 src/{core/core => runtime}/build_config.h     |  0
 src/{core/core => runtime}/core_main.cpp      |  0
 .../core => runtime}/dsn.layer2_types.cpp     |  0
 .../tools/simulator => runtime}/env.sim.cpp   |  0
 .../tools/simulator => runtime}/env.sim.h     |  0
 .../tools/common => runtime}/explorer.cpp     |  0
 .../common => runtime}/fault_injector.cpp     |  0
 src/{core/core => runtime}/global_config.cpp  |  0
 src/{core/core => runtime}/message_utils.cpp  |  0
 .../tools/common => runtime}/nativerun.cpp    |  0
 .../tools/common => runtime}/profiler.cpp     |  0
 .../common => runtime}/profiler_command.cpp   |  0
 .../common => runtime}/profiler_header.h      |  0
 .../common => runtime}/profiler_output.cpp    |  0
 .../common => runtime}/providers.common.cpp   | 14 ++++----
 src/{core => runtime}/rpc/CMakeLists.txt      |  0
 .../rpc/asio_net_provider.cpp                 |  0
 src/{core => runtime}/rpc/asio_net_provider.h |  0
 .../rpc/asio_rpc_session.cpp                  |  0
 src/{core => runtime}/rpc/asio_rpc_session.h  |  0
 .../rpc/dsn_message_parser.cpp                |  0
 .../rpc/dsn_message_parser.h                  |  0
 src/{core => runtime}/rpc/message_parser.cpp  |  0
 .../rpc/message_parser_manager.h              |  0
 src/{core => runtime}/rpc/network.cpp         |  2 +-
 src/{core => runtime}/rpc/network.sim.cpp     |  0
 src/{core => runtime}/rpc/network.sim.h       |  0
 .../rpc/raw_message_parser.cpp                |  0
 .../rpc/raw_message_parser.h                  |  0
 src/{core => runtime}/rpc/rpc_engine.cpp      |  2 +-
 src/{core => runtime}/rpc/rpc_engine.h        |  0
 src/{core => runtime}/rpc/rpc_message.cpp     |  2 +-
 src/{core => runtime}/rpc/rpc_task.cpp        |  2 +-
 .../rpc/thrift_message_parser.cpp             |  0
 .../rpc/thrift_message_parser.h               |  0
 .../tools/simulator => runtime}/scheduler.cpp |  0
 .../tools/simulator => runtime}/scheduler.h   |  0
 src/{core/core => runtime}/service_api_c.cpp  |  4 +--
 src/{core/core => runtime}/service_engine.cpp |  4 +--
 src/{core/core => runtime}/service_engine.h   |  0
 .../tools/simulator => runtime}/sim_clock.h   |  0
 .../tools/simulator => runtime}/simulator.cpp |  2 +-
 src/{core => runtime}/task/CMakeLists.txt     |  0
 src/{core => runtime}/task/hpc_task_queue.cpp |  0
 src/{core => runtime}/task/hpc_task_queue.h   |  0
 .../task/simple_task_queue.cpp                |  0
 .../task/simple_task_queue.h                  |  0
 src/{core => runtime}/task/task.cpp           |  4 +--
 src/{core => runtime}/task/task_code.cpp      |  0
 src/{core => runtime}/task/task_engine.cpp    |  0
 src/{core => runtime}/task/task_engine.h      |  2 +-
 .../task/task_engine.sim.cpp                  |  2 +-
 src/{core => runtime}/task/task_engine.sim.h  |  0
 src/{core => runtime}/task/task_queue.cpp     |  2 +-
 src/{core => runtime}/task/task_spec.cpp      |  0
 src/{core => runtime}/task/task_tracker.cpp   |  0
 src/{core => runtime}/task/task_worker.cpp    |  0
 .../tests => runtime/test}/CMakeLists.txt     |  2 +-
 .../tests => runtime/test}/async_call.cpp     |  0
 src/{core/tests => runtime/test}/clear.sh     |  0
 src/{core/tests => runtime/test}/command.txt  |  0
 .../test}/config-test-corrupt-message.ini     |  0
 .../test}/config-test-sim.ini                 |  0
 .../tests => runtime/test}/config-test.ini    |  0
 .../test}/corrupt_message.cpp                 |  0
 src/{core/tests => runtime/test}/gtest.filter |  0
 src/{core/tests => runtime/test}/lpc.cpp      |  0
 src/{core/tests => runtime/test}/main.cpp     |  0
 .../test}/message_reader_test.cpp             |  0
 .../test}/message_utils_test.cpp              |  0
 .../tests => runtime/test}/netprovider.cpp    |  8 ++---
 .../tests => runtime/test}/pipeline_test.cpp  |  0
 src/{core/tests => runtime/test}/rpc.cpp      |  0
 .../test}/rpc_holder_test.cpp                 |  0
 .../tests => runtime/test}/rpc_message.cpp    |  2 +-
 src/runtime/test/run.sh                       | 33 +++++++++++++++++++
 .../tests => runtime/test}/service_api_c.cpp  |  2 +-
 src/{core/tests => runtime/test}/sim_lock.cpp |  6 ++--
 .../tests => runtime/test}/task_engine.cpp    |  2 +-
 .../tests => runtime/test}/task_test.cpp      |  0
 src/{core/tests => runtime/test}/test_utils.h |  0
 .../test}/thrift_message_parser_test.cpp      |  2 +-
 .../core => runtime}/threadpool_code.cpp      |  0
 src/{core/core => runtime}/tool_api.cpp       |  4 +--
 src/{core/tools/common => runtime}/tracer.cpp |  0
 src/{core/core => runtime}/zlocks.cpp         |  2 +-
 102 files changed, 111 insertions(+), 145 deletions(-)
 delete mode 100644 src/core/CMakeLists.txt
 delete mode 100644 src/core/core/CMakeLists.txt
 delete mode 100755 src/core/tests/run.sh
 delete mode 100644 src/core/tools/CMakeLists.txt
 delete mode 100644 src/core/tools/common/CMakeLists.txt
 delete mode 100644 src/core/tools/simulator/CMakeLists.txt
 create mode 100644 src/runtime/CMakeLists.txt
 rename src/{core/core => runtime}/build_config.h (100%)
 rename src/{core/core => runtime}/core_main.cpp (100%)
 rename src/{core/core => runtime}/dsn.layer2_types.cpp (100%)
 rename src/{core/tools/simulator => runtime}/env.sim.cpp (100%)
 rename src/{core/tools/simulator => runtime}/env.sim.h (100%)
 rename src/{core/tools/common => runtime}/explorer.cpp (100%)
 rename src/{core/tools/common => runtime}/fault_injector.cpp (100%)
 rename src/{core/core => runtime}/global_config.cpp (100%)
 rename src/{core/core => runtime}/message_utils.cpp (100%)
 rename src/{core/tools/common => runtime}/nativerun.cpp (100%)
 rename src/{core/tools/common => runtime}/profiler.cpp (100%)
 rename src/{core/tools/common => runtime}/profiler_command.cpp (100%)
 rename src/{core/tools/common => runtime}/profiler_header.h (100%)
 rename src/{core/tools/common => runtime}/profiler_output.cpp (100%)
 rename src/{core/tools/common => runtime}/providers.common.cpp (90%)
 rename src/{core => runtime}/rpc/CMakeLists.txt (100%)
 rename src/{core => runtime}/rpc/asio_net_provider.cpp (100%)
 rename src/{core => runtime}/rpc/asio_net_provider.h (100%)
 rename src/{core => runtime}/rpc/asio_rpc_session.cpp (100%)
 rename src/{core => runtime}/rpc/asio_rpc_session.h (100%)
 rename src/{core => runtime}/rpc/dsn_message_parser.cpp (100%)
 rename src/{core => runtime}/rpc/dsn_message_parser.h (100%)
 rename src/{core => runtime}/rpc/message_parser.cpp (100%)
 rename src/{core => runtime}/rpc/message_parser_manager.h (100%)
 rename src/{core => runtime}/rpc/network.cpp (99%)
 rename src/{core => runtime}/rpc/network.sim.cpp (100%)
 rename src/{core => runtime}/rpc/network.sim.h (100%)
 rename src/{core => runtime}/rpc/raw_message_parser.cpp (100%)
 rename src/{core => runtime}/rpc/raw_message_parser.h (100%)
 rename src/{core => runtime}/rpc/rpc_engine.cpp (99%)
 rename src/{core => runtime}/rpc/rpc_engine.h (100%)
 rename src/{core => runtime}/rpc/rpc_message.cpp (99%)
 rename src/{core => runtime}/rpc/rpc_task.cpp (99%)
 rename src/{core => runtime}/rpc/thrift_message_parser.cpp (100%)
 rename src/{core => runtime}/rpc/thrift_message_parser.h (100%)
 rename src/{core/tools/simulator => runtime}/scheduler.cpp (100%)
 rename src/{core/tools/simulator => runtime}/scheduler.h (100%)
 rename src/{core/core => runtime}/service_api_c.cpp (99%)
 rename src/{core/core => runtime}/service_engine.cpp (99%)
 rename src/{core/core => runtime}/service_engine.h (100%)
 rename src/{core/tools/simulator => runtime}/sim_clock.h (100%)
 rename src/{core/tools/simulator => runtime}/simulator.cpp (99%)
 rename src/{core => runtime}/task/CMakeLists.txt (100%)
 rename src/{core => runtime}/task/hpc_task_queue.cpp (100%)
 rename src/{core => runtime}/task/hpc_task_queue.h (100%)
 rename src/{core => runtime}/task/simple_task_queue.cpp (100%)
 rename src/{core => runtime}/task/simple_task_queue.h (100%)
 rename src/{core => runtime}/task/task.cpp (99%)
 rename src/{core => runtime}/task/task_code.cpp (100%)
 rename src/{core => runtime}/task/task_engine.cpp (100%)
 rename src/{core => runtime}/task/task_engine.h (99%)
 rename src/{core => runtime}/task/task_engine.sim.cpp (99%)
 rename src/{core => runtime}/task/task_engine.sim.h (100%)
 rename src/{core => runtime}/task/task_queue.cpp (99%)
 rename src/{core => runtime}/task/task_spec.cpp (100%)
 rename src/{core => runtime}/task/task_tracker.cpp (100%)
 rename src/{core => runtime}/task/task_worker.cpp (100%)
 rename src/{core/tests => runtime/test}/CMakeLists.txt (95%)
 rename src/{core/tests => runtime/test}/async_call.cpp (100%)
 rename src/{core/tests => runtime/test}/clear.sh (100%)
 rename src/{core/tests => runtime/test}/command.txt (100%)
 rename src/{core/tests => runtime/test}/config-test-corrupt-message.ini (100%)
 rename src/{core/tests => runtime/test}/config-test-sim.ini (100%)
 rename src/{core/tests => runtime/test}/config-test.ini (100%)
 rename src/{core/tests => runtime/test}/corrupt_message.cpp (100%)
 rename src/{core/tests => runtime/test}/gtest.filter (100%)
 rename src/{core/tests => runtime/test}/lpc.cpp (100%)
 rename src/{core/tests => runtime/test}/main.cpp (100%)
 rename src/{core/tests => runtime/test}/message_reader_test.cpp (100%)
 rename src/{core/tests => runtime/test}/message_utils_test.cpp (100%)
 rename src/{core/tests => runtime/test}/netprovider.cpp (98%)
 rename src/{core/tests => runtime/test}/pipeline_test.cpp (100%)
 rename src/{core/tests => runtime/test}/rpc.cpp (100%)
 rename src/{core/tests => runtime/test}/rpc_holder_test.cpp (100%)
 rename src/{core/tests => runtime/test}/rpc_message.cpp (99%)
 create mode 100755 src/runtime/test/run.sh
 rename src/{core/tests => runtime/test}/service_api_c.cpp (99%)
 rename src/{core/tests => runtime/test}/sim_lock.cpp (96%)
 rename src/{core/tests => runtime/test}/task_engine.cpp (99%)
 rename src/{core/tests => runtime/test}/task_test.cpp (100%)
 rename src/{core/tests => runtime/test}/test_utils.h (100%)
 rename src/{core/tests => runtime/test}/thrift_message_parser_test.cpp (99%)
 rename src/{core/core => runtime}/threadpool_code.cpp (100%)
 rename src/{core/core => runtime}/tool_api.cpp (98%)
 rename src/{core/tools/common => runtime}/tracer.cpp (100%)
 rename src/{core/core => runtime}/zlocks.cpp (99%)

diff --git a/compile_thrift.py b/compile_thrift.py
index fe41489b29..ea88e2866b 100755
--- 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
index 8136293b3c..fcb95e8386 100755
--- 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
index af777316a6..0f326d455f 100755
--- 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
index e46782fee0..0ddbbfae09 100644
--- 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
index 533b9deab6..e565c63368 100644
--- 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
index 9792521eb8..6bf7b09126 100644
--- 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
deleted file mode 100644
index f75eb8bcf5..0000000000
--- a/src/core/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-add_subdirectory(core)
-add_subdirectory(tools)
-add_subdirectory(tests)
-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.core>
-        $<TARGET_OBJECTS:dsn.rpc>
-        $<TARGET_OBJECTS:dsn.task>
-        $<TARGET_OBJECTS:dsn.perf_counter>
-        $<TARGET_OBJECTS:dsn.tools.common>
-        $<TARGET_OBJECTS:dsn.tools.simulator>
-        )
-target_link_libraries(dsn_runtime dsn_utils)
-install(TARGETS dsn_runtime DESTINATION "lib")
diff --git a/src/core/core/CMakeLists.txt b/src/core/core/CMakeLists.txt
deleted file mode 100644
index 950abf08a0..0000000000
--- a/src/core/core/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(MY_PROJ_NAME dsn.core)
-
-# 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_LIBS "")
-
-# Extra files that will be installed
-set(MY_BINPLACES "")
-
-dsn_add_object()
diff --git a/src/core/tests/run.sh b/src/core/tests/run.sh
deleted file mode 100755
index 923b22551e..0000000000
--- a/src/core/tests/run.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-if [ -z "${REPORT_DIR}" ]; then
-    REPORT_DIR="."
-fi
-
-while read -r -a line; do
-    test_case=${line[0]}
-    gtest_filter=${line[1]}
-    output_xml="${REPORT_DIR}/dsn.core.tests_${test_case/.ini/.xml}"
-    echo "============ run dsn.core.tests ${test_case} with gtest_filter ${gtest_filter} ============"
-    ./clear.sh
-    GTEST_OUTPUT="xml:${output_xml}" GTEST_FILTER=${gtest_filter} ./dsn.core.tests ${test_case} < command.txt
-
-    if [ $? -ne 0 ]; then
-        echo "run dsn.core.tests $test_case failed"
-        echo "---- ls ----"
-        ls -l
-        if find . -name log.1.txt; then
-            echo "---- tail -n 100 log.1.txt ----"
-            tail -n 100 `find . -name log.1.txt`
-        fi
-        if [ -f core ]; then
-            echo "---- gdb ./dsn.core.tests core ----"
-            gdb ./dsn.core.tests core -ex "thread apply all bt" -ex "set pagination 0" -batch
-        fi
-        exit 1
-    fi
-    echo "============ done dsn.core.tests ${test_case} with gtest_filter ${gtest_filter} ============"
-done <gtest.filter
-
-echo "============ done dsn.core.tests ============"
-
diff --git a/src/core/tools/CMakeLists.txt b/src/core/tools/CMakeLists.txt
deleted file mode 100644
index 7b8332837d..0000000000
--- a/src/core/tools/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(common)
-add_subdirectory(simulator)
diff --git a/src/core/tools/common/CMakeLists.txt b/src/core/tools/common/CMakeLists.txt
deleted file mode 100644
index 90553308f8..0000000000
--- a/src/core/tools/common/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(MY_PROJ_NAME dsn.tools.common)
-
-# 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_LIBS "")
-
-# Extra files that will be installed
-set(MY_BINPLACES "")
-
-dsn_add_object()
diff --git a/src/core/tools/simulator/CMakeLists.txt b/src/core/tools/simulator/CMakeLists.txt
deleted file mode 100644
index 72beaf1f87..0000000000
--- a/src/core/tools/simulator/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(MY_PROJ_NAME dsn.tools.simulator)
-
-# 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_LIBS "")
-
-# Extra files that will be installed
-set(MY_BINPLACES "")
-
-dsn_add_object()
diff --git a/src/perf_counter/perf_counters.cpp b/src/perf_counter/perf_counters.cpp
index 4ebc44ddb9..0afbcaf346 100644
--- 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
index 68a056c841..34cb45f119 100644
--- 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
index 6e146c8663..bb9d7a9e7b 100644
--- 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
new file mode 100644
index 0000000000..5ebbeda09d
--- /dev/null
+++ 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 b/src/runtime/build_config.h
similarity index 100%
rename from src/core/core/build_config.h
rename to src/runtime/build_config.h
diff --git a/src/core/core/core_main.cpp b/src/runtime/core_main.cpp
similarity index 100%
rename from src/core/core/core_main.cpp
rename to src/runtime/core_main.cpp
diff --git a/src/core/core/dsn.layer2_types.cpp b/src/runtime/dsn.layer2_types.cpp
similarity index 100%
rename from src/core/core/dsn.layer2_types.cpp
rename to src/runtime/dsn.layer2_types.cpp
diff --git a/src/core/tools/simulator/env.sim.cpp b/src/runtime/env.sim.cpp
similarity index 100%
rename from src/core/tools/simulator/env.sim.cpp
rename to src/runtime/env.sim.cpp
diff --git a/src/core/tools/simulator/env.sim.h b/src/runtime/env.sim.h
similarity index 100%
rename from src/core/tools/simulator/env.sim.h
rename to src/runtime/env.sim.h
diff --git a/src/core/tools/common/explorer.cpp b/src/runtime/explorer.cpp
similarity index 100%
rename from src/core/tools/common/explorer.cpp
rename to src/runtime/explorer.cpp
diff --git a/src/core/tools/common/fault_injector.cpp b/src/runtime/fault_injector.cpp
similarity index 100%
rename from src/core/tools/common/fault_injector.cpp
rename to src/runtime/fault_injector.cpp
diff --git a/src/core/core/global_config.cpp b/src/runtime/global_config.cpp
similarity index 100%
rename from src/core/core/global_config.cpp
rename to src/runtime/global_config.cpp
diff --git a/src/core/core/message_utils.cpp b/src/runtime/message_utils.cpp
similarity index 100%
rename from src/core/core/message_utils.cpp
rename to src/runtime/message_utils.cpp
diff --git a/src/core/tools/common/nativerun.cpp b/src/runtime/nativerun.cpp
similarity index 100%
rename from src/core/tools/common/nativerun.cpp
rename to src/runtime/nativerun.cpp
diff --git a/src/core/tools/common/profiler.cpp b/src/runtime/profiler.cpp
similarity index 100%
rename from src/core/tools/common/profiler.cpp
rename to src/runtime/profiler.cpp
diff --git a/src/core/tools/common/profiler_command.cpp b/src/runtime/profiler_command.cpp
similarity index 100%
rename from src/core/tools/common/profiler_command.cpp
rename to src/runtime/profiler_command.cpp
diff --git a/src/core/tools/common/profiler_header.h b/src/runtime/profiler_header.h
similarity index 100%
rename from src/core/tools/common/profiler_header.h
rename to src/runtime/profiler_header.h
diff --git a/src/core/tools/common/profiler_output.cpp b/src/runtime/profiler_output.cpp
similarity index 100%
rename from src/core/tools/common/profiler_output.cpp
rename to src/runtime/profiler_output.cpp
diff --git a/src/core/tools/common/providers.common.cpp b/src/runtime/providers.common.cpp
similarity index 90%
rename from src/core/tools/common/providers.common.cpp
rename to src/runtime/providers.common.cpp
index a52c150cdd..41dbb19485 100644
--- a/src/core/tools/common/providers.common.cpp
+++ b/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 b/src/runtime/rpc/CMakeLists.txt
similarity index 100%
rename from src/core/rpc/CMakeLists.txt
rename to src/runtime/rpc/CMakeLists.txt
diff --git a/src/core/rpc/asio_net_provider.cpp b/src/runtime/rpc/asio_net_provider.cpp
similarity index 100%
rename from src/core/rpc/asio_net_provider.cpp
rename to src/runtime/rpc/asio_net_provider.cpp
diff --git a/src/core/rpc/asio_net_provider.h b/src/runtime/rpc/asio_net_provider.h
similarity index 100%
rename from src/core/rpc/asio_net_provider.h
rename to src/runtime/rpc/asio_net_provider.h
diff --git a/src/core/rpc/asio_rpc_session.cpp b/src/runtime/rpc/asio_rpc_session.cpp
similarity index 100%
rename from src/core/rpc/asio_rpc_session.cpp
rename to src/runtime/rpc/asio_rpc_session.cpp
diff --git a/src/core/rpc/asio_rpc_session.h b/src/runtime/rpc/asio_rpc_session.h
similarity index 100%
rename from src/core/rpc/asio_rpc_session.h
rename to src/runtime/rpc/asio_rpc_session.h
diff --git a/src/core/rpc/dsn_message_parser.cpp b/src/runtime/rpc/dsn_message_parser.cpp
similarity index 100%
rename from src/core/rpc/dsn_message_parser.cpp
rename to src/runtime/rpc/dsn_message_parser.cpp
diff --git a/src/core/rpc/dsn_message_parser.h b/src/runtime/rpc/dsn_message_parser.h
similarity index 100%
rename from src/core/rpc/dsn_message_parser.h
rename to src/runtime/rpc/dsn_message_parser.h
diff --git a/src/core/rpc/message_parser.cpp b/src/runtime/rpc/message_parser.cpp
similarity index 100%
rename from src/core/rpc/message_parser.cpp
rename to src/runtime/rpc/message_parser.cpp
diff --git a/src/core/rpc/message_parser_manager.h b/src/runtime/rpc/message_parser_manager.h
similarity index 100%
rename from src/core/rpc/message_parser_manager.h
rename to src/runtime/rpc/message_parser_manager.h
diff --git a/src/core/rpc/network.cpp b/src/runtime/rpc/network.cpp
similarity index 99%
rename from src/core/rpc/network.cpp
rename to src/runtime/rpc/network.cpp
index cfce7a4fb7..d2456790a6 100644
--- a/src/core/rpc/network.cpp
+++ b/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 b/src/runtime/rpc/network.sim.cpp
similarity index 100%
rename from src/core/rpc/network.sim.cpp
rename to src/runtime/rpc/network.sim.cpp
diff --git a/src/core/rpc/network.sim.h b/src/runtime/rpc/network.sim.h
similarity index 100%
rename from src/core/rpc/network.sim.h
rename to src/runtime/rpc/network.sim.h
diff --git a/src/core/rpc/raw_message_parser.cpp b/src/runtime/rpc/raw_message_parser.cpp
similarity index 100%
rename from src/core/rpc/raw_message_parser.cpp
rename to src/runtime/rpc/raw_message_parser.cpp
diff --git a/src/core/rpc/raw_message_parser.h b/src/runtime/rpc/raw_message_parser.h
similarity index 100%
rename from src/core/rpc/raw_message_parser.h
rename to src/runtime/rpc/raw_message_parser.h
diff --git a/src/core/rpc/rpc_engine.cpp b/src/runtime/rpc/rpc_engine.cpp
similarity index 99%
rename from src/core/rpc/rpc_engine.cpp
rename to src/runtime/rpc/rpc_engine.cpp
index 2dd0972b4e..2bf70dec71 100644
--- a/src/core/rpc/rpc_engine.cpp
+++ b/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 b/src/runtime/rpc/rpc_engine.h
similarity index 100%
rename from src/core/rpc/rpc_engine.h
rename to src/runtime/rpc/rpc_engine.h
diff --git a/src/core/rpc/rpc_message.cpp b/src/runtime/rpc/rpc_message.cpp
similarity index 99%
rename from src/core/rpc/rpc_message.cpp
rename to src/runtime/rpc/rpc_message.cpp
index 16e926496e..1f884c531e 100644
--- a/src/core/rpc/rpc_message.cpp
+++ b/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 b/src/runtime/rpc/rpc_task.cpp
similarity index 99%
rename from src/core/rpc/rpc_task.cpp
rename to src/runtime/rpc/rpc_task.cpp
index b95578efa3..7b1dbee3d6 100644
--- a/src/core/rpc/rpc_task.cpp
+++ b/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 b/src/runtime/rpc/thrift_message_parser.cpp
similarity index 100%
rename from src/core/rpc/thrift_message_parser.cpp
rename to src/runtime/rpc/thrift_message_parser.cpp
diff --git a/src/core/rpc/thrift_message_parser.h b/src/runtime/rpc/thrift_message_parser.h
similarity index 100%
rename from src/core/rpc/thrift_message_parser.h
rename to src/runtime/rpc/thrift_message_parser.h
diff --git a/src/core/tools/simulator/scheduler.cpp b/src/runtime/scheduler.cpp
similarity index 100%
rename from src/core/tools/simulator/scheduler.cpp
rename to src/runtime/scheduler.cpp
diff --git a/src/core/tools/simulator/scheduler.h b/src/runtime/scheduler.h
similarity index 100%
rename from src/core/tools/simulator/scheduler.h
rename to src/runtime/scheduler.h
diff --git a/src/core/core/service_api_c.cpp b/src/runtime/service_api_c.cpp
similarity index 99%
rename from src/core/core/service_api_c.cpp
rename to src/runtime/service_api_c.cpp
index b955451e0c..194f3a8c40 100644
--- a/src/core/core/service_api_c.cpp
+++ b/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 b/src/runtime/service_engine.cpp
similarity index 99%
rename from src/core/core/service_engine.cpp
rename to src/runtime/service_engine.cpp
index 54f26c9eaf..5703fd0c10 100644
--- a/src/core/core/service_engine.cpp
+++ b/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 b/src/runtime/service_engine.h
similarity index 100%
rename from src/core/core/service_engine.h
rename to src/runtime/service_engine.h
diff --git a/src/core/tools/simulator/sim_clock.h b/src/runtime/sim_clock.h
similarity index 100%
rename from src/core/tools/simulator/sim_clock.h
rename to src/runtime/sim_clock.h
diff --git a/src/core/tools/simulator/simulator.cpp b/src/runtime/simulator.cpp
similarity index 99%
rename from src/core/tools/simulator/simulator.cpp
rename to src/runtime/simulator.cpp
index 06e12f0ef1..b78c8c27c1 100644
--- a/src/core/tools/simulator/simulator.cpp
+++ b/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 b/src/runtime/task/CMakeLists.txt
similarity index 100%
rename from src/core/task/CMakeLists.txt
rename to src/runtime/task/CMakeLists.txt
diff --git a/src/core/task/hpc_task_queue.cpp b/src/runtime/task/hpc_task_queue.cpp
similarity index 100%
rename from src/core/task/hpc_task_queue.cpp
rename to src/runtime/task/hpc_task_queue.cpp
diff --git a/src/core/task/hpc_task_queue.h b/src/runtime/task/hpc_task_queue.h
similarity index 100%
rename from src/core/task/hpc_task_queue.h
rename to src/runtime/task/hpc_task_queue.h
diff --git a/src/core/task/simple_task_queue.cpp b/src/runtime/task/simple_task_queue.cpp
similarity index 100%
rename from src/core/task/simple_task_queue.cpp
rename to src/runtime/task/simple_task_queue.cpp
diff --git a/src/core/task/simple_task_queue.h b/src/runtime/task/simple_task_queue.h
similarity index 100%
rename from src/core/task/simple_task_queue.h
rename to src/runtime/task/simple_task_queue.h
diff --git a/src/core/task/task.cpp b/src/runtime/task/task.cpp
similarity index 99%
rename from src/core/task/task.cpp
rename to src/runtime/task/task.cpp
index 9ee1df944b..792201b006 100644
--- a/src/core/task/task.cpp
+++ b/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 b/src/runtime/task/task_code.cpp
similarity index 100%
rename from src/core/task/task_code.cpp
rename to src/runtime/task/task_code.cpp
diff --git a/src/core/task/task_engine.cpp b/src/runtime/task/task_engine.cpp
similarity index 100%
rename from src/core/task/task_engine.cpp
rename to src/runtime/task/task_engine.cpp
diff --git a/src/core/task/task_engine.h b/src/runtime/task/task_engine.h
similarity index 99%
rename from src/core/task/task_engine.h
rename to src/runtime/task/task_engine.h
index 9726d10447..871bb079e5 100644
--- a/src/core/task/task_engine.h
+++ b/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 b/src/runtime/task/task_engine.sim.cpp
similarity index 99%
rename from src/core/task/task_engine.sim.cpp
rename to src/runtime/task/task_engine.sim.cpp
index 6eda4fec65..b7ce80cb56 100644
--- a/src/core/task/task_engine.sim.cpp
+++ b/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 b/src/runtime/task/task_engine.sim.h
similarity index 100%
rename from src/core/task/task_engine.sim.h
rename to src/runtime/task/task_engine.sim.h
diff --git a/src/core/task/task_queue.cpp b/src/runtime/task/task_queue.cpp
similarity index 99%
rename from src/core/task/task_queue.cpp
rename to src/runtime/task/task_queue.cpp
index 858fe21cee..a673d4968b 100644
--- a/src/core/task/task_queue.cpp
+++ b/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 b/src/runtime/task/task_spec.cpp
similarity index 100%
rename from src/core/task/task_spec.cpp
rename to src/runtime/task/task_spec.cpp
diff --git a/src/core/task/task_tracker.cpp b/src/runtime/task/task_tracker.cpp
similarity index 100%
rename from src/core/task/task_tracker.cpp
rename to src/runtime/task/task_tracker.cpp
diff --git a/src/core/task/task_worker.cpp b/src/runtime/task/task_worker.cpp
similarity index 100%
rename from src/core/task/task_worker.cpp
rename to src/runtime/task/task_worker.cpp
diff --git a/src/core/tests/CMakeLists.txt b/src/runtime/test/CMakeLists.txt
similarity index 95%
rename from src/core/tests/CMakeLists.txt
rename to src/runtime/test/CMakeLists.txt
index 3d0e95bf64..a6f0f47ee3 100644
--- a/src/core/tests/CMakeLists.txt
+++ b/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 b/src/runtime/test/async_call.cpp
similarity index 100%
rename from src/core/tests/async_call.cpp
rename to src/runtime/test/async_call.cpp
diff --git a/src/core/tests/clear.sh b/src/runtime/test/clear.sh
similarity index 100%
rename from src/core/tests/clear.sh
rename to src/runtime/test/clear.sh
diff --git a/src/core/tests/command.txt b/src/runtime/test/command.txt
similarity index 100%
rename from src/core/tests/command.txt
rename to src/runtime/test/command.txt
diff --git a/src/core/tests/config-test-corrupt-message.ini b/src/runtime/test/config-test-corrupt-message.ini
similarity index 100%
rename from src/core/tests/config-test-corrupt-message.ini
rename to src/runtime/test/config-test-corrupt-message.ini
diff --git a/src/core/tests/config-test-sim.ini b/src/runtime/test/config-test-sim.ini
similarity index 100%
rename from src/core/tests/config-test-sim.ini
rename to src/runtime/test/config-test-sim.ini
diff --git a/src/core/tests/config-test.ini b/src/runtime/test/config-test.ini
similarity index 100%
rename from src/core/tests/config-test.ini
rename to src/runtime/test/config-test.ini
diff --git a/src/core/tests/corrupt_message.cpp b/src/runtime/test/corrupt_message.cpp
similarity index 100%
rename from src/core/tests/corrupt_message.cpp
rename to src/runtime/test/corrupt_message.cpp
diff --git a/src/core/tests/gtest.filter b/src/runtime/test/gtest.filter
similarity index 100%
rename from src/core/tests/gtest.filter
rename to src/runtime/test/gtest.filter
diff --git a/src/core/tests/lpc.cpp b/src/runtime/test/lpc.cpp
similarity index 100%
rename from src/core/tests/lpc.cpp
rename to src/runtime/test/lpc.cpp
diff --git a/src/core/tests/main.cpp b/src/runtime/test/main.cpp
similarity index 100%
rename from src/core/tests/main.cpp
rename to src/runtime/test/main.cpp
diff --git a/src/core/tests/message_reader_test.cpp b/src/runtime/test/message_reader_test.cpp
similarity index 100%
rename from src/core/tests/message_reader_test.cpp
rename to src/runtime/test/message_reader_test.cpp
diff --git a/src/core/tests/message_utils_test.cpp b/src/runtime/test/message_utils_test.cpp
similarity index 100%
rename from src/core/tests/message_utils_test.cpp
rename to src/runtime/test/message_utils_test.cpp
diff --git a/src/core/tests/netprovider.cpp b/src/runtime/test/netprovider.cpp
similarity index 98%
rename from src/core/tests/netprovider.cpp
rename to src/runtime/test/netprovider.cpp
index 37d11065da..d3ca51392f 100644
--- a/src/core/tests/netprovider.cpp
+++ b/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 b/src/runtime/test/pipeline_test.cpp
similarity index 100%
rename from src/core/tests/pipeline_test.cpp
rename to src/runtime/test/pipeline_test.cpp
diff --git a/src/core/tests/rpc.cpp b/src/runtime/test/rpc.cpp
similarity index 100%
rename from src/core/tests/rpc.cpp
rename to src/runtime/test/rpc.cpp
diff --git a/src/core/tests/rpc_holder_test.cpp b/src/runtime/test/rpc_holder_test.cpp
similarity index 100%
rename from src/core/tests/rpc_holder_test.cpp
rename to src/runtime/test/rpc_holder_test.cpp
diff --git a/src/core/tests/rpc_message.cpp b/src/runtime/test/rpc_message.cpp
similarity index 99%
rename from src/core/tests/rpc_message.cpp
rename to src/runtime/test/rpc_message.cpp
index bb93b40db5..9dc28b4b34 100644
--- a/src/core/tests/rpc_message.cpp
+++ b/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>
diff --git a/src/runtime/test/run.sh b/src/runtime/test/run.sh
new file mode 100755
index 0000000000..1b0ab81bc3
--- /dev/null
+++ b/src/runtime/test/run.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+if [ -z "${REPORT_DIR}" ]; then
+    REPORT_DIR="."
+fi
+
+while read -r -a line; do
+    test_case=${line[0]}
+    gtest_filter=${line[1]}
+    output_xml="${REPORT_DIR}/dsn_runtime_tests_${test_case/.ini/.xml}"
+    echo "============ run dsn_runtime_tests ${test_case} with gtest_filter ${gtest_filter} ============"
+    ./clear.sh
+    GTEST_OUTPUT="xml:${output_xml}" GTEST_FILTER=${gtest_filter} ./dsn_runtime_tests ${test_case} < command.txt
+
+    if [ $? -ne 0 ]; then
+        echo "run dsn_runtime_tests $test_case failed"
+        echo "---- ls ----"
+        ls -l
+        if find . -name log.1.txt; then
+            echo "---- tail -n 100 log.1.txt ----"
+            tail -n 100 `find . -name log.1.txt`
+        fi
+        if [ -f core ]; then
+            echo "---- gdb ./dsn_runtime_tests core ----"
+            gdb ./dsn_runtime_tests core -ex "thread apply all bt" -ex "set pagination 0" -batch
+        fi
+        exit 1
+    fi
+    echo "============ done dsn_runtime_tests ${test_case} with gtest_filter ${gtest_filter} ============"
+done <gtest.filter
+
+echo "============ done dsn_runtime_tests ============"
+
diff --git a/src/core/tests/service_api_c.cpp b/src/runtime/test/service_api_c.cpp
similarity index 99%
rename from src/core/tests/service_api_c.cpp
rename to src/runtime/test/service_api_c.cpp
index 7593fe2320..6bb3a46b6b 100644
--- a/src/core/tests/service_api_c.cpp
+++ b/src/runtime/test/service_api_c.cpp
@@ -43,7 +43,7 @@
 #include <gtest/gtest.h>
 #include <thread>
 #include <dsn/utility/rand.h>
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 
 using namespace dsn;
 
diff --git a/src/core/tests/sim_lock.cpp b/src/runtime/test/sim_lock.cpp
similarity index 96%
rename from src/core/tests/sim_lock.cpp
rename to src/runtime/test/sim_lock.cpp
index 8ba86ba319..95b54ace03 100644
--- a/src/core/tests/sim_lock.cpp
+++ b/src/runtime/test/sim_lock.cpp
@@ -41,9 +41,9 @@
 #include <dsn/utility/synchronize.h>
 #include <gtest/gtest.h>
 #include <thread>
-#include "core/core/service_engine.h"
-#include "core/task/task_engine.sim.h"
-#include "core/tools/simulator/scheduler.h"
+#include "runtime/service_engine.h"
+#include "runtime/task/task_engine.sim.h"
+#include "runtime/scheduler.h"
 
 TEST(tools_simulator, dsn_semaphore)
 {
diff --git a/src/core/tests/task_engine.cpp b/src/runtime/test/task_engine.cpp
similarity index 99%
rename from src/core/tests/task_engine.cpp
rename to src/runtime/test/task_engine.cpp
index 8159bc3181..2fe98f7647 100644
--- a/src/core/tests/task_engine.cpp
+++ b/src/runtime/test/task_engine.cpp
@@ -33,7 +33,7 @@
  *     xxxx-xx-xx, author, fix bug about xxx
  */
 
-#include "core/task/task_engine.h"
+#include "runtime/task/task_engine.h"
 #include "test_utils.h"
 #include <dsn/tool_api.h>
 #include <gtest/gtest.h>
diff --git a/src/core/tests/task_test.cpp b/src/runtime/test/task_test.cpp
similarity index 100%
rename from src/core/tests/task_test.cpp
rename to src/runtime/test/task_test.cpp
diff --git a/src/core/tests/test_utils.h b/src/runtime/test/test_utils.h
similarity index 100%
rename from src/core/tests/test_utils.h
rename to src/runtime/test/test_utils.h
diff --git a/src/core/tests/thrift_message_parser_test.cpp b/src/runtime/test/thrift_message_parser_test.cpp
similarity index 99%
rename from src/core/tests/thrift_message_parser_test.cpp
rename to src/runtime/test/thrift_message_parser_test.cpp
index e5fdc77252..368cc292c8 100644
--- a/src/core/tests/thrift_message_parser_test.cpp
+++ b/src/runtime/test/thrift_message_parser_test.cpp
@@ -8,7 +8,7 @@
 #include <dsn/cpp/serialization_helper/thrift_helper.h>
 #include <dsn/cpp/serialization_helper/dsn.layer2_types.h>
 
-#include "core/rpc/thrift_message_parser.h"
+#include "runtime/rpc/thrift_message_parser.h"
 
 namespace dsn {
 
diff --git a/src/core/core/threadpool_code.cpp b/src/runtime/threadpool_code.cpp
similarity index 100%
rename from src/core/core/threadpool_code.cpp
rename to src/runtime/threadpool_code.cpp
diff --git a/src/core/core/tool_api.cpp b/src/runtime/tool_api.cpp
similarity index 98%
rename from src/core/core/tool_api.cpp
rename to src/runtime/tool_api.cpp
index 4c4d604929..0eab6cf3eb 100644
--- a/src/core/core/tool_api.cpp
+++ b/src/runtime/tool_api.cpp
@@ -36,8 +36,8 @@
 #include <dsn/tool_api.h>
 #include <dsn/utility/factory_store.h>
 #include <dsn/utility/singleton_store.h>
-#include "core/core/service_engine.h"
-#include "core/rpc/message_parser_manager.h"
+#include "runtime/service_engine.h"
+#include "runtime/rpc/message_parser_manager.h"
 
 namespace dsn {
 
diff --git a/src/core/tools/common/tracer.cpp b/src/runtime/tracer.cpp
similarity index 100%
rename from src/core/tools/common/tracer.cpp
rename to src/runtime/tracer.cpp
diff --git a/src/core/core/zlocks.cpp b/src/runtime/zlocks.cpp
similarity index 99%
rename from src/core/core/zlocks.cpp
rename to src/runtime/zlocks.cpp
index 08b7322ad0..88bceb6c35 100644
--- a/src/core/core/zlocks.cpp
+++ b/src/runtime/zlocks.cpp
@@ -36,7 +36,7 @@
 #include <dsn/utility/factory_store.h>
 #include <dsn/tool-api/zlocks.h>
 #include "utils/zlock_provider.h"
-#include "core/core/service_engine.h"
+#include "runtime/service_engine.h"
 
 namespace dsn {