Skip to content

inline all the method, optimize the performance. #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiplening wants to merge 1 commit into
base: master
Choose a base branch
from
Open

inline all the method, optimize the performance. #894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 86 additions & 41 deletions ...ndroid/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/core/AppMethodBeat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,52 @@ public static void i(int methodId) {
}
assertIn = true;
if (sIndex < Constants.BUFFER_SIZE) {
mergeData(methodId, sIndex, true);
if (methodId == AppMethodBeat.METHOD_ID_DISPATCH) {
sCurrentDiffTime = SystemClock.uptimeMillis() - sDiffTime;
}
try {
long trueId = 0L;
trueId |= 1L << 63;
trueId |= (long) methodId << 43;
trueId |= sCurrentDiffTime & 0x7FFFFFFFFFFL;
sBuffer[sIndex] = trueId;
IndexRecord indexRecord = sIndexRecordHead;
while (indexRecord != null) {
if (indexRecord.index == sIndex || (indexRecord.index == -1 && sLastIndex == Constants.BUFFER_SIZE - 1)) {
indexRecord.isValid = false;
sIndexRecordHead = indexRecord = indexRecord.next;
} else {
break;
}
}
sLastIndex = sIndex;
} catch (Throwable t) {
MatrixLog.e(TAG, t.getMessage());
}
} else {
sIndex = 0;
mergeData(methodId, sIndex, true);
if (methodId == AppMethodBeat.METHOD_ID_DISPATCH) {
sCurrentDiffTime = SystemClock.uptimeMillis() - sDiffTime;
}
try {
long trueId = 0L;
trueId |= 1L << 63;
trueId |= (long) methodId << 43;
trueId |= sCurrentDiffTime & 0x7FFFFFFFFFFL;
sBuffer[sIndex] = trueId;
IndexRecord indexRecord = sIndexRecordHead;
while (indexRecord != null) {
if (indexRecord.index == sIndex || (indexRecord.index == -1 && sLastIndex == Constants.BUFFER_SIZE - 1)) {
indexRecord.isValid = false;
sIndexRecordHead = indexRecord = indexRecord.next;
} else {
break;
}
}
sLastIndex = sIndex;
} catch (Throwable t) {
MatrixLog.e(TAG, t.getMessage());
}
}
++sIndex;
assertIn = false;
Expand All @@ -274,10 +316,50 @@ public static void o(int methodId) {
}
if (Thread.currentThread().getId() == sMainThreadId) {
if (sIndex < Constants.BUFFER_SIZE) {
mergeData(methodId, sIndex, false);
if (methodId == AppMethodBeat.METHOD_ID_DISPATCH) {
sCurrentDiffTime = SystemClock.uptimeMillis() - sDiffTime;
}
try {
long trueId = 0L;
trueId |= (long) methodId << 43;
trueId |= sCurrentDiffTime & 0x7FFFFFFFFFFL;
sBuffer[sIndex] = trueId;
IndexRecord indexRecord = sIndexRecordHead;
while (indexRecord != null) {
if (indexRecord.index == sIndex || (indexRecord.index == -1 && sLastIndex == Constants.BUFFER_SIZE - 1)) {
indexRecord.isValid = false;
sIndexRecordHead = indexRecord = indexRecord.next;
} else {
break;
}
}
sLastIndex = sIndex;
} catch (Throwable t) {
MatrixLog.e(TAG, t.getMessage());
}
} else {
sIndex = 0;
mergeData(methodId, sIndex, false);
if (methodId == AppMethodBeat.METHOD_ID_DISPATCH) {
sCurrentDiffTime = SystemClock.uptimeMillis() - sDiffTime;
}
try {
long trueId = 0L;
trueId |= (long) methodId << 43;
trueId |= sCurrentDiffTime & 0x7FFFFFFFFFFL;
sBuffer[sIndex] = trueId;
IndexRecord indexRecord = sIndexRecordHead;
while (indexRecord != null) {
if (indexRecord.index == sIndex || (indexRecord.index == -1 && sLastIndex == Constants.BUFFER_SIZE - 1)) {
indexRecord.isValid = false;
sIndexRecordHead = indexRecord = indexRecord.next;
} else {
break;
}
}
sLastIndex = sIndex;
} catch (Throwable t) {
MatrixLog.e(TAG, t.getMessage());
}
}
++sIndex;
}
Expand Down Expand Up @@ -313,32 +395,7 @@ public static String getVisibleScene() {
return ProcessUILifecycleOwner.INSTANCE.getVisibleScene();
}

/**
* merge trace info as a long data
*
* @param methodId
* @param index
* @param isIn
*/
private static void mergeData(int methodId, int index, boolean isIn) {
if (methodId == AppMethodBeat.METHOD_ID_DISPATCH) {
sCurrentDiffTime = SystemClock.uptimeMillis() - sDiffTime;
}

try {
long trueId = 0L;
if (isIn) {
trueId |= 1L << 63;
}
trueId |= (long) methodId << 43;
trueId |= sCurrentDiffTime & 0x7FFFFFFFFFFL;
sBuffer[index] = trueId;
checkPileup(index);
sLastIndex = index;
} catch (Throwable t) {
MatrixLog.e(TAG, t.getMessage());
}
}

public void addListener(IAppMethodBeatListener listener) {
synchronized (listeners) {
Expand Down Expand Up @@ -387,18 +444,6 @@ record = record.next;
}
}

private static void checkPileup(int index) {
IndexRecord indexRecord = sIndexRecordHead;
while (indexRecord != null) {
if (indexRecord.index == index || (indexRecord.index == -1 && sLastIndex == Constants.BUFFER_SIZE - 1)) {
indexRecord.isValid = false;
MatrixLog.w(TAG, "[checkPileup] %s", indexRecord.toString());
sIndexRecordHead = indexRecord = indexRecord.next;
} else {
break;
}
}
}

public static final class IndexRecord {
public IndexRecord(int index) {
Expand Down