Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Quincy379
jadx
提交
068234f0
J
jadx
项目概览
Quincy379
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
068234f0
编写于
7月 29, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: remove synchronization lock for code generation (#726)
上级
ccb8ed13
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
38 deletion
+31
-38
jadx-core/src/main/java/jadx/api/JavaClass.java
jadx-core/src/main/java/jadx/api/JavaClass.java
+13
-6
jadx-core/src/main/java/jadx/core/ProcessClass.java
jadx-core/src/main/java/jadx/core/ProcessClass.java
+18
-32
未找到文件。
jadx-core/src/main/java/jadx/api/JavaClass.java
浏览文件 @
068234f0
...
...
@@ -25,6 +25,7 @@ public final class JavaClass implements JavaNode {
private
List
<
JavaClass
>
innerClasses
=
Collections
.
emptyList
();
private
List
<
JavaField
>
fields
=
Collections
.
emptyList
();
private
List
<
JavaMethod
>
methods
=
Collections
.
emptyList
();
private
boolean
listsLoaded
;
JavaClass
(
ClassNode
classNode
,
JadxDecompiler
decompiler
)
{
this
.
decompiler
=
decompiler
;
...
...
@@ -59,7 +60,6 @@ public final class JavaClass implements JavaNode {
}
if
(
cls
.
getCode
()
==
null
)
{
cls
.
decompile
();
load
();
}
}
...
...
@@ -75,13 +75,20 @@ public final class JavaClass implements JavaNode {
public
synchronized
void
unload
()
{
cls
.
unload
();
listsLoaded
=
false
;
}
public
ClassNode
getClassNode
()
{
return
cls
;
}
private
void
load
()
{
private
void
loadLists
()
{
if
(
listsLoaded
)
{
return
;
}
listsLoaded
=
true
;
decompile
();
JadxDecompiler
rootDecompiler
=
getRootDecompiler
();
int
inClsCount
=
cls
.
getInnerClasses
().
size
();
if
(
inClsCount
!=
0
)
{
...
...
@@ -89,7 +96,7 @@ public final class JavaClass implements JavaNode {
for
(
ClassNode
inner
:
cls
.
getInnerClasses
())
{
if
(!
inner
.
contains
(
AFlag
.
DONT_GENERATE
))
{
JavaClass
javaClass
=
new
JavaClass
(
inner
,
this
);
javaClass
.
load
();
javaClass
.
load
Lists
();
list
.
add
(
javaClass
);
rootDecompiler
.
getClassesMap
().
put
(
inner
,
javaClass
);
}
...
...
@@ -205,17 +212,17 @@ public final class JavaClass implements JavaNode {
}
public
List
<
JavaClass
>
getInnerClasses
()
{
decompile
();
loadLists
();
return
innerClasses
;
}
public
List
<
JavaField
>
getFields
()
{
decompile
();
loadLists
();
return
fields
;
}
public
List
<
JavaMethod
>
getMethods
()
{
decompile
();
loadLists
();
return
methods
;
}
...
...
jadx-core/src/main/java/jadx/core/ProcessClass.java
浏览文件 @
068234f0
...
...
@@ -5,7 +5,6 @@ import org.jetbrains.annotations.NotNull;
import
jadx.api.ICodeInfo
;
import
jadx.core.codegen.CodeGen
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.core.dex.nodes.ProcessState
;
import
jadx.core.dex.visitors.DepthTraversal
;
import
jadx.core.dex.visitors.IDexTreeVisitor
;
import
jadx.core.utils.ErrorsCounter
;
...
...
@@ -22,28 +21,16 @@ public final class ProcessClass {
}
public
static
void
process
(
ClassNode
cls
)
{
process
(
cls
,
false
);
}
@NotNull
public
static
ICodeInfo
generateCode
(
ClassNode
cls
)
{
ICodeInfo
codeInfo
=
process
(
cls
,
true
);
if
(
codeInfo
==
null
)
{
throw
new
JadxRuntimeException
(
"Failed to generate code for class: "
+
cls
.
getFullName
());
}
return
codeInfo
;
}
private
static
ICodeInfo
process
(
ClassNode
cls
,
boolean
generateCode
)
{
ClassNode
topParentClass
=
cls
.
getTopParentClass
();
if
(
topParentClass
!=
cls
)
{
return
process
(
topParentClass
,
generateCode
);
process
(
topParentClass
);
return
;
}
if
(
!
generateCode
&&
cls
.
getState
()
==
PROCESS_COMPLETE
)
{
if
(
cls
.
getState
()
==
PROCESS_COMPLETE
)
{
// nothing to do
return
null
;
return
;
}
synchronized
(
getSyncObj
(
cls
))
{
synchronized
(
cls
.
getClassInfo
(
))
{
try
{
if
(
cls
.
getState
()
==
NOT_LOADED
)
{
cls
.
load
();
...
...
@@ -55,27 +42,26 @@ public final class ProcessClass {
}
cls
.
setState
(
PROCESS_COMPLETE
);
}
if
(
generateCode
&&
cls
.
getState
()
==
PROCESS_COMPLETE
)
{
processDependencies
(
cls
);
ICodeInfo
code
=
CodeGen
.
generate
(
cls
);
cls
.
setState
(
ProcessState
.
GENERATED
);
// TODO: unload class (need to build dependency tree or allow to load class several times)
return
code
;
}
}
catch
(
Throwable
e
)
{
ErrorsCounter
.
classError
(
cls
,
e
.
getClass
().
getSimpleName
(),
e
);
}
}
return
null
;
}
private
static
Object
getSyncObj
(
ClassNode
cls
)
{
return
cls
.
getClassInfo
();
}
@NotNull
public
static
ICodeInfo
generateCode
(
ClassNode
cls
)
{
ClassNode
topParentClass
=
cls
.
getTopParentClass
();
if
(
topParentClass
!=
cls
)
{
return
generateCode
(
topParentClass
);
}
try
{
process
(
cls
);
cls
.
getDependencies
().
forEach
(
ProcessClass:
:
process
);
private
static
void
processDependencies
(
ClassNode
cls
)
{
for
(
ClassNode
depCls
:
cls
.
getDependencies
())
{
process
(
depCls
,
false
);
// TODO: unload class (need to build dependency tree or allow to load class several times)
return
CodeGen
.
generate
(
cls
);
}
catch
(
Throwable
e
)
{
throw
new
JadxRuntimeException
(
"Failed to generate code for class: "
+
cls
.
getFullName
(),
e
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录