refactor: decouple sys_exit_type with dsn_runtime

include/dsn/tool-api/global_config.h

@@ -33,6 +33,10 @@
  *     xxxx-xx-xx, author, fix bug about xxx
  */
 
+/// Attention: There are some types which are defined in dsn_runtime being used in this file,
+/// so this file is coupled with dsn_runtime. If you want to add some variables/types here or
+/// include this file, please make sure whether you want to couple with dsn_runtime or not.
+
 #pragma once
 
 #include <dsn/tool-api/task_spec.h>
@@ -195,20 +199,5 @@ CONFIG_FLD_STRING(semaphore_factory_name, "", "semaphore provider")
 CONFIG_FLD_STRING(logging_factory_name, "", "logging provider")
 CONFIG_END
 
-enum sys_exit_type
-{
-    SYS_EXIT_NORMAL,
-    SYS_EXIT_BREAK, // Ctrl-C/Break,Shutdown,LogOff, see SetConsoleCtrlHandler
-    SYS_EXIT_EXCEPTION,
-
-    SYS_EXIT_INVALID
-};
-
-ENUM_BEGIN(sys_exit_type, SYS_EXIT_INVALID)
-ENUM_REG(SYS_EXIT_NORMAL)
-ENUM_REG(SYS_EXIT_BREAK)
-ENUM_REG(SYS_EXIT_EXCEPTION)
-ENUM_END(sys_exit_type)
-
 extern const char *FLAGS_aio_factory_name;
 } // namespace dsn

include/dsn/tool_api.h

@@ -51,7 +51,6 @@ Component providers define the interface for the local components (e.g., network
 #pragma once
 
 // providers
-#include <dsn/tool-api/global_config.h>
 #include <dsn/utility/factory_store.h>
 #include <dsn/tool-api/task_queue.h>
 #include <dsn/tool-api/task_worker.h>
@@ -61,6 +60,7 @@ Component providers define the interface for the local components (e.g., network
 #include <dsn/tool-api/message_parser.h>
 #include <dsn/tool-api/logging_provider.h>
 #include <dsn/tool-api/timer_service.h>
+#include <dsn/utility/sys_exit_hook.h>
 
 namespace dsn {
 namespace tools {
@@ -158,7 +158,6 @@ DSN_API toollet *get_toollet(const char *name, ::dsn::provider_type type);
 */
 DSN_API extern join_point<void> sys_init_before_app_created;
 DSN_API extern join_point<void> sys_init_after_app_created;
-DSN_API extern join_point<void, sys_exit_type> sys_exit;
 /*@}*/
 
 template <typename T>

include/dsn/utility/sys_exit_hook.h

@@ -0,0 +1,30 @@
+// Copyright (c) 2018, Xiaomi, Inc.  All rights reserved.
+// 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.
+
+#pragma once
+
+#include <dsn/utility/enum_helper.h>
+
+namespace dsn {
+
+enum sys_exit_type
+{
+    SYS_EXIT_NORMAL,
+    SYS_EXIT_BREAK, // Ctrl-C/Break,Shutdown,LogOff, see SetConsoleCtrlHandler
+    SYS_EXIT_EXCEPTION,
+
+    SYS_EXIT_INVALID
+};
+
+ENUM_BEGIN(sys_exit_type, SYS_EXIT_INVALID)
+ENUM_REG(SYS_EXIT_NORMAL)
+ENUM_REG(SYS_EXIT_BREAK)
+ENUM_REG(SYS_EXIT_EXCEPTION)
+ENUM_END(sys_exit_type)
+
+namespace tools {
+DSN_API extern join_point<void, sys_exit_type> sys_exit;
+}
+
+} // namespace dsn

src/core/core/logging.cpp

@@ -24,11 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <dsn/service_api_c.h>
 #include <dsn/tool-api/command_manager.h>
 #include <dsn/tool-api/logging_provider.h>
-#include <dsn/tool_api.h>
-#include "service_engine.h"
 #include <dsn/tool-api/auto_codes.h>
 #include <dsn/utility/flags.h>
 #include <dsn/utility/smart_pointers.h>