Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
218ec6c0
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
218ec6c0
编写于
1月 11, 2017
作者:
P
Péter Szilágyi
提交者:
GitHub
1月 11, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3551 from fjl/core-import-log-align
core: improve import log alignment
上级
d30d7800
21f1370d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
10 deletion
+8
-10
core/blockchain.go
core/blockchain.go
+7
-9
core/headerchain.go
core/headerchain.go
+1
-1
未找到文件。
core/blockchain.go
浏览文件 @
218ec6c0
...
...
@@ -29,6 +29,7 @@ import (
"time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/mclock"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
...
...
@@ -799,7 +800,7 @@ func (self *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain
if
stats
.
ignored
>
0
{
ignored
=
fmt
.
Sprintf
(
" (%d ignored)"
,
stats
.
ignored
)
}
glog
.
V
(
logger
.
Info
)
.
Infof
(
"imported %d receipts in %9v. #%d [%x… / %x…]%s"
,
stats
.
processed
,
common
.
PrettyDuration
(
time
.
Since
(
start
)),
last
.
Number
(),
first
.
Hash
()
.
Bytes
()[
:
4
],
last
.
Hash
()
.
Bytes
()[
:
4
],
ignored
)
glog
.
V
(
logger
.
Info
)
.
Infof
(
"imported %
4
d receipts in %9v. #%d [%x… / %x…]%s"
,
stats
.
processed
,
common
.
PrettyDuration
(
time
.
Since
(
start
)),
last
.
Number
(),
first
.
Hash
()
.
Bytes
()[
:
4
],
last
.
Hash
()
.
Bytes
()[
:
4
],
ignored
)
return
0
,
nil
}
...
...
@@ -875,7 +876,7 @@ func (self *BlockChain) InsertChain(chain types.Blocks) (int, error) {
// faster than direct delivery and requires much less mutex
// acquiring.
var
(
stats
=
insertStats
{
startTime
:
time
.
Now
()}
stats
=
insertStats
{
startTime
:
mclock
.
Now
()}
events
=
make
([]
interface
{},
0
,
len
(
chain
))
coalescedLogs
[]
*
types
.
Log
nonceChecked
=
make
([]
bool
,
len
(
chain
))
...
...
@@ -1031,7 +1032,7 @@ type insertStats struct {
queued
,
processed
,
ignored
int
usedGas
uint64
lastIndex
int
startTime
time
.
Time
startTime
mclock
.
Abs
Time
}
// statsReportLimit is the time limit during import after which we always print
...
...
@@ -1043,12 +1044,9 @@ const statsReportLimit = 8 * time.Second
func
(
st
*
insertStats
)
report
(
chain
[]
*
types
.
Block
,
index
int
)
{
// Fetch the timings for the batch
var
(
now
=
time
.
Now
()
elapsed
=
now
.
Sub
(
st
.
startTime
)
now
=
mclock
.
Now
()
elapsed
=
time
.
Duration
(
now
)
-
time
.
Duration
(
st
.
startTime
)
)
if
elapsed
==
0
{
// Yes Windows, I'm looking at you
elapsed
=
1
}
// If we're at the last block of the batch or report period reached, log
if
index
==
len
(
chain
)
-
1
||
elapsed
>=
statsReportLimit
{
start
,
end
:=
chain
[
st
.
lastIndex
],
chain
[
index
]
...
...
@@ -1063,7 +1061,7 @@ func (st *insertStats) report(chain []*types.Block, index int) {
}
else
{
hashes
=
fmt
.
Sprintf
(
"%x…"
,
end
.
Hash
()
.
Bytes
()[
:
4
])
}
glog
.
Infof
(
"imported %d blocks, %5d txs (%7.3f Mg) in %9v (%6.3f Mg/s). #%v [%s]%s"
,
st
.
processed
,
txcount
,
float64
(
st
.
usedGas
)
/
1000000
,
common
.
PrettyDuration
(
elapsed
),
float64
(
st
.
usedGas
)
*
1000
/
float64
(
elapsed
),
end
.
Number
(),
hashes
,
extra
)
glog
.
Infof
(
"imported %
4
d blocks, %5d txs (%7.3f Mg) in %9v (%6.3f Mg/s). #%v [%s]%s"
,
st
.
processed
,
txcount
,
float64
(
st
.
usedGas
)
/
1000000
,
common
.
PrettyDuration
(
elapsed
),
float64
(
st
.
usedGas
)
*
1000
/
float64
(
elapsed
),
end
.
Number
(),
hashes
,
extra
)
*
st
=
insertStats
{
startTime
:
now
,
lastIndex
:
index
}
}
...
...
core/headerchain.go
浏览文件 @
218ec6c0
...
...
@@ -339,7 +339,7 @@ func (hc *HeaderChain) InsertHeaderChain(chain []*types.Header, checkFreq int, w
if
stats
.
ignored
>
0
{
ignored
=
fmt
.
Sprintf
(
" (%d ignored)"
,
stats
.
ignored
)
}
glog
.
V
(
logger
.
Info
)
.
Infof
(
"imported %d headers%s in %9v. #%v [%x… / %x…]"
,
stats
.
processed
,
ignored
,
common
.
PrettyDuration
(
time
.
Since
(
start
)),
last
.
Number
,
first
.
Hash
()
.
Bytes
()[
:
4
],
last
.
Hash
()
.
Bytes
()[
:
4
])
glog
.
V
(
logger
.
Info
)
.
Infof
(
"imported %
4
d headers%s in %9v. #%v [%x… / %x…]"
,
stats
.
processed
,
ignored
,
common
.
PrettyDuration
(
time
.
Since
(
start
)),
last
.
Number
,
first
.
Hash
()
.
Bytes
()[
:
4
],
last
.
Hash
()
.
Bytes
()[
:
4
])
return
0
,
nil
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录