openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-27 01:10:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!11248 js 侧增加 trace

Browse Source 
Merge pull request !11248 from hy05190134/pr_add_trace
This commit is contained in:
openharmony_ci 2024-11-08 08:10:05 +00:00 committed by Gitee
commit 9c0075e8ee
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frameworks/native/ability/native/ability_runtime/js_ability_context.cpp
View File

@ -1264,6 +1264,7 @@ napi_value JsAbilityContext::OnStartAbilityForResultWithAccount(napi_env env, Na
napi_value JsAbilityContext::OnStartExtensionAbility(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::CONTEXT, "called");
if (info.argc < ARGC_ONE) {
ThrowTooFewParametersError(env);
@ -1308,6 +1309,7 @@ napi_value JsAbilityContext::OnStartExtensionAbility(napi_env env, NapiCallbackI
napi_value JsAbilityContext::OnStartExtensionAbilityWithAccount(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::CONTEXT, "called");
if (info.argc < ARGC_TWO) {
TAG_LOGE(AAFwkTag::CONTEXT, "param is too few");
@ -1353,6 +1355,7 @@ napi_value JsAbilityContext::OnStartExtensionAbilityWithAccount(napi_env env, Na
napi_value JsAbilityContext::OnStopExtensionAbility(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::CONTEXT, "called");
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::CONTEXT, "param is too few for stop extension ability");
@ -1396,6 +1399,7 @@ napi_value JsAbilityContext::OnStopExtensionAbility(napi_env env, NapiCallbackIn
napi_value JsAbilityContext::OnStopExtensionAbilityWithAccount(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::CONTEXT, "called");
if (info.argc < ARGC_TWO) {
TAG_LOGE(AAFwkTag::CONTEXT, "param is too few for stop extension ability with account");
@ -1599,6 +1603,7 @@ napi_value JsAbilityContext::OnConnectAbility(napi_env env, NapiCallbackInfo& in
napi_value JsAbilityContext::OnConnectAbilityWithAccount(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
// only support three params
if (info.argc < ARGC_THREE) {
TAG_LOGE(AAFwkTag::CONTEXT, "not enough params");
@ -1664,6 +1669,7 @@ napi_value JsAbilityContext::OnConnectAbilityWithAccount(napi_env env, NapiCallb
napi_value JsAbilityContext::OnDisconnectAbility(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
std::lock_guard<std::recursive_mutex> lock(gConnectsLock_);
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::CONTEXT, "not enough params");

5
frameworks/native/ability/native/extension_impl.cpp
View File

@ -274,6 +274,7 @@ void ExtensionImpl::AbilityTransactionCallback(const AAFwk::AbilityLifeCycleStat
*/
sptr<IRemoteObject> ExtensionImpl::ConnectExtension(const Want &want)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::EXT, "call");
if (extension_ == nullptr) {
TAG_LOGE(AAFwkTag::EXT, "null extension_");
@ -290,6 +291,7 @@ sptr<IRemoteObject> ExtensionImpl::ConnectExtension(const Want &want)
sptr<IRemoteObject> ExtensionImpl::ConnectExtension(const Want &want, bool &isAsyncCallback)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::EXT, "call");
if (extension_ == nullptr) {
TAG_LOGE(AAFwkTag::EXT, "null extension_");
@ -344,6 +346,7 @@ void ExtensionImpl::ConnectExtensionCallback(sptr<IRemoteObject> &service)
*/
void ExtensionImpl::DisconnectExtension(const Want &want)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::EXT, "call");
if (extension_ == nullptr) {
TAG_LOGE(AAFwkTag::EXT, "null extension_");
@ -356,6 +359,7 @@ void ExtensionImpl::DisconnectExtension(const Want &want)
void ExtensionImpl::DisconnectExtension(const Want &want, bool &isAsyncCallback)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::EXT, "called");
if (extension_ == nullptr) {
TAG_LOGE(AAFwkTag::EXT, "null extension_");
@ -410,6 +414,7 @@ void ExtensionImpl::DisconnectExtensionCallback()
*/
void ExtensionImpl::CommandExtension(const Want &want, bool restart, int startId)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::EXT, "call");
if (extension_ == nullptr) {
TAG_LOGE(AAFwkTag::EXT, "null extension_");

9
frameworks/native/ability/native/js_service_extension.cpp
View File

@ -155,6 +155,7 @@ void JsServiceExtension::Init(const std::shared_ptr<AbilityLocalRecord> &record,
const std::shared_ptr<OHOSApplication> &application, std::shared_ptr<AbilityHandler> &handler,
const sptr<IRemoteObject> &token)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
ServiceExtension::Init(record, application, handler, token);
std::string srcPath = "";
GetSrcPath(srcPath);
@ -286,6 +287,7 @@ void JsServiceExtension::BindContext(napi_env env, napi_value obj)
void JsServiceExtension::OnStart(const AAFwk::Want &want)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
Extension::OnStart(want);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "call");
@ -316,6 +318,7 @@ void JsServiceExtension::OnStart(const AAFwk::Want &want)
void JsServiceExtension::OnStop()
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
ServiceExtension::OnStop();
TAG_LOGD(AAFwkTag::SERVICE_EXT, "call");
CallObjectMethod("onDestroy");
@ -347,6 +350,7 @@ void JsServiceExtension::OnStop()
sptr<IRemoteObject> JsServiceExtension::OnConnect(const AAFwk::Want &want)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
HandleScope handleScope(jsRuntime_);
napi_value result = CallOnConnect(want);
napi_env env = jsRuntime_.GetNapiEnv();
@ -360,6 +364,7 @@ sptr<IRemoteObject> JsServiceExtension::OnConnect(const AAFwk::Want &want)
sptr<IRemoteObject> JsServiceExtension::OnConnect(const AAFwk::Want &want,
AppExecFwk::AbilityTransactionCallbackInfo<sptr<IRemoteObject>> *callbackInfo, bool &isAsyncCallback)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
HandleScope handleScope(jsRuntime_);
napi_env env = jsRuntime_.GetNapiEnv();
napi_value result = CallOnConnect(want);
@ -444,6 +449,7 @@ void JsServiceExtension::OnDisconnect(const AAFwk::Want &want,
void JsServiceExtension::OnCommand(const AAFwk::Want &want, bool restart, int startId)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
Extension::OnCommand(want, restart, startId);
TAG_LOGD(AAFwkTag::SERVICE_EXT, "restart=%{public}s,startId=%{public}d",
restart ? "true" : "false",
@ -556,6 +562,7 @@ bool JsServiceExtension::OnInsightIntentExecuteDone(uint64_t intentId,
napi_value JsServiceExtension::CallObjectMethod(const char* name, napi_value const* argv, size_t argc)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, std::string("CallObjectMethod:") + name);
TAG_LOGD(AAFwkTag::SERVICE_EXT, "name:%{public}s", name);
if (!jsObj_) {
@ -649,6 +656,7 @@ napi_value JsServiceExtension::CallOnConnect(const AAFwk::Want &want)
napi_value JsServiceExtension::CallOnDisconnect(const AAFwk::Want &want, bool withResult)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
HandleEscape handleEscape(jsRuntime_);
napi_env env = jsRuntime_.GetNapiEnv();
napi_value napiWant = OHOS::AppExecFwk::WrapWant(env, want);
@ -734,6 +742,7 @@ bool JsServiceExtension::CallPromise(napi_value result, AppExecFwk::AbilityTrans
void JsServiceExtension::OnConfigurationUpdated(const AppExecFwk::Configuration& configuration)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
ServiceExtension::OnConfigurationUpdated(configuration);
TAG_LOGD(AAFwkTag::SERVICE_EXT, "call");
auto context = GetContext();

87
frameworks/native/ability/native/js_service_extension_context.cpp
View File

@ -233,11 +233,6 @@ private:
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::SERVICE_EXT, "StartAbility");
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return CreateJsUndefined(env);
}
size_t unwrapArgc = 0;
AAFwk::Want want;
@ -397,11 +392,6 @@ private:
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "StartAbilityAsCaller");
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return CreateJsUndefined(env);
}
size_t unwrapArgc = 0;
AAFwk::Want want;
@ -443,6 +433,7 @@ private:
AAFwk::Want& want, AAFwk::StartOptions& startOptions, size_t& unwrapArgc) const
{
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return false;
}
@ -464,11 +455,6 @@ private:
napi_value OnStartAbilityByCall(napi_env env, NapiCallbackInfo& info)
{
TAG_LOGI(AAFwkTag::SERVICE_EXT, "StartAbilityByCall");
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return CreateJsUndefined(env);
}
AAFwk::Want want;
int32_t accountId = DEFAULT_INVAL_VALUE;
if (!CheckStartAbilityByCallInputParam(env, info, want, accountId)) {
@ -510,12 +496,18 @@ private:
bool CheckStartAbilityByCallInputParam(
napi_env env, NapiCallbackInfo& info, AAFwk::Want& want, int32_t& accountId)
{
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return false;
}
if (!AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want)) {
ThrowInvalidParamError(env, "Parse param want failed, must be a Want.");
return false;
}
if (info.argc > static_cast<size_t>(INDEX_ONE)) {
if (info.argc > ARGC_ONE) {
if (CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_number)) {
if (!ConvertFromJsValue(env, info.argv[1], accountId)) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "check param accountId failed");
@ -614,12 +606,8 @@ private:
napi_value OnStartAbilityWithAccount(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "StartAbilityWithAccount");
if (info.argc < ARGC_TWO) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return CreateJsUndefined(env);
}
size_t unwrapArgc = 0;
AAFwk::Want want;
@ -662,6 +650,7 @@ private:
AAFwk::Want& want, int32_t& accountId, size_t& unwrapArgc) const
{
if (info.argc < ARGC_TWO) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return false;
}
@ -680,8 +669,34 @@ private:
return true;
}
bool CheckConnectAbilityWithAccountInputParam(
napi_env env, NapiCallbackInfo& info,
AAFwk::Want& want, int32_t& accountId, sptr<JSServiceExtensionConnection>& connection) const
{
if (info.argc < ARGC_THREE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return false;
}
// Check input want
if (!AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want)) {
ThrowInvalidParamError(env, "Parse param want failed, must be a Want.");
return false;
}
if (!AppExecFwk::UnwrapInt32FromJS2(env, info.argv[INDEX_ONE], accountId)) {
ThrowInvalidParamError(env, "Parse param accountId failed, must be a number.");
return false;
}
if (!CheckConnectionParam(env, info.argv[INDEX_TWO], connection, want, accountId)) {
ThrowInvalidParamError(env, "Parse param options failed, must be a ConnectOptions.");
return false;
}
return true;
}
napi_value OnTerminateAbility(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "TerminateAbility");
auto innerErrCode = std::make_shared<ErrCode>(ERR_OK);
NapiAsyncTask::ExecuteCallback execute = [weak = context_, innerErrCode]() {
@ -713,6 +728,7 @@ private:
napi_value OnConnectAbility(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::SERVICE_EXT, "called");
// Check params count
if (info.argc < ARGC_TWO) {
@ -757,23 +773,13 @@ private:
napi_value OnConnectAbilityWithAccount(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "ConnectAbilityWithAccount");
// Check params count
if (info.argc < ARGC_THREE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return CreateJsUndefined(env);
}
// Unwrap want, accountId and connection
AAFwk::Want want;
int32_t accountId = 0;
sptr<JSServiceExtensionConnection> connection = new JSServiceExtensionConnection(env);
size_t unwrapArgc = 0;
if (!CheckStartAbilityWithAccountInputParam(env, info, want, accountId, unwrapArgc)) {
return CreateJsUndefined(env);
}
if (!CheckConnectionParam(env, info.argv[INDEX_TWO], connection, want, accountId)) {
ThrowInvalidParamError(env, "Parse param options failed, must be a ConnectOptions.");
if (!CheckConnectAbilityWithAccountInputParam(env, info, want, accountId, connection)) {
return CreateJsUndefined(env);
}
int64_t connectId = connection->GetConnectionId();
@ -837,6 +843,7 @@ private:
napi_value OnDisconnectAbility(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGD(AAFwkTag::SERVICE_EXT, "called");
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
@ -911,6 +918,7 @@ private:
napi_value OnStartExtensionAbility(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "called");
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
@ -995,12 +1003,8 @@ private:
napi_value OnStartExtensionAbilityWithAccount(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "called");
if (info.argc < ARGC_TWO) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return CreateJsUndefined(env);
}
AAFwk::Want want;
int32_t accountId = -1;
size_t unwrapArgc = 0;
@ -1037,6 +1041,7 @@ private:
napi_value OnStopExtensionAbility(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "called");
if (info.argc < ARGC_ONE) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
@ -1078,12 +1083,8 @@ private:
napi_value OnStopExtensionAbilityWithAccount(napi_env env, NapiCallbackInfo& info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
TAG_LOGI(AAFwkTag::SERVICE_EXT, "called");
if (info.argc < ARGC_TWO) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid argc");
ThrowTooFewParametersError(env);
return CreateJsUndefined(env);
}
AAFwk::Want want;
int32_t accountId = -1;
size_t unwrapArgc = 0;