refactor: move task to a seperated directory (#515)

apache · Jun 28, 2020 · c9944f3 · c9944f3
1 parent 062bedc
commit c9944f3
Show file tree

Hide file tree

Showing 30 changed files with 17 additions and 112 deletions.
diff --git a/include/dsn/tool/providers.hpc.h b/include/dsn/tool/providers.hpc.h
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -4,13 +4,14 @@ add_subdirectory(tools)
 add_subdirectory(tests)
 add_subdirectory(aio)
 add_subdirectory(rpc)
+add_subdirectory(task)
 
 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.hpc>
         $<TARGET_OBJECTS:dsn.tools.simulator>
         )
 install(TARGETS dsn_runtime DESTINATION "lib")
diff --git a/src/core/aio/aio_task.cpp b/src/core/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/core/task_engine.h"
+#include "core/task/task_engine.h"
 #include <dsn/tool-api/file_io.h>
 #include <dsn/utility/error_code.h>
 

diff --git a/src/core/core/admission_controller.cpp b/src/core/core/admission_controller.cpp
@@ -34,7 +34,6 @@
  */
 
 #include <dsn/tool-api/admission_controller.h>
-#include "task_engine.h"
 
 namespace dsn {
 

diff --git a/src/core/core/core_main.cpp b/src/core/core/core_main.cpp
@@ -44,14 +44,12 @@
 #include <dsn/toollet/explorer.h>
 
 #include <dsn/tool/providers.common.h>
-#include <dsn/tool/providers.hpc.h>
 #include <dsn/utility/singleton.h>
 
 void dsn_core_init()
 {
     // register all providers
     dsn::tools::register_common_providers();
-    dsn::tools::register_hpc_providers();
 
     // register all possible tools and toollets
     dsn::tools::register_tool<dsn::tools::nativerun>("nativerun");

diff --git a/src/core/core/service_api_c.cpp b/src/core/core/service_api_c.cpp
@@ -38,7 +38,7 @@
 
 #include "service_engine.h"
 #include "core/rpc/rpc_engine.h"
-#include "task_engine.h"
+#include "core/task/task_engine.h"
 #include "coredump.h"
 
 //

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

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

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

diff --git a/src/core/tools/hpc/CMakeLists.txt → src/core/task/CMakeLists.txt b/src/core/tools/hpc/CMakeLists.txt → src/core/task/CMakeLists.txt
@@ -1,8 +1,4 @@
-set(MY_PROJ_NAME dsn.tools.hpc)
-
-# 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 "")
+set(MY_PROJ_NAME dsn.task)
 
 # Search mode for source files under CURRENT project directory?
 # "GLOB_RECURSE" for recursive search

diff --git a/src/core/tools/hpc/hpc_task_queue.cpp → src/core/task/hpc_task_queue.cpp b/src/core/tools/hpc/hpc_task_queue.cpp → src/core/task/hpc_task_queue.cpp
diff --git a/src/core/tools/hpc/hpc_task_queue.h → src/core/task/hpc_task_queue.h b/src/core/tools/hpc/hpc_task_queue.h → src/core/task/hpc_task_queue.h
diff --git a/src/core/tools/common/simple_task_queue.cpp → src/core/task/simple_task_queue.cpp b/src/core/tools/common/simple_task_queue.cpp → src/core/task/simple_task_queue.cpp
diff --git a/src/core/tools/common/simple_task_queue.h → src/core/task/simple_task_queue.h b/src/core/tools/common/simple_task_queue.h → src/core/task/simple_task_queue.h
diff --git a/src/core/core/task.cpp → src/core/task/task.cpp b/src/core/core/task.cpp → src/core/task/task.cpp
@@ -44,7 +44,7 @@
 #include <dsn/dist/fmt_logging.h>
 
 #include "task_engine.h"
-#include "service_engine.h"
+#include "core/core/service_engine.h"
 #include "core/rpc/rpc_engine.h"
 
 namespace dsn {

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

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

diff --git a/src/core/tools/simulator/task_engine.sim.h → src/core/task/task_engine.sim.h b/src/core/tools/simulator/task_engine.sim.h → src/core/task/task_engine.sim.h
diff --git a/src/core/core/task_queue.cpp → src/core/task/task_queue.cpp b/src/core/core/task_queue.cpp → src/core/task/task_queue.cpp
diff --git a/src/core/core/task_spec.cpp → src/core/task/task_spec.cpp b/src/core/core/task_spec.cpp → src/core/task/task_spec.cpp
diff --git a/src/core/core/task_tracker.cpp → src/core/task/task_tracker.cpp b/src/core/core/task_tracker.cpp → src/core/task/task_tracker.cpp
diff --git a/src/core/core/task_worker.cpp → src/core/task/task_worker.cpp b/src/core/core/task_worker.cpp → src/core/task/task_worker.cpp
diff --git a/src/core/tests/sim_lock.cpp b/src/core/tests/sim_lock.cpp
@@ -42,7 +42,7 @@
 #include <gtest/gtest.h>
 #include <thread>
 #include "core/core/service_engine.h"
-#include "core/tools/simulator/task_engine.sim.h"
+#include "core/task/task_engine.sim.h"
 #include "core/tools/simulator/scheduler.h"
 
 TEST(tools_simulator, dsn_semaphore)

diff --git a/src/core/tests/task_engine.cpp b/src/core/tests/task_engine.cpp
@@ -33,7 +33,7 @@
  *     xxxx-xx-xx, author, fix bug about xxx
  */
 
-#include "../core/task_engine.h"
+#include "core/task/task_engine.h"
 #include "test_utils.h"
 #include <dsn/tool_api.h>
 #include <gtest/gtest.h>

diff --git a/src/core/tools/CMakeLists.txt b/src/core/tools/CMakeLists.txt
@@ -1,3 +1,2 @@
 add_subdirectory(common)
 add_subdirectory(simulator)
-add_subdirectory(hpc)
diff --git a/src/core/tools/common/providers.common.cpp b/src/core/tools/common/providers.common.cpp
@@ -36,7 +36,8 @@
 #include "core/rpc/asio_net_provider.h"
 #include <dsn/tool/providers.common.h>
 #include "lockp.std.h"
-#include "simple_task_queue.h"
+#include "core/task/simple_task_queue.h"
+#include "core/task/hpc_task_queue.h"
 #include "core/rpc/network.sim.h"
 #include "simple_logger.h"
 #include "core/rpc/dsn_message_parser.h"
@@ -58,6 +59,7 @@ void register_common_providers()
     register_component_provider<asio_udp_provider>("dsn::tools::asio_udp_provider");
     register_component_provider<sim_network_provider>("dsn::tools::sim_network_provider");
     register_component_provider<simple_task_queue>("dsn::tools::simple_task_queue");
+    register_component_provider<hpc_concurrent_task_queue>("dsn::tools::hpc_concurrent_task_queue");
     register_component_provider<simple_timer_service>("dsn::tools::simple_timer_service");
 
     register_message_header_parser<dsn_message_parser>(NET_HDR_DSN, {"RDSN"});

diff --git a/src/core/tools/hpc/providers.hpc.cpp b/src/core/tools/hpc/providers.hpc.cpp
diff --git a/src/core/tools/simulator/simulator.cpp b/src/core/tools/simulator/simulator.cpp
@@ -37,7 +37,7 @@
 #include "scheduler.h"
 
 #include "env.sim.h"
-#include "task_engine.sim.h"
+#include "core/task/task_engine.sim.h"
 #include "sim_clock.h"
 
 namespace dsn {
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,6 @@ @@
      */
     #include <dsn/tool-api/admission_controller.h>
-    #include "task_engine.h"
     namespace dsn {
@@ Expand Down @@