Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>asm</groupId>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>3.3.1</version>
<version>9.7</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -26,8 +26,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand Down
34 changes: 25 additions & 9 deletions src/main/java/com/taobao/profile/analysis/ProfilerLogAnalysis.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,12 @@ public List<TimeSortData> getTimeSortData() {
* 读取log,并解析
*/
private void reader() {
BufferedReader reader = null;
// 首先读取方法路径文件
BufferedReader methodReader = null;
try {
reader = new BufferedReader(new FileReader(methodPath));
methodReader = new BufferedReader(new FileReader(methodPath));
String line = null;
while ((line = reader.readLine()) != null) {
while ((line = methodReader.readLine()) != null) {
if (line.startsWith("instrument")) {
continue;
}
Expand All @@ -91,11 +92,26 @@ private void reader() {
}
methodIdMap.put(Long.parseLong(data[0]), String.valueOf(data[1]));
}
reader.close();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} finally {
if (methodReader != null) {
try {
methodReader.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}

reader = new BufferedReader(new FileReader(logPath));
line = null;
while ((line = reader.readLine()) != null) {
// 然后读取日志路径文件
BufferedReader logReader = null;
try {
logReader = new BufferedReader(new FileReader(logPath));
String line = null;
while ((line = logReader.readLine()) != null) {
if (line.startsWith("##")) {
line = line.substring(line.indexOf(":") + 1, line.length());
if (line.equals("true")) {
Expand All @@ -121,9 +137,9 @@ private void reader() {
} catch (IOException e) {
e.printStackTrace();
} finally {
if (reader != null) {
if (logReader != null) {
try {
reader.close();
logReader.close();
} catch (IOException e) {
e.printStackTrace();
}
Expand Down