Merge branch 'master' of gitee.com:openharmony/communication_dsoftbus into master

Signed-off-by: 孙佳顺 <sunjiashun@huawei.com>
2024-11-23 08:49:59 +00:00 · 2024-11-14 02:13:43 +00:00 · 2024-11-14 02:13:43 +00:00 · 0340427a4b
commit 0340427a4b
parent e557e6759b 1be61aafe4
845 changed files with 3241 additions and 2535 deletions
--- a/6
+++ b/6
@ -94,14 +94,12 @@ tests/core/common/          zhusiyuan2@huawei.com
 interfaces/kits/common/softbus_common.h     zhusiyuan2@huawei.com

 [DFX]
-adapter/common/dfx/         zhusiyuan2@huawei.com
-core/common/dfx/            zhusiyuan2@huawei.com
-tests/core/common/dfx       zhusiyuan2@huawei.com
+dfx/            zhusiyuan2@huawei.com
+tests/dfx       zhusiyuan2@huawei.com

 [DFXInterface]
 hisysevent.yaml             litongxin3@huawei.com
 interfaces/kits/common/softbus_error_code.h     litongxin3@huawei.com
-core/common/dfx/interface   litongxin3@huawei.com

 [Framework]
 core/frame/                 zhangfengxi@huawei.com
--- a/adapter/BUILD.gn
+++ b/adapter/BUILD.gn
@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import("../core/common/dfx/dsoftbus_dfx.gni")
 import("../dsoftbus.gni")

 dsoftbus_root_path = ".."
@ -45,7 +44,7 @@ if (defined(ohos_lite)) {
  }

  common_include = [
-    "$dsoftbus_root_path/core/common/dfx/interface/include",
+    "$dsoftbus_dfx_path/interface/include",
    "$dsoftbus_root_path/interfaces/kits",
    "$dsoftbus_root_path/interfaces/kits/common",
  ]
