Skip to content
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

fix StopWatch cannot found #691

Merged
merged 1 commit into from
Sep 27, 2024
Merged

fix StopWatch cannot found #691

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions rasp/jvm/JVMAgent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jar {
}

shadowJar {
relocate 'io.netty', 'agent.io.netty'
relocate 'org.apache.commons', 'agent.org.apache.commons'
relocate 'io.netty', 'rasp.io.netty'
relocate 'org.apache.commons', 'rasp.org.apache.commons'
relocate 'META-INF/native/libnetty', 'META-INF/native/librasp_netty'
}

4 changes: 2 additions & 2 deletions rasp/jvm/JVMAgent/src/main/java/com/security/smithloader/SmithAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static Object ExceptionProxy(Object MethodNameObj,int classID, int method
return obj;
}

public static void RecordProxy(int classID, int methodID, Long t1, Long t2) {
public static void RecordProxy(int classID, int methodID, long t1, long t2) {
if (isBenchMark) {
try {
if (checkRecursive != null && checkRecursive.get() == true) {
Expand All @@ -111,7 +111,7 @@ public static void RecordProxy(int classID, int methodID, Long t1, Long t2) {
checkRecursive.set(true);
}
if(SmithProberObj != null) {
Class<?>[] argType = new Class[]{int.class,int.class, Long.class, Long.class};
Class<?>[] argType = new Class[]{int.class,int.class, long.class, long.class};
Reflection.invokeMethod(SmithProberObj,"record",argType,classID,methodID,t1,t2);
}
if (checkRecursive != null && checkRecursive.get() == true) {
Expand Down
2 changes: 1 addition & 1 deletion rasp/jvm/JVMProbe/src/main/java/com/security/smith/SmithProbe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ public void show() {
}

public void record(int classID, int methodID, long time,long totaltime) {
SmithLogger.logger.info("record: " + classID + " " + methodID + " " + time);
// SmithLogger.logger.info("record: " + classID + " " + methodID + " " + time);
synchronized (records) {
records.computeIfAbsent(new ImmutablePair<>(classID, methodID), k -> new ArrayList<>()).add(time);
}
Expand Down
Loading