Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
c3a4874e
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 搜索 >>
提交
c3a4874e
编写于
3月 11, 2016
作者:
P
Péter Szilágyi
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2326 from karalabe/goleveldb-datarace-fix
Godeps: pull in the leveldb upstream write race fix
上级
850f41b3
9ff07304
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
69 deletion
+15
-69
Godeps/Godeps.json
Godeps/Godeps.json
+12
-12
Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
...space/src/github.com/syndtr/goleveldb/leveldb/db_write.go
+3
-3
Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool.go
...pace/src/github.com/syndtr/goleveldb/leveldb/util/pool.go
+0
-21
Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go
...c/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go
+0
-33
未找到文件。
Godeps/Godeps.json
浏览文件 @
c3a4874e
...
...
@@ -140,51 +140,51 @@
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/cache"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/comparer"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/errors"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/filter"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/iterator"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/journal"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/memdb"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/opt"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/storage"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/table"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"github.com/syndtr/goleveldb/leveldb/util"
,
"Rev"
:
"
ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280
"
"Rev"
:
"
917f41c560270110ceb73c5b38be2a9127387071
"
},
{
"ImportPath"
:
"golang.org/x/crypto/pbkdf2"
,
...
...
Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
浏览文件 @
c3a4874e
...
...
@@ -166,15 +166,15 @@ func (db *DB) Write(b *Batch, wo *opt.WriteOptions) (err error) {
merged
:=
0
danglingMerge
:=
false
defer
func
()
{
for
i
:=
0
;
i
<
merged
;
i
++
{
db
.
writeAckC
<-
err
}
if
danglingMerge
{
// Only one dangling merge at most, so this is safe.
db
.
writeMergedC
<-
false
}
else
{
<-
db
.
writeLockC
}
for
i
:=
0
;
i
<
merged
;
i
++
{
db
.
writeAckC
<-
err
}
}()
mdb
,
mdbFree
,
err
:=
db
.
flush
(
b
.
size
())
...
...
Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool.go
已删除
100644 → 0
浏览文件 @
850f41b3
// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
// All rights reserved.
//
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// +build go1.3
package
util
import
(
"sync"
)
type
Pool
struct
{
sync
.
Pool
}
func
NewPool
(
cap
int
)
*
Pool
{
return
&
Pool
{}
}
Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go
已删除
100644 → 0
浏览文件 @
850f41b3
// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
// All rights reserved.
//
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// +build !go1.3
package
util
type
Pool
struct
{
pool
chan
interface
{}
}
func
(
p
*
Pool
)
Get
()
interface
{}
{
select
{
case
x
:=
<-
p
.
pool
:
return
x
default
:
return
nil
}
}
func
(
p
*
Pool
)
Put
(
x
interface
{})
{
select
{
case
p
.
pool
<-
x
:
default
:
}
}
func
NewPool
(
cap
int
)
*
Pool
{
return
&
Pool
{
pool
:
make
(
chan
interface
{},
cap
)}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录