From 8d771aa612f6818f514f13b7444713f2c2da7903 Mon Sep 17 00:00:00 2001
From: xuyong <xuyong59@huawei.com>
Date: Sat, 12 Feb 2022 16:58:33 +0800
Subject: [PATCH] HiTrace JS Api

Signed-off-by: xuyong <xuyong59@huawei.com>
---
 interfaces/kits/js/napi/bytrace.cpp      |  7 +------
 interfaces/kits/js/napi/declare_napi.cpp | 10 +++++----
 interfaces/kits/js/napi/declare_napi.h   | 26 ++++++++++++++++++++++++
 interfaces/kits/js/napi/hitracemeter.cpp |  7 +------
 4 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 interfaces/kits/js/napi/declare_napi.h

diff --git a/interfaces/kits/js/napi/bytrace.cpp b/interfaces/kits/js/napi/bytrace.cpp
index 936a328..c100a96 100644
--- a/interfaces/kits/js/napi/bytrace.cpp
+++ b/interfaces/kits/js/napi/bytrace.cpp
@@ -18,12 +18,7 @@
 #include <string>
 #include <hilog/log.h>
 #include "bytrace.h"
-#include "napi/native_api.h"
-#include "napi/native_node_api.h"
-
-EXTERN_C_START
-extern napi_value BytraceInit(napi_env env, napi_value exports);
-EXTERN_C_END
+#include "declare_napi.h"
 
 /*
  * bytrace module definition
diff --git a/interfaces/kits/js/napi/declare_napi.cpp b/interfaces/kits/js/napi/declare_napi.cpp
index a819847..38eef46 100644
--- a/interfaces/kits/js/napi/declare_napi.cpp
+++ b/interfaces/kits/js/napi/declare_napi.cpp
@@ -13,6 +13,8 @@
  * limitations under the License.
  */
 
+#include "declare_napi.h"
+
 #include <cstdio>
 #include <cstdlib>
 #include <string>
@@ -27,7 +29,7 @@ constexpr int ARGC_NUMBER_TWO = 2;
 constexpr int NAME_MAX_SIZE = 1024;
 }
 
-extern napi_value JSTraceStart(napi_env env, napi_callback_info info)
+static napi_value JSTraceStart(napi_env env, napi_callback_info info)
 {
     constexpr int ARGC_NUMBER_THREE = 3;
     size_t argc = ARGC_NUMBER_THREE;
@@ -60,7 +62,7 @@ extern napi_value JSTraceStart(napi_env env, napi_callback_info info)
     return nullptr;
 }
 
-extern napi_value JSTraceFinish(napi_env env, napi_callback_info info)
+static napi_value JSTraceFinish(napi_env env, napi_callback_info info)
 {
     size_t argc = ARGC_NUMBER_TWO;
     napi_value argv[ARGC_NUMBER_TWO];
@@ -84,7 +86,7 @@ extern napi_value JSTraceFinish(napi_env env, napi_callback_info info)
     return nullptr;
 }
 
-extern napi_value JSTraceCount(napi_env env, napi_callback_info info)
+static napi_value JSTraceCount(napi_env env, napi_callback_info info)
 {
     size_t argc = ARGC_NUMBER_TWO;
     napi_value argv[ARGC_NUMBER_TWO];
@@ -112,7 +114,7 @@ EXTERN_C_START
 /*
  * function for module exports
  */
-extern napi_value BytraceInit(napi_env env, napi_value exports)
+napi_value BytraceInit(napi_env env, napi_value exports)
 {
     static napi_property_descriptor desc[] = {
         DECLARE_NAPI_FUNCTION("startTrace", JSTraceStart),
diff --git a/interfaces/kits/js/napi/declare_napi.h b/interfaces/kits/js/napi/declare_napi.h
new file mode 100644
index 0000000..d1f83ae
--- /dev/null
+++ b/interfaces/kits/js/napi/declare_napi.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DEVELOPTOOLS_INTERFACES_KITS_DECLARE_NAPI_H
+#define DEVELOPTOOLS_INTERFACES_KITS_DECLARE_NAPI_H
+
+#include "napi/native_api.h"
+#include "napi/native_node_api.h"
+
+EXTERN_C_START
+napi_value BytraceInit(napi_env env, napi_value exports);
+EXTERN_C_END
+
+#endif // DEVELOPTOOLS_INTERFACES_KITS_DECLARE_NAPI_H
\ No newline at end of file
diff --git a/interfaces/kits/js/napi/hitracemeter.cpp b/interfaces/kits/js/napi/hitracemeter.cpp
index 3636832..2dd64c8 100644
--- a/interfaces/kits/js/napi/hitracemeter.cpp
+++ b/interfaces/kits/js/napi/hitracemeter.cpp
@@ -18,12 +18,7 @@
 #include <string>
 #include <hilog/log.h>
 #include "bytrace.h"
-#include "napi/native_api.h"
-#include "napi/native_node_api.h"
-
-EXTERN_C_START
-extern napi_value BytraceInit(napi_env env, napi_value exports);
-EXTERN_C_END
+#include "declare_napi.h"
 
 /*
  * hiTraceMeter module definition