Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
9f45d6ef
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 搜索 >>
未验证
提交
9f45d6ef
编写于
8月 10, 2020
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ethstats: split read and write lock, otherwise they'll lock up
上级
cbbc54c4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
14 deletion
+18
-14
ethstats/ethstats.go
ethstats/ethstats.go
+18
-14
未找到文件。
ethstats/ethstats.go
浏览文件 @
9f45d6ef
...
...
@@ -99,19 +99,20 @@ type Service struct {
// connWrapper is a wrapper to prevent concurrent-write or concurrent-read on the
// websocket.
// From Gorilla websocket docs:
// Connections support one concurrent reader and one concurrent writer.
// Applications are responsible for ensuring that no more than one goroutine calls the write methods
// - NextWriter, SetWriteDeadline, WriteMessage, WriteJSON, EnableWriteCompression, SetCompressionLevel
// concurrently and that no more than one goroutine calls the read methods
// - NextReader, SetReadDeadline, ReadMessage, ReadJSON, SetPongHandler, SetPingHandler
// concurrently.
// The Close and WriteControl methods can be called concurrently with all other methods.
//
// The connWrapper uses a single mutex for both reading and writing.
// From Gorilla websocket docs:
// Connections support one concurrent reader and one concurrent writer.
// Applications are responsible for ensuring that no more than one goroutine calls the write methods
// - NextWriter, SetWriteDeadline, WriteMessage, WriteJSON, EnableWriteCompression, SetCompressionLevel
// concurrently and that no more than one goroutine calls the read methods
// - NextReader, SetReadDeadline, ReadMessage, ReadJSON, SetPongHandler, SetPingHandler
// concurrently.
// The Close and WriteControl methods can be called concurrently with all other methods.
type
connWrapper
struct
{
conn
*
websocket
.
Conn
mu
sync
.
Mutex
rlock
sync
.
Mutex
wlock
sync
.
Mutex
}
func
newConnectionWrapper
(
conn
*
websocket
.
Conn
)
*
connWrapper
{
...
...
@@ -120,15 +121,17 @@ func newConnectionWrapper(conn *websocket.Conn) *connWrapper {
// WriteJSON wraps corresponding method on the websocket but is safe for concurrent calling
func
(
w
*
connWrapper
)
WriteJSON
(
v
interface
{})
error
{
w
.
mu
.
Lock
()
defer
w
.
mu
.
Unlock
()
w
.
wlock
.
Lock
()
defer
w
.
wlock
.
Unlock
()
return
w
.
conn
.
WriteJSON
(
v
)
}
// ReadJSON wraps corresponding method on the websocket but is safe for concurrent calling
func
(
w
*
connWrapper
)
ReadJSON
(
v
interface
{})
error
{
w
.
mu
.
Lock
()
defer
w
.
mu
.
Unlock
()
w
.
rlock
.
Lock
()
defer
w
.
rlock
.
Unlock
()
return
w
.
conn
.
ReadJSON
(
v
)
}
...
...
@@ -275,6 +278,7 @@ func (s *Service) loop() {
continue
}
go
s
.
readLoop
(
conn
)
// Send the initial stats so our node looks decent from the get go
if
err
=
s
.
report
(
conn
);
err
!=
nil
{
log
.
Warn
(
"Initial stats report failed"
,
"err"
,
err
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录