@ -78,8 +77,8 @@ if (defined(ohos_lite)) {
        cflags = [ "-Wall" ]
      }
      sources = [
-        "$softbus_adapter_common/dfx/softbus_adapter_hisysevent_mini.c",
-        "$softbus_adapter_common/dfx/softbus_adapter_hitrace_virtual.c",
+        "$dsoftbus_dfx_path/event/legacy/softbus_adapter_hisysevent_mini.c",
+        "$dsoftbus_dfx_path/trace/legacy/softbus_adapter_hitrace_virtual.c",
        "$softbus_adapter_common/kernel/liteos_m/lnn_ip_utils_adapter.c",
        "$softbus_adapter_common/kernel/liteos_m/softbus_adapter_file.c",
        "$softbus_adapter_common/kernel/liteos_m/softbus_adapter_mem.c",
@ -100,8 +99,8 @@ if (defined(ohos_lite)) {
        external_deps += [ "json:nlohmann_json_static" ]
        sources = []
        sources = [
-          "$softbus_adapter_common/dfx/softbus_adapter_hisysevent_mini.c",
-          "$softbus_adapter_common/dfx/softbus_adapter_hitrace_virtual.c",
+          "$dsoftbus_dfx_path/event/legacy/softbus_adapter_hisysevent_mini.c",
+          "$dsoftbus_dfx_path/trace/legacy/softbus_adapter_hitrace_virtual.c",
          "$softbus_adapter_common/json/nlohmann/softbus_adapter_json.cpp",
          "$softbus_adapter_common/kernel/liteos_m/lnn_ip_utils_adapter.c",
          "$softbus_adapter_common/kernel/liteos_m/softbus_adapter_mem.c",
@ -122,8 +121,7 @@ if (defined(ohos_lite)) {
      }

      deps = [
-        "$dsoftbus_dfx_path/event:softbus_dfx_event",
-        "$dsoftbus_dfx_path/log:softbus_dfx_log",
+        "$dsoftbus_dfx_path:softbus_dfx",
        "$hilog_lite_deps_path",
      ]

@ -154,8 +152,8 @@ if (defined(ohos_lite)) {
      ]
      cflags_cc = [ "-fPIC" ]
      sources = [
-        "$softbus_adapter_common/dfx/softbus_adapter_hisysevent_mini.c",
-        "$softbus_adapter_common/dfx/softbus_adapter_hitrace_virtual.c",
+        "$dsoftbus_dfx_path/event/legacy/softbus_adapter_hisysevent_mini.c",
+        "$dsoftbus_dfx_path/trace/legacy/softbus_adapter_hitrace_virtual.c",
        "$softbus_adapter_common/json/nlohmann/softbus_adapter_json.cpp",
        "$softbus_adapter_common/kernel/posix/lnn_ip_utils_adapter.c",
        "$softbus_adapter_common/kernel/posix/softbus_adapter_file.c",
@ -175,8 +173,7 @@ if (defined(ohos_lite)) {
      }

      deps = [
-        "$dsoftbus_dfx_path/event:softbus_dfx_event",
-        "$dsoftbus_dfx_path/log:softbus_dfx_log",
+        "$dsoftbus_dfx_path:softbus_dfx",
        "$hilog_lite_deps_path",
      ]
      external_deps = [
@ -207,7 +204,7 @@ if (defined(ohos_lite)) {
      "$softbus_adapter_common/include",
      "$softbus_adapter_common/include/OS_adapter_define/linux",
      "$dsoftbus_feature_product_config_path/spec_config",
-      "$dsoftbus_root_path/core/common/dfx/interface/include",
+      "$dsoftbus_dfx_path/interface/include",
      "$dsoftbus_root_path/core/common/include",
    ]
  }
@ -224,7 +221,7 @@ if (defined(ohos_lite)) {
    branch_protector_ret = "pac_ret"

    include_dirs = [
-      "$dsoftbus_root_path/core/common/dfx/interface/include",
+      "$dsoftbus_dfx_path/interface/include",
      "$dsoftbus_root_path/interfaces/kits",
      "$dsoftbus_root_path/interfaces/kits/common",
    ]
@ -236,8 +233,8 @@ if (defined(ohos_lite)) {
      ]
    }
    sources = [
-      "$softbus_adapter_common/dfx/softbus_adapter_hisysevent.cpp",
-      "$softbus_adapter_common/dfx/softbus_adapter_hitrace.c",
+      "$dsoftbus_dfx_path/event/legacy/softbus_adapter_hisysevent.cpp",
+      "$dsoftbus_dfx_path/trace/legacy/softbus_adapter_hitrace.c",
      "$softbus_adapter_common/json/nlohmann/softbus_adapter_json.cpp",
      "$softbus_adapter_common/kernel/posix/lnn_ip_utils_adapter.c",
      "$softbus_adapter_common/kernel/posix/softbus_adapter_file.c",
@ -255,10 +252,7 @@ if (defined(ohos_lite)) {
          [ "$softbus_adapter_config/spec_config/softbus_config_adapter.c" ]
    }

-    public_deps = [
-      "$dsoftbus_dfx_path/event:softbus_dfx_event",
-      "$dsoftbus_dfx_path/log:softbus_dfx_log",
-    ]
+    public_deps = [ "$dsoftbus_dfx_path:softbus_dfx" ]
    public_external_deps = [
      "bounds_checking_function:libsec_shared",
      "json:nlohmann_json_static",
--- a/adapter/common/bus_center/boot_event/lnn_boot_event_monitor_virtual.cpp
+++ b/adapter/common/bus_center/boot_event/lnn_boot_event_monitor_virtual.cpp
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitBootEventMonitorImpl(void)
 {
--- a/adapter/common/bus_center/bus_center_adapter.gni
+++ b/adapter/common/bus_center/bus_center_adapter.gni
@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import("../../../core/common/dfx/dsoftbus_dfx.gni")
 import("../../../dsoftbus.gni")

 adapter_bus_center_path = "$softbus_adapter_common/bus_center"
@ -19,10 +18,9 @@ adapter_bus_center_path = "$softbus_adapter_common/bus_center"
 bus_center_adapter_src = []
 bus_center_adapter_inc = [
  "$softbus_adapter_common/bus_center/include",
-  "$dsoftbus_root_path/core/common/dfx/interface/include",
+  "$dsoftbus_dfx_path/interface/include",
 ]
-bus_center_adapter_deps =
-    [ "$dsoftbus_root_path/core/common/dfx/log:softbus_dfx_log" ]
+bus_center_adapter_deps = [ "$dsoftbus_dfx_path:softbus_dfx" ]

 if (!defined(global_parts_info) ||
    defined(global_parts_info.notification_common_event_service)) {
@ -146,11 +144,10 @@ if (dsoftbus_feature_lnn_net) {
        [ "$adapter_bus_center_path/network/lnn_bt_monitor.c" ]
    bus_center_adapter_inc += [
      "$softbus_adapter_common/net/bluetooth/include",
-      "$dsoftbus_root_path/core/common/dfx/interface/include",
+      "$dsoftbus_dfx_path/interface/include",
    ]
    bus_center_adapter_external_deps += [ "wifi:wifi_sdk" ]
-    bus_center_adapter_deps +=
-        [ "$dsoftbus_root_path/core/common/dfx/log:softbus_dfx_log" ]
+    bus_center_adapter_deps += [ "$dsoftbus_dfx_path:softbus_dfx" ]
  } else {
    bus_center_adapter_src +=
        [ "$adapter_bus_center_path/network/lnn_bt_monitor_virtual.c" ]
--- a/adapter/common/bus_center/common_event/lnn_common_event_monitor.cpp
+++ b/adapter/common/bus_center/common_event/lnn_common_event_monitor.cpp
@ -31,7 +31,7 @@

 #include "power_mgr_client.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 static const int32_t DELAY_LEN = 1000;
 static const int32_t RETRY_MAX = 20;
--- a/adapter/common/bus_center/common_event/lnn_common_event_monitor_virtual.cpp
+++ b/adapter/common/bus_center/common_event/lnn_common_event_monitor_virtual.cpp
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitCommonEventMonitorImpl(void)
 {
--- a/adapter/common/bus_center/driver/lnn_driver_monitor_virtual.c
+++ b/adapter/common/bus_center/driver/lnn_driver_monitor_virtual.c
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitDriverMonitorImpl(void)
 {
--- a/adapter/common/bus_center/driver/lnn_driver_request_virtual.c
+++ b/adapter/common/bus_center/driver/lnn_driver_request_virtual.c
@ -15,7 +15,7 @@

 #include "lnn_driver_request.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnSendCmdToDriver(int32_t moduleId, const uint8_t *cmd, uint32_t cmdLen,
    uint8_t *reply, uint32_t replyLen)
--- a/adapter/common/bus_center/driver/lnn_hdf_driver_monitor.c
+++ b/adapter/common/bus_center/driver/lnn_hdf_driver_monitor.c
@ -25,7 +25,7 @@
 #include "lnn_network_manager.h"
 #include "message_handler.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define DRIVER_SERVICE_NAME      "hdf_dsoftbus"
 #define NETIF_NAME_LENGTH        16
--- a/adapter/common/bus_center/driver/lnn_hdf_driver_request.c
+++ b/adapter/common/bus_center/driver/lnn_hdf_driver_request.c
@ -20,7 +20,7 @@
 #include <securec.h>

 #include "lnn_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define DRIVER_SERVICE_NAME "hdf_dsoftbus"

--- a/adapter/common/bus_center/network/lnn_bt_monitor.c
+++ b/adapter/common/bus_center/network/lnn_bt_monitor.c
@ -23,7 +23,7 @@
 #include "softbus_adapter_bt_common.h"
 #include "softbus_adapter_mem.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_utils.h"

 static int32_t g_btStateListenerId = -1;
--- a/adapter/common/bus_center/network/lnn_bt_monitor_virtual.c
+++ b/adapter/common/bus_center/network/lnn_bt_monitor_virtual.c
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitBtStateMonitorImpl(void)
 {
--- a/adapter/common/bus_center/network/lnn_linkwatch.c
+++ b/adapter/common/bus_center/network/lnn_linkwatch.c
@ -32,7 +32,7 @@
 #include "softbus_adapter_errcode.h"
 #include "softbus_adapter_socket.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define NETLINK_BUF_LEN 1024

--- a/adapter/common/bus_center/network/lnn_lwip_monitor.c
+++ b/adapter/common/bus_center/network/lnn_lwip_monitor.c
@ -18,7 +18,7 @@
 #include "bus_center_event.h"
 #include "lnn_log.h"
 #include "lwip/netif.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define LWIP_NSC_IPSTATUS_CHANGE 0xf0

--- a/adapter/common/bus_center/network/lnn_lwip_monitor_virtual.c
+++ b/adapter/common/bus_center/network/lnn_lwip_monitor_virtual.c
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitLwipMonitorImpl(void)
 {
--- a/adapter/common/bus_center/network/lnn_netlink_monitor.c
+++ b/adapter/common/bus_center/network/lnn_netlink_monitor.c
@ -40,7 +40,7 @@
 #include "softbus_base_listener.h"
 #include "softbus_socket.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #undef NLMSG_OK
 #define NLMSG_OK(nlh, len)                                                                               \
--- a/adapter/common/bus_center/network/lnn_netlink_monitor_virtual.c
+++ b/adapter/common/bus_center/network/lnn_netlink_monitor_virtual.c
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitNetlinkMonitorImpl(void)
 {
--- a/adapter/common/bus_center/network/lnn_netmanager_listener.cpp
+++ b/adapter/common/bus_center/network/lnn_netmanager_listener.cpp
@ -31,7 +31,7 @@
 #include "softbus_adapter_thread.h"
 #include "softbus_bus_center.h"
 #include "softbus_config_type.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 namespace OHOS {
 namespace LnnNetManager {
--- a/adapter/common/bus_center/network/lnn_netmanager_listener_virtual.cpp
+++ b/adapter/common/bus_center/network/lnn_netmanager_listener_virtual.cpp
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitNetManagerMonitorImpl(void)
 {
--- a/adapter/common/bus_center/platform/lnn_product_monitor.c
+++ b/adapter/common/bus_center/platform/lnn_product_monitor.c
@ -17,7 +17,7 @@

 #include "bus_center_event.h"
 #include "lnn_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "hdf_io_service_if.h"

 #define HISYSLINK_SERVICE_NAME "hisyslink_service"
--- a/adapter/common/bus_center/platform/lnn_product_monitor_virtual.c
+++ b/adapter/common/bus_center/platform/lnn_product_monitor_virtual.c
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitProductMonitorImpl(void)
 {
--- a/adapter/common/bus_center/wlan/lnn_wifiservice_monitor.cpp
+++ b/adapter/common/bus_center/wlan/lnn_wifiservice_monitor.cpp
@ -27,7 +27,7 @@
 #include "want.h"
 #include "wifi_msg.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "kits/c/wifi_p2p.h"
 #include "wifi_ap_msg.h"
 #include "softbus_wifi_api_adapter.h"
--- a/adapter/common/bus_center/wlan/lnn_wifiservice_monitor_virtual.cpp
+++ b/adapter/common/bus_center/wlan/lnn_wifiservice_monitor_virtual.cpp
@ -15,7 +15,7 @@

 #include "lnn_event_monitor_impl.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitWifiServiceMonitorImpl(void)
 {
--- a/adapter/common/include/lnn_ip_utils_adapter.h
+++ b/adapter/common/include/lnn_ip_utils_adapter.h
@ -26,7 +26,7 @@
 #include <string.h>

 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #ifdef __cplusplus
 extern "C" {
--- a/adapter/common/kernel/liteos_m/softbus_adapter_file.c
+++ b/adapter/common/kernel/liteos_m/softbus_adapter_file.c
@ -18,7 +18,7 @@
 #include "cmsis_os2.h"
 #include "comm_log.h"
 #include "softbus_adapter_errcode.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "utils_file.h"

 int32_t SoftBusReadFile(int32_t fd, void *readBuf, uint32_t maxLen)
--- a/adapter/common/kernel/liteos_m/softbus_adapter_timer.c
+++ b/adapter/common/kernel/liteos_m/softbus_adapter_timer.c
@ -19,7 +19,7 @@
 #include <time.h>
 #include "cmsis_os2.h"
 #include "comm_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define MS_PER_SECOND  1000
 #define US_PER_MSECOND 1000
--- a/adapter/common/kernel/posix/softbus_adapter_file.c
+++ b/adapter/common/kernel/posix/softbus_adapter_file.c
@ -24,7 +24,7 @@

 #include "comm_log.h"
 #include "softbus_adapter_errcode.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 static int32_t SoftBusCreateFile(const char *fileName)
 {
--- a/adapter/common/kernel/posix/softbus_adapter_thread.c
+++ b/adapter/common/kernel/posix/softbus_adapter_thread.c
@ -24,7 +24,7 @@
 #include <string.h>

 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 static pthread_mutex_t g_adapterStaticLock = PTHREAD_MUTEX_INITIALIZER;
 /* mutex */
--- a/adapter/common/kernel/posix/softbus_adapter_timer.c
+++ b/adapter/common/kernel/posix/softbus_adapter_timer.c
@ -29,7 +29,7 @@
 #include "comm_log.h"
 #include "securec.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define MS_PER_SECOND 1000
 #define US_PER_MSECOND 1000
--- a/adapter/common/mbedtls/softbus_adapter_crypto.c
+++ b/adapter/common/mbedtls/softbus_adapter_crypto.c
@ -26,7 +26,7 @@
 #include "mbedtls/md.h"
 #include "mbedtls/platform.h"
 #include "softbus_adapter_file.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #ifndef MBEDTLS_CTR_DRBG_C
 #define MBEDTLS_CTR_DRBG_C
--- a/adapter/common/mbedtls/softbus_aes_encrypt_virtual.c
+++ b/adapter/common/mbedtls/softbus_aes_encrypt_virtual.c
@ -14,7 +14,7 @@
 */

 #include "softbus_aes_encrypt.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t SoftBusGenerateHmacHash(
    const EncryptKey *randomKey, const uint8_t *rootKey, uint32_t rootKeyLen, uint8_t *hash, uint32_t hashLen)
--- a/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt_client.c
+++ b/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt_client.c
@ -25,7 +25,7 @@
 #include "softbus_common.h"
 #include "softbus_conn_common.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_utils.h"

 #include "conn_log.h"
--- a/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt_server.c
+++ b/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt_server.c
@ -23,7 +23,7 @@
 #include "common_list.h"
 #include "softbus_adapter_timer.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_type_def.h"
 #include "softbus_adapter_mem.h"
 #include "softbus_utils.h"
--- a/adapter/common/net/bluetooth/broadcast/manager/src/softbus_broadcast_mgr.c
+++ b/adapter/common/net/bluetooth/broadcast/manager/src/softbus_broadcast_mgr.c
@ -24,8 +24,8 @@
 #include "softbus_broadcast_adapter_interface.h"
 #include "softbus_broadcast_manager.h"
 #include "softbus_broadcast_utils.h"
-#include "softbus_errcode.h"
-#include "softbus_hidumper_bc_mgr.h"
+#include "softbus_error_code.h"
+#include "legacy/softbus_hidumper_bc_mgr.h"
 #include "softbus_utils.h"

 #define BC_WAIT_TIME_MS 50
--- a/adapter/common/net/bluetooth/common/softbus_adapter_bt_common.c
+++ b/adapter/common/net/bluetooth/common/softbus_adapter_bt_common.c
@ -22,7 +22,7 @@
 #include "comm_log.h"
 #include "securec.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define STATE_LISTENER_MAX_NUM 18
 #define BR_STATE_CB_TRANSPORT 1
--- a/adapter/common/net/bluetooth/common/softbus_adapter_bt_common_virtual.c
+++ b/adapter/common/net/bluetooth/common/softbus_adapter_bt_common_virtual.c
@ -15,7 +15,7 @@

 #include "softbus_adapter_bt_common.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int SoftBusAddBtStateListener(const SoftBusBtStateListener *listener)
 {
--- a/adapter/common/net/bluetooth/net_bluetooth.gni
+++ b/adapter/common/net/bluetooth/net_bluetooth.gni
@ -21,7 +21,6 @@ adapter_ble_inc = [
  "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/interface",
  "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/include",
  "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/ble/include",
-  "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/include",
 ]
 adapter_ble_src = [
  "$dsoftbus_root_path/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt_client.c",
@ -30,8 +29,8 @@ adapter_ble_src = [
  "$dsoftbus_root_path/adapter/common/net/bluetooth/common/softbus_adapter_bt_common.c",
  "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/ble/src/softbus_ble_utils.c",
  "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/manager/src/softbus_broadcast_mgr.c",
-  "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_bc_mgr.c",
-  "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/softbus_hidumper.c",
+  "$dsoftbus_dfx_path/dumper/legacy/softbus_hidumper_bc_mgr.c",
+  "$dsoftbus_dfx_path/dumper/legacy/softbus_hidumper.c",
 ]

 if (dsoftbus_feature_ex_kits) {
--- a/adapter/common/net/hdi/common/softbus_adapter_wlan_extend.c
+++ b/adapter/common/net/hdi/common/softbus_adapter_wlan_extend.c
@ -23,7 +23,7 @@
 #include "securec.h"
 #include "softbus_adapter_mem.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "v1_1/iwlan_interface.h"

 #define WLAN_SERVICE_NAME "wlan_interface_service"
--- a/adapter/common/net/hdi/common/softbus_adapter_wlan_extend_virtual.c
+++ b/adapter/common/net/hdi/common/softbus_adapter_wlan_extend_virtual.c
@ -14,7 +14,7 @@
 */

 #include "softbus_adapter_wlan_extend.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t SoftBusRegWlanChannelInfoCb(WlanChannelInfoCb *cb)
 {
--- a/adapter/common/net/wifi/common/softbus_wifi_api_adapter.c
+++ b/adapter/common/net/wifi/common/softbus_wifi_api_adapter.c
@ -20,7 +20,7 @@
 #include "lnn_log.h"
 #include "securec.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "kits/c/wifi_device.h"
 #include "kits/c/wifi_hid2d.h"
 #include "kits/c/wifi_hotspot.h"
--- a/adapter/common/net/wifi/common/softbus_wifi_api_adapter_virtual.c
+++ b/adapter/common/net/wifi/common/softbus_wifi_api_adapter_virtual.c
@ -14,7 +14,7 @@
 */

 #include <stdlib.h>
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_wifi_api_adapter.h"

 int32_t SoftBusGetWifiDeviceConfig(SoftBusWifiDevConf *configList, uint32_t *num)
--- a/adapter/common/openssl/softbus_adapter_crypto.c
+++ b/adapter/common/openssl/softbus_adapter_crypto.c
@ -23,7 +23,7 @@
 #include "comm_log.h"
 #include "softbus_adapter_file.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 static SoftBusMutex g_randomLock;

--- a/adapter/common/openssl/softbus_aes_encrypt.c
+++ b/adapter/common/openssl/softbus_aes_encrypt.c
@ -25,7 +25,7 @@
 #include "comm_log.h"
 #include "softbus_adapter_crypto.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define AES_128_CFB_KEYLEN             16
 #define AES_256_CFB_KEYLEN             32
--- a/adapter/common/range/softbus_adapter_range.c
+++ b/adapter/common/range/softbus_adapter_range.c
@ -16,7 +16,7 @@
 #include <math.h>
 #include "comm_log.h"
 #include "softbus_adapter_range.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define MOCK_POWER (-17)
 #define DB_BASE (10.0)
--- a/components/nstackx/nstackx_util/BUILD.gn
+++ b/components/nstackx/nstackx_util/BUILD.gn
@ -12,7 +12,6 @@
 # limitations under the License.

 DSOFTBUS_ROOT_PATH = "./../../.."
-import("$DSOFTBUS_ROOT_PATH/core/common/dfx/dsoftbus_dfx.gni")
 import("$DSOFTBUS_ROOT_PATH/dsoftbus.gni")

 NSTACKX_ROOT = "$DSOFTBUS_ROOT_PATH/components/nstackx"
--- a/core/adapter/authentication/src/lnn_extdata_config_virtual.c
+++ b/core/adapter/authentication/src/lnn_extdata_config_virtual.c
@ -14,7 +14,7 @@
 */

 #include "lnn_extdata_config.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t GetExtData(char *value, uint32_t len)
 {
--- a/core/adapter/br/mock/wrapper_br_interface.c
+++ b/core/adapter/br/mock/wrapper_br_interface.c
@ -21,7 +21,7 @@
 #include "c_header/ohos_bt_socket.h"
 #include "conn_log.h"
 #include "securec.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "string.h"

 #define IS_BR_ENCRYPT false
--- a/core/adapter/bus_center/src/bus_center_adapter.c
+++ b/core/adapter/bus_center/src/bus_center_adapter.c
@ -29,7 +29,7 @@
 #include "softbus_bus_center.h"
 #include "softbus_common.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_feature_config.h"
 #include "softbus_utils.h"

--- a/core/adapter/bus_center/src/bus_center_adapter_weak.c
+++ b/core/adapter/bus_center/src/bus_center_adapter_weak.c
@ -19,7 +19,7 @@
 #include <securec.h>

 #include "bus_center_adapter.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define DEFAULT_DEVICE_NAME "UNKNOWN"
 #define DEFAULT_UDID_NAME "ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00"
--- a/core/adapter/bus_center/src/lnn_kv_adapter_wrapper.cpp
+++ b/core/adapter/bus_center/src/lnn_kv_adapter_wrapper.cpp
@ -23,7 +23,7 @@
 #include "lnn_kv_data_change_listener.h"
 #include "lnn_log.h"
 #include "lnn_node_info.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_def.h"
 #include "softbus_utils.h"
 #include "iservice_registry.h"
--- a/core/adapter/bus_center/src/lnn_kv_adapter_wrapper_virtual.cpp
+++ b/core/adapter/bus_center/src/lnn_kv_adapter_wrapper_virtual.cpp
@ -14,7 +14,7 @@
 */

 #include "lnn_kv_adapter_wrapper.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnCreateKvAdapter(int32_t *dbId, const char *appId, int32_t appIdLen, const char *storeId, int32_t storeIdLen)
 {
--- a/core/adapter/bus_center/src/lnn_ohos_account.cpp
+++ b/core/adapter/bus_center/src/lnn_ohos_account.cpp
@ -26,7 +26,7 @@
 #include "softbus_adapter_crypto.h"
 #include "softbus_adapter_mem.h"
 #include "softbus_common.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_utils.h"
 #include "lnn_connection_fsm.h"

--- a/core/adapter/bus_center/src/lnn_ohos_account_adapter.cpp
+++ b/core/adapter/bus_center/src/lnn_ohos_account_adapter.cpp
@ -21,7 +21,7 @@
 #include "ohos_account_kits.h"
 #include "os_account_manager.h"
 #include "securec.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "auth_hichain_adapter.h"

 static const int32_t ACCOUNT_STRTOLL_BASE = 10;
--- a/core/adapter/bus_center/src/lnn_ohos_account_virtual.cpp
+++ b/core/adapter/bus_center/src/lnn_ohos_account_virtual.cpp
@ -14,7 +14,7 @@
 */
 #include "lnn_ohos_account.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnGetOhosAccountInfo(uint8_t *accountHash, uint32_t len)
 {
--- a/core/adapter/bus_center/src/lnn_oobe_manager_virtual.cpp
+++ b/core/adapter/bus_center/src/lnn_oobe_manager_virtual.cpp
@ -14,7 +14,7 @@
 */
 #include "lnn_oobe_manager.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnGetOOBEState(SoftBusOOBEState *state)
 {
--- a/core/adapter/bus_center/src/lnn_settingdata_event_monitor.cpp
+++ b/core/adapter/bus_center/src/lnn_settingdata_event_monitor.cpp
@ -23,7 +23,7 @@
 #include "lnn_log.h"
 #include "softbus_bus_center.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "locale_config.h"

 static constexpr const char *INTERNAL_NAME_CONCAT_STRING = "的";
--- a/core/adapter/bus_center/src/lnn_settingdata_event_monitor_virtual.cpp
+++ b/core/adapter/bus_center/src/lnn_settingdata_event_monitor_virtual.cpp
@ -14,7 +14,7 @@
 */
 #include "lnn_settingdata_event_monitor.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnGetUnifiedDisplayDeviceName(char *unifiedDisplayName, uint32_t len)
 {
--- a/core/adapter/core_adapter.gni
+++ b/core/adapter/core_adapter.gni
@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import("../../adapter/common/net/bluetooth/net_bluetooth.gni")
-import("../../core/common/dfx/dsoftbus_dfx.gni")
 import("../../dsoftbus.gni")

 br_adapter_src =
@ -26,7 +25,7 @@ bus_center_core_adapter_src = [
  "$dsoftbus_root_path/core/adapter/authentication/src/lnn_extdata_config_virtual.c",
 ]
 bus_center_core_adapter_inc = [ "$dsoftbus_root_path/adapter/common/include" ]
-bus_center_core_adapter_deps = [ "$dsoftbus_dfx_path/log:softbus_dfx_log" ]
+bus_center_core_adapter_deps = [ "$dsoftbus_dfx_path:softbus_dfx" ]
 bus_center_core_adapter_external_deps = [ "init:libbegetutil" ]

 if (dsoftbus_feature_lnn_cloud_sync) {
--- a/core/adapter/huks/src/softbus_rsa_encrypt.c
+++ b/core/adapter/huks/src/softbus_rsa_encrypt.c
@ -28,7 +28,7 @@

 #include "comm_log.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 static const uint8_t SOFTBUS_RSA_KEY_ALIAS[] = "DsoftbusRsaKey";
 static const struct HksBlob g_rsaKeyAlias = { sizeof(SOFTBUS_RSA_KEY_ALIAS), (uint8_t *)SOFTBUS_RSA_KEY_ALIAS };
--- a/core/adapter/huks/src/softbus_rsa_encrypt_virtual.c
+++ b/core/adapter/huks/src/softbus_rsa_encrypt_virtual.c
@ -14,7 +14,7 @@
 */

 #include "softbus_rsa_encrypt.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t SoftBusGetPublicKey(uint8_t *publicKey, uint32_t publicKeyLen)
 {
--- a/core/adapter/kv_store/src/lnn_kv_adapter.cpp
+++ b/core/adapter/kv_store/src/lnn_kv_adapter.cpp
@ -23,7 +23,7 @@
 #include "lnn_kv_adapter.h"
 #include "lnn_log.h"
 #include "lnn_parameter_utils.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #include "datetime_ex.h"
 namespace OHOS {
--- a/core/adapter/kv_store/src/lnn_kv_data_change_listener.cpp
+++ b/core/adapter/kv_store/src/lnn_kv_data_change_listener.cpp
@ -24,7 +24,7 @@
 #include "lnn_kv_adapter_wrapper.h"
 #include "lnn_log.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 namespace OHOS {
 namespace {
--- a/core/authentication/authentication.gni
+++ b/core/authentication/authentication.gni
@ -12,7 +12,7 @@
 # limitations under the License.

 import("../../dsoftbus.gni")
-import("../common/dfx/dsoftbus_dfx.gni")
+
 AUTH_SERVER_DEFINES = []
 if (dsoftbus_feature_auth_account == true) {
  AUTH_SERVER_DEFINES += [ "AUTH_ACCOUNT" ]
@ -29,10 +29,9 @@ enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
                       "value")

 auth_server_inc = [
+  "$dsoftbus_dfx_path/interface/include",
  "$dsoftbus_root_path/core/authentication/include",
  "$dsoftbus_root_path/core/authentication/interface",
-  "$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include",
-  "$dsoftbus_root_path/core/common/dfx/interface/include",
  "$dsoftbus_root_path/core/adapter/authentication/include",
  "$dsoftbus_root_path/core/bus_center/lnn/lane_hub/heartbeat/include",
  "$dsoftbus_root_path/core/bus_center/lnn/net_ledger/distributed_ledger/include",
@ -99,10 +98,7 @@ if (dsoftbus_feature_lnn_net) {
    "$authentication_path/src/virtual/auth_meta_ptk_proc_virtual.c",
  ]
 }
-auth_server_deps = [
-  "$dsoftbus_dfx_path/anonymize:softbus_dfx_anonymizer",
-  "$dsoftbus_dfx_path/log:softbus_dfx_log",
-]
+auth_server_deps = [ "$dsoftbus_dfx_path:softbus_dfx" ]
 auth_server_ex_deps = []
 if (defined(ohos_lite)) {
  if (ohos_kernel_type == "liteos_m") {
--- a/core/authentication/include/auth_common.h
+++ b/core/authentication/include/auth_common.h
@ -23,7 +23,7 @@
 #include "lnn_device_info_recovery.h"
 #include "softbus_common.h"
 #include "softbus_conn_interface.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_utils.h"

 #ifdef __cplusplus
--- a/core/authentication/include/auth_hichain.h
+++ b/core/authentication/include/auth_hichain.h
@ -29,7 +29,7 @@ extern "C" {
 #define GROUP_TYPE_P2P (1 << 1)
 #define GROUP_TYPE_MESH (1 << 2)
 #define GROUP_TYPE_COMPATIBLE (1 << 3)
-#define PC_META_NODE_ERRCODE 2046820418
+#define PC_PROOF_NON_CONSISTENT_ERRCODE 2046820418

 typedef struct {
    void (*onGroupCreated)(const char *groupId, int32_t groupType);
--- a/core/authentication/include/auth_session_fsm.h
+++ b/core/authentication/include/auth_session_fsm.h
@ -27,7 +27,7 @@
 #include "lnn_node_info.h"
 #include "lnn_p2p_info.h"
 #include "lnn_state_machine.h"
-#include "softbus_hisysevt_bus_center.h"
+#include "legacy/softbus_hisysevt_bus_center.h"

 #ifdef __cplusplus
 #if __cplusplus
--- a/core/authentication/src/auth_device.c
+++ b/core/authentication/src/auth_device.c
@ -30,7 +30,7 @@
 #include "lnn_local_net_ledger.h"
 #include "lnn_map.h"
 #include "lnn_net_builder.h"
-#include "softbus_adapter_hitrace.h"
+#include "legacy/softbus_adapter_hitrace.h"
 #include "softbus_adapter_mem.h"

 #define DELAY_AUTH_TIME                    (8 * 1000L)
--- a/core/authentication/src/auth_hichain.c
+++ b/core/authentication/src/auth_hichain.c
@ -273,6 +273,22 @@ static void NotifyAuthFailEvent(int32_t errCode, const char *errorReturn)
    }
 }

+static void NotifyPcAuthFail(int64_t authSeq, int errCode, const char *errorReturn)
+{
+    if (errorReturn != NULL && CheckErrReturnValidity(errorReturn) == SOFTBUS_OK) {
+        if (errCode == PC_AUTH_ERRCODE) {
+            NotifyAuthFailEvent(errCode, errorReturn);
+        }
+        if (errCode == PC_PROOF_NON_CONSISTENT_ERRCODE) {
+            bool flag = false;
+            if (GetDeviceSideFlag(authSeq, &flag) == SOFTBUS_OK && flag) {
+                NotifyAuthFailEvent(errCode, errorReturn);
+            }
+        }
+    }
+    return;
+}
+
 static void OnError(int64_t authSeq, int operationCode, int errCode, const char *errorReturn)
 {
    (void)operationCode;
@ -281,20 +297,7 @@ static void OnError(int64_t authSeq, int operationCode, int errCode, const char
    (void)GetSoftbusHichainAuthErrorCode((uint32_t)errCode, &authErrCode);
    AUTH_LOGE(AUTH_HICHAIN, "hichain OnError: authSeq=%{public}" PRId64 ", errCode=%{public}d authErrCode=%{public}d",
        authSeq, errCode, authErrCode);
-    if (errCode == PC_AUTH_ERRCODE && errorReturn != NULL && CheckErrReturnValidity(errorReturn) == SOFTBUS_OK) {
-        NotifyAuthFailEvent(errCode, errorReturn);
-    }
-    if (errCode == PC_META_NODE_ERRCODE) {
-        bool flag = false;
-        if (errorReturn == NULL) {
-            AUTH_LOGE(AUTH_HICHAIN, "errorReturn is null");
-        }
-        if (GetDeviceSideFlag(authSeq, &flag) == SOFTBUS_OK && flag) {
-            if (errorReturn != NULL && CheckErrReturnValidity(errorReturn) == SOFTBUS_OK) {
-                NotifyAuthFailEvent(errCode, errorReturn);
-            }
-        }
-    }
+    NotifyPcAuthFail(authSeq, errCode, errorReturn);
    (void)AuthSessionHandleAuthError(authSeq, authErrCode);
 }

--- a/core/authentication/src/auth_hichain_adapter.c
+++ b/core/authentication/src/auth_hichain_adapter.c
@ -26,7 +26,7 @@
 #include "device_auth_defines.h"
 #include "lnn_ohos_account_adapter.h"
 #include "softbus_adapter_mem.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_json_utils.h"

 #define AUTH_APPID "softbus_auth"
--- a/core/authentication/src/auth_manager.c
+++ b/core/authentication/src/auth_manager.c
@ -39,7 +39,7 @@
 #include "lnn_event.h"
 #include "lnn_feature_capability.h"
 #include "lnn_net_builder.h"
-#include "softbus_adapter_hitrace.h"
+#include "legacy/softbus_adapter_hitrace.h"
 #include "softbus_adapter_mem.h"
 #include "softbus_adapter_socket.h"
 #include "softbus_def.h"
--- a/core/authentication/src/auth_session_fsm.c
+++ b/core/authentication/src/auth_session_fsm.c
@ -33,7 +33,7 @@
 #include "lnn_event.h"
 #include "lnn_feature_capability.h"
 #include "softbus_adapter_bt_common.h"
-#include "softbus_adapter_hitrace.h"
+#include "legacy/softbus_adapter_hitrace.h"
 #include "softbus_adapter_mem.h"
 #include "softbus_def.h"

--- a/core/authentication/src/auth_session_key.c
+++ b/core/authentication/src/auth_session_key.c
@ -24,7 +24,7 @@
 #include "softbus_adapter_mem.h"
 #include "softbus_adapter_socket.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 #define SESSION_KEY_MAX_NUM 10
 #define LAST_USE_THRESHOLD_MS (30 * 1000L) /* 30s */
--- a/core/authentication/src/virtual/auth_attest_virtual.c
+++ b/core/authentication/src/virtual/auth_attest_virtual.c
@ -15,7 +15,7 @@

 #include "auth_attest_interface.h"

-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_error_code.h"
 #include <stdint.h>

--- a/core/authentication/src/virtual/auth_device_common_key_virtual.c
+++ b/core/authentication/src/virtual/auth_device_common_key_virtual.c
@ -14,7 +14,7 @@
 */

 #include "auth_device_common_key.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"


 void AuthLoadDeviceKey(void)
--- a/core/authentication/src/virtual/auth_hichain_system_ability_monitor_virtual.c
+++ b/core/authentication/src/virtual/auth_hichain_system_ability_monitor_virtual.c
@ -14,7 +14,7 @@
 */

 #include "auth_hichain.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t RegHichainSaStatusListener(void)
 {
--- a/core/authentication/src/virtual/auth_interface_virtual.c
+++ b/core/authentication/src/virtual/auth_interface_virtual.c
@ -15,7 +15,7 @@

 #include "auth_interface.h"
 #include "auth_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t RegAuthVerifyListener(const AuthVerifyListener *listener)
 {
--- a/core/authentication/src/virtual/auth_tcp_connection_virtual.c
+++ b/core/authentication/src/virtual/auth_tcp_connection_virtual.c
@ -17,7 +17,7 @@
 #include "auth_channel.h"
 #include "auth_log.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t RegAuthChannelListener(int32_t module, const AuthChannelListener *listener)
 {
--- a/core/authentication/src/virtual/customized_security_protocol_virtual.c
+++ b/core/authentication/src/virtual/customized_security_protocol_virtual.c
@ -16,7 +16,7 @@
 #include "customized_security_protocol.h"

 #include "auth_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t CustomizedSecurityProtocolInit(void)
 {
--- a/core/broadcast/scheduler/src/broadcast_scheduler_virtual.c
+++ b/core/broadcast/scheduler/src/broadcast_scheduler_virtual.c
@ -14,7 +14,7 @@
 */

 #include "broadcast_scheduler.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t SchedulerInitBroadcast(void)
 {
--- a/core/bus_center/bus_center_server.gni
+++ b/core/bus_center/bus_center_server.gni
@ -49,22 +49,23 @@ bus_center_server_src += [
 ]

 bus_center_server_inc += [
+  "$dsoftbus_root_path/interface/kits/bus_center",
  "$dsoftbus_root_path/core/bus_center/interface",
  "$dsoftbus_root_path/core/bus_center/ipc/include",
  "$dsoftbus_root_path/core/bus_center/service/include",
  "$dsoftbus_root_path/sdk/bus_center/manager/include",
-  "$softbus_adapter_common/dfx/include",
 ]

 bus_center_server_external_deps = []

 if (defined(global_parts_info) && defined(global_parts_info.hicollie)) {
  bus_center_server_src +=
-      [ "$softbus_adapter_common/dfx/softbus_adapter_xcollie.cpp" ]
+      [ "$dsoftbus_dfx_path/watchdog/legacy/softbus_adapter_xcollie.cpp" ]
  bus_center_server_external_deps += [ "hicollie:libhicollie" ]
 } else {
-  bus_center_server_src +=
-      [ "$softbus_adapter_common/dfx/softbus_adapter_xcollie_virtual.cpp" ]
+  bus_center_server_src += [
+    "$dsoftbus_dfx_path/watchdog/legacy/softbus_adapter_xcollie_virtual.cpp",
+  ]
 }

 if (defined(ohos_lite)) {
--- a/core/bus_center/ipc/mini/lnn_bus_center_ipc.c
+++ b/core/bus_center/ipc/mini/lnn_bus_center_ipc.c
@ -24,7 +24,7 @@
 #include "lnn_log.h"
 #include "lnn_meta_node_ledger.h"
 #include "lnn_time_sync_manager.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 static int32_t OnRefreshDeviceFound(const char *pkgName, const DeviceInfo *device,
    const InnerDeviceInfoAddtions *additions);
--- a/core/bus_center/ipc/small/src/bus_center_client_proxy.c
+++ b/core/bus_center/ipc/small/src/bus_center_client_proxy.c
@ -23,7 +23,7 @@
 #include "softbus_adapter_mem.h"
 #include "softbus_client_info_manager.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_server_ipc_interface_code.h"

 static int32_t GetSvcIdentityByPkgName(const char *pkgName, SvcIdentity *svc)
--- a/core/bus_center/ipc/small/src/lnn_bus_center_ipc.c
+++ b/core/bus_center/ipc/small/src/lnn_bus_center_ipc.c
@ -28,7 +28,7 @@
 #include "lnn_time_sync_manager.h"
 #include "softbus_adapter_mem.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_utils.h"

 typedef struct {
--- a/core/bus_center/ipc/standard/src/bus_center_client_proxy.cpp
+++ b/core/bus_center/ipc/standard/src/bus_center_client_proxy.cpp
@ -20,7 +20,7 @@
 #include "softbus_client_info_manager.h"
 #include "softbus_bus_center.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_permission.h"

 using namespace OHOS;
--- a/core/bus_center/ipc/standard/src/bus_center_client_proxy_standard.cpp
+++ b/core/bus_center/ipc/standard/src/bus_center_client_proxy_standard.cpp
@ -17,7 +17,7 @@

 #include "lnn_log.h"
 #include "message_parcel.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_server_ipc_interface_code.h"

 namespace OHOS {
--- a/core/bus_center/ipc/standard/src/lnn_bus_center_ipc.cpp
+++ b/core/bus_center/ipc/standard/src/lnn_bus_center_ipc.cpp
@ -32,7 +32,7 @@
 #include "lnn_meta_node_ledger.h"
 #include "lnn_time_sync_manager.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_permission.h"

 struct JoinLnnRequestInfo {
--- a/core/bus_center/lnn/decision_center/src/lnn_decision_center_virtual.c
+++ b/core/bus_center/lnn/decision_center/src/lnn_decision_center_virtual.c
@ -16,7 +16,7 @@
 #include "lnn_decision_center.h"

 #include "lnn_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitDecisionCenter(uint32_t version)
 {
--- a/core/bus_center/lnn/disc_mgr/bus_center_disc_mgr.gni
+++ b/core/bus_center/lnn/disc_mgr/bus_center_disc_mgr.gni
@ -25,7 +25,7 @@ if (dsoftbus_feature_lnn_net) {
 }
 bus_center_disc_mgr_inc = [
  "$dsoftbus_root_path/core/bus_center/lnn/disc_mgr/include",
-  "$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include",
-  "$dsoftbus_root_path/core/common/dfx/interface/include/form",
+  "$dsoftbus_dfx_path/interface/include",
+  "$dsoftbus_dfx_path/interface/include/form",
 ]
 bus_center_disc_mgr_deps = []
--- a/core/bus_center/lnn/disc_mgr/src/lnn_coap_discovery_impl.c
+++ b/core/bus_center/lnn/disc_mgr/src/lnn_coap_discovery_impl.c
@ -24,7 +24,7 @@
 #include "softbus_adapter_crypto.h"
 #include "softbus_adapter_mem.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_utils.h"

 #define LNN_DISC_CAPABILITY "ddmpCapability"
--- a/core/bus_center/lnn/disc_mgr/src/lnn_discovery_interface.c
+++ b/core/bus_center/lnn/disc_mgr/src/lnn_discovery_interface.c
@ -20,7 +20,7 @@
 #include "lnn_event.h"
 #include "lnn_log.h"
 #include "softbus_adapter_perf.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_utils.h"

 static void DfxRecordLnnDiscServiceEnd(int32_t serverType, const char *packageName, int32_t reason)
--- a/core/bus_center/lnn/disc_mgr/src/lnn_discovery_manager.c
+++ b/core/bus_center/lnn/disc_mgr/src/lnn_discovery_manager.c
@ -20,8 +20,8 @@
 #include "lnn_coap_discovery_impl.h"
 #include "lnn_log.h"
 #include "lnn_net_builder.h"
-#include "softbus_errcode.h"
-#include "softbus_hisysevt_bus_center.h"
+#include "softbus_error_code.h"
+#include "legacy/softbus_hisysevt_bus_center.h"

 static void DeviceFound(const ConnectionAddr *addr, const LnnDfxDeviceInfoReport *infoReport);

--- a/core/bus_center/lnn/disc_mgr/src/lnn_discovery_manager_virtual.c
+++ b/core/bus_center/lnn/disc_mgr/src/lnn_discovery_manager_virtual.c
@ -16,7 +16,7 @@
 #include "lnn_discovery_manager.h"

 #include "lnn_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitDiscoveryManager(void)
 {
--- a/core/bus_center/lnn/lane_hub/common/src/lnn_lane_hub.c
+++ b/core/bus_center/lnn/lane_hub/common/src/lnn_lane_hub.c
@ -20,7 +20,7 @@
 #include "lnn_lane_qos.h"
 #include "lnn_log.h"
 #include "lnn_time_sync_manager.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"


 int32_t LnnInitLaneHub(void)
--- a/core/bus_center/lnn/lane_hub/common/src/lnn_lane_hub_virtual.c
+++ b/core/bus_center/lnn/lane_hub/common/src/lnn_lane_hub_virtual.c
@ -17,7 +17,7 @@

 #include "lnn_log.h"
 #include "bus_center_manager.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnInitLaneHub(void)
 {
--- a/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_ble_heartbeat_virtual.c
+++ b/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_ble_heartbeat_virtual.c
@ -18,7 +18,7 @@
 #include "bus_center_manager.h"
 #include "lnn_heartbeat_medium_mgr.h"
 #include "lnn_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 static int32_t InitBleHeartbeat(const LnnHeartbeatMediumMgrCb *callback)
 {
--- a/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_ble_lpdevice_virtual.c
+++ b/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_ble_lpdevice_virtual.c
@ -14,7 +14,7 @@
 */

 #include "lnn_ble_lpdevice.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_adapter_mem.h"

 int32_t LnnRegisterBleLpDeviceMediumMgr(void)
--- a/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_heartbeat_ctrl.c
+++ b/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_heartbeat_ctrl.c
@ -48,8 +48,8 @@
 #include "softbus_adapter_mem.h"
 #include "softbus_broadcast_type.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
-#include "softbus_hisysevt_bus_center.h"
+#include "softbus_error_code.h"
+#include "legacy/softbus_hisysevt_bus_center.h"
 #include "softbus_utils.h"
 #include "lnn_connection_fsm.h"

--- a/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_heartbeat_ctrl_virtual.c
+++ b/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_heartbeat_ctrl_virtual.c
@ -16,7 +16,7 @@
 #include "lnn_heartbeat_ctrl.h"
 #include "lnn_heartbeat_utils.h"
 #include "lnn_log.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"

 int32_t LnnStartHeartbeatFrameDelay(void)
 {
--- a/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_heartbeat_fsm.c
+++ b/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_heartbeat_fsm.c
@ -34,10 +34,8 @@

 #include "softbus_adapter_mem.h"
 #include "softbus_adapter_timer.h"
-#include "softbus_def.h"
-#include "softbus_errcode.h"
-#include "softbus_hisysevt_bus_center.h"
-#include "softbus_utils.h"
+#include "softbus_error_code.h"
+#include "legacy/softbus_hisysevt_bus_center.h"

 #define TO_HEARTBEAT_FSM(ptr) CONTAINER_OF(ptr, LnnHeartbeatFsm, fsm)

--- a/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_heartbeat_medium_mgr.c
+++ b/core/bus_center/lnn/lane_hub/heartbeat/src/lnn_heartbeat_medium_mgr.c
@ -50,7 +50,7 @@
 #include "softbus_adapter_bt_common.h"
 #include "softbus_adapter_timer.h"
 #include "softbus_def.h"
-#include "softbus_errcode.h"
+#include "softbus_error_code.h"
 #include "softbus_utils.h"

 #define INVALID_BR_MAC_ADDR "00:00:00:00:00:00"
--- a/Show More
+++ b/Show More