ipc support hitrace

Signed-off-by: NXiYuhao <xiyuhao@huawei.com>

ipc/native/src/mock/include/dbinder_base_invoker.h

@@ -30,9 +30,7 @@
 #include "ipc_process_skeleton.h"
 #include "ipc_thread_skeleton.h"
 #include "ipc_debug.h"
-#ifndef CONFIG_STANDARD_SYSTEM
 #include "hitrace_invoker.h"
-#endif
 #include "dbinder_error_code.h"
 #include "log_tags.h"
 
@@ -678,11 +676,9 @@ int DBinderBaseInvoker<T>::SendRequest(int32_t handle, uint32_t code, MessagePar
     int userWaitTime = option.GetWaitTime();
     MessageParcel &newData = const_cast<MessageParcel &>(data);
     size_t oldWritePosition = newData.GetWritePosition();
-#ifndef CONFIG_STANDARD_SYSTEM
     HiTraceId traceId = HiTrace::GetId();
     // set client send trace point if trace is enabled
     HiTraceId childId = HitraceInvoker::TraceClientSend(handle, code, newData, flags, traceId);
-#endif
     std::shared_ptr<T> session = WriteTransaction(BC_TRANSACTION, flags, handle, 0, code, data, seqNumber, 0);
     if (session == nullptr) {
         newData.RewindWrite(oldWritePosition);
@@ -699,9 +695,7 @@ int DBinderBaseInvoker<T>::SendRequest(int32_t handle, uint32_t code, MessagePar
     } else {
         ret = SendOrWaitForCompletion(userWaitTime, seqNumber, session, &reply);
     }
-#ifndef CONFIG_STANDARD_SYSTEM
     HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId);
-#endif
     // restore Parcel data
     newData.RewindWrite(oldWritePosition);
     return ret;
@@ -840,10 +834,8 @@ template <class T> void DBinderBaseInvoker<T>::ProcessTransaction(dbinder_transa
         data.InjectOffsets(reinterpret_cast<binder_uintptr_t>(reinterpret_cast<char *>(tr->buffer) + tr->offsets),
             tr->offsets_size / sizeof(binder_size_t));
     }
-#ifndef CONFIG_STANDARD_SYSTEM
     uint32_t &newflags = const_cast<uint32_t &>(tr->flags);
     int isServerTraced = HitraceInvoker::TraceServerReceieve(tr->cookie, tr->code, data, newflags);
-#endif
 
     const pid_t oldPid = GetCallerPid();
     const auto oldUid = static_cast<const uid_t>(GetCallerUid());
@@ -884,9 +876,7 @@ template <class T> void DBinderBaseInvoker<T>::ProcessTransaction(dbinder_transa
         DBINDER_BASE_LOGE("delete raw data in process skeleton");
         current->DetachRawData(listenFd);
     }
-#ifndef CONFIG_STANDARD_SYSTEM
     HitraceInvoker::TraceServerSend(tr->cookie, tr->code, isServerTraced, newflags);
-#endif
     if (!(flags & MessageOption::TF_ASYNC)) {
         SetClientFd(listenFd);
         SetSeqNum(senderSeqNumber);

ipc/native/src/mock/source/binder_invoker.cpp

@@ -22,9 +22,7 @@
 #include "ipc_object_proxy.h"
 #include "ipc_process_skeleton.h"
 #include "ipc_thread_skeleton.h"
-#ifndef CONFIG_STANDARD_SYSTEM
 #include "hitrace_invoker.h"
-#endif
 #include "dbinder_error_code.h"
 #include "log_tags.h"
 
@@ -97,11 +95,9 @@ int BinderInvoker::SendRequest(int handle, uint32_t code, MessageParcel &data, M
     ZLOGI(LABEL, "%{public}s: handle=%d ,flags:%d", __func__, handle, flags);
     MessageParcel &newData = const_cast<MessageParcel &>(data);
     size_t oldWritePosition = newData.GetWritePosition();
-#ifndef CONFIG_STANDARD_SYSTEM
     HiTraceId traceId = HiTrace::GetId();
     // set client send trace point if trace is enabled
     HiTraceId childId = HitraceInvoker::TraceClientSend(handle, code, newData, flags, traceId);
-#endif
     if (!WriteTransaction(BC_TRANSACTION, flags, handle, code, data, nullptr)) {
         newData.RewindWrite(oldWritePosition);
         ZLOGE(LABEL, "WriteTransaction ERROR");
@@ -117,9 +113,7 @@ int BinderInvoker::SendRequest(int handle, uint32_t code, MessageParcel &data, M
     } else {
         error = WaitForCompletion(&reply);
     }
-#ifndef CONFIG_STANDARD_SYSTEM
     HitraceInvoker::TraceClientReceieve(handle, code, flags, traceId, childId);
-#endif
     // restore Parcel data
     newData.RewindWrite(oldWritePosition);
     ZLOGI(LABEL, "%{public}s: handle=%d result = %{public}d", __func__, handle, error);
@@ -417,10 +411,8 @@ void BinderInvoker::OnTransaction(const uint8_t *buffer)
     if (tr->offsets_size > 0) {
         data->InjectOffsets(tr->data.ptr.offsets, tr->offsets_size / sizeof(binder_size_t));
     }
-#ifndef CONFIG_STANDARD_SYSTEM
     uint32_t &newflags = const_cast<uint32_t &>(tr->flags);
     int isServerTraced = HitraceInvoker::TraceServerReceieve(tr->target.handle, tr->code, *data, newflags);
-#endif
     const pid_t oldPid = callerPid_;
     const auto oldUid = static_cast<const uid_t>(callerUid_);
     uint32_t oldStatus = status_;
@@ -445,9 +437,7 @@ void BinderInvoker::OnTransaction(const uint8_t *buffer)
         option.SetFlags(static_cast<int>(flagValue));
         error = targetObject->SendRequest(tr->code, *data, reply, option);
     }
-#ifndef CONFIG_STANDARD_SYSTEM
     HitraceInvoker::TraceServerSend(tr->target.handle, tr->code, isServerTraced, newflags);
-#endif
     if (!(flagValue & TF_ONE_WAY)) {
         SendReply(reply, 0, error);
     }