Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
极致猎手
jadx
提交
4684207b
J
jadx
项目概览
极致猎手
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4684207b
编写于
2月 05, 2022
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: remove duplicate classes from decompilation batches (#1361)
上级
dd1be303
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
5 deletion
+19
-5
jadx-core/src/main/java/jadx/core/utils/DecompilerScheduler.java
...re/src/main/java/jadx/core/utils/DecompilerScheduler.java
+19
-5
未找到文件。
jadx-core/src/main/java/jadx/core/utils/DecompilerScheduler.java
浏览文件 @
4684207b
...
...
@@ -17,12 +17,13 @@ import jadx.api.IDecompileScheduler;
import
jadx.api.JadxDecompiler
;
import
jadx.api.JavaClass
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.core.utils.exceptions.JadxRuntimeException
;
public
class
DecompilerScheduler
implements
IDecompileScheduler
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
DecompilerScheduler
.
class
);
private
static
final
int
MERGED_BATCH_SIZE
=
16
;
private
static
final
boolean
D
UMP_STAT
S
=
false
;
private
static
final
boolean
D
EBUG_BATCHE
S
=
false
;
private
final
JadxDecompiler
decompiler
;
...
...
@@ -38,6 +39,9 @@ public class DecompilerScheduler implements IDecompileScheduler {
if
(
LOG
.
isDebugEnabled
())
{
LOG
.
debug
(
"Build decompilation batches in {}ms"
,
System
.
currentTimeMillis
()
-
start
);
}
if
(
DEBUG_BATCHES
)
{
check
(
result
,
classes
);
}
return
result
;
}
...
...
@@ -61,11 +65,13 @@ public class DecompilerScheduler implements IDecompileScheduler {
List
<
ClassNode
>
mergedBatch
=
new
ArrayList
<>(
MERGED_BATCH_SIZE
);
for
(
DepInfo
depInfo
:
deps
)
{
ClassNode
cls
=
depInfo
.
getCls
();
if
(!
added
.
add
(
cls
))
{
continue
;
}
int
depsSize
=
cls
.
getDependencies
().
size
();
if
(
depsSize
==
0
)
{
// add classes without dependencies in merged batch
mergedBatch
.
add
(
cls
);
added
.
add
(
cls
);
if
(
mergedBatch
.
size
()
>=
MERGED_BATCH_SIZE
)
{
result
.
add
(
mergedBatch
);
mergedBatch
=
new
ArrayList
<>(
MERGED_BATCH_SIZE
);
...
...
@@ -76,18 +82,18 @@ public class DecompilerScheduler implements IDecompileScheduler {
ClassNode
topDep
=
dep
.
getTopParentClass
();
if
(!
added
.
contains
(
topDep
))
{
batch
.
add
(
topDep
);
added
.
add
(
topDep
);
}
}
batch
.
sort
(
cmpDepSize
);
batch
.
add
(
cls
);
added
.
addAll
(
batch
);
result
.
add
(
batch
);
}
}
if
(
mergedBatch
.
size
()
>
0
)
{
result
.
add
(
mergedBatch
);
}
if
(
D
UMP_STAT
S
)
{
if
(
D
EBUG_BATCHE
S
)
{
dumpBatchesStats
(
classes
,
result
,
deps
);
}
return
result
;
...
...
@@ -140,8 +146,16 @@ public class DecompilerScheduler implements IDecompileScheduler {
LOG
.
info
(
"Batches stats:"
+
"\n input classes: "
+
classes
.
size
()
+
",\n batches: "
+
result
.
size
()
+
",\n average batch size: "
+
avg
+
",\n average batch size: "
+
String
.
format
(
"%.2f"
,
avg
)
+
",\n max single deps count: "
+
maxSingleDeps
+
",\n max recursive deps count: "
+
maxRecursiveDeps
);
}
private
static
void
check
(
List
<
List
<
JavaClass
>>
result
,
List
<
JavaClass
>
classes
)
{
int
classInBatches
=
result
.
stream
().
mapToInt
(
List:
:
size
).
sum
();
if
(
classes
.
size
()
!=
classInBatches
)
{
throw
new
JadxRuntimeException
(
"Incorrect number of classes in result batch: "
+
classInBatches
+
", expected: "
+
classes
.
size
());
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录