forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 01:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fis storageWG in chunker

Browse source 
storeWG did not work because it was possible to start to wait on earlier than the first Add happened
This commit is contained in:
Balint Gabor 2018-01-04 12:59:04 +01:00
parent 1ad50b1563
commit f3fdcb2064
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
swarm/storage/chunker.go
View file

@ -130,7 +130,7 @@ func (self *TreeChunker) Split(data io.Reader, size int64, chunkC chan *Chunk) (
quitC := make(chan bool)
self.incrementWorkerCount()
go self.hashWorker(jobC, chunkC, errC, quitC, storeWg)
self.runHashWorker(jobC, chunkC, errC, quitC, storeWg)
depth := 0
treeSize := self.chunkSize
@ -230,7 +230,7 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data io.Reade
worker := self.getWorkerCount()
if int64(len(jobC)) > worker && worker < ChunkProcessors {
self.incrementWorkerCount()
go self.hashWorker(jobC, chunkC, errC, quitC, storeWg)
self.runHashWorker(jobC, chunkC, errC, quitC, storeWg)
}
select {
@ -239,23 +239,27 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data io.Reade
}
}
func (self *TreeChunker) hashWorker(jobC chan *hashJob, chunkC chan *Chunk, errC chan error, quitC chan bool, storeWg *sync.WaitGroup) {
defer self.decrementWorkerCount()
func (self *TreeChunker) runHashWorker(jobC chan *hashJob, chunkC chan *Chunk, errC chan error, quitC chan bool, storeWg *sync.WaitGroup) {
storeWg.Add(1)
hasher := self.hashFunc()
for {
select {
go func() {
defer self.decrementWorkerCount()
defer storeWg.Done()
hasher := self.hashFunc()
for {
select {
case job, ok := <-jobC:
if !ok {
case job, ok := <-jobC:
if !ok {
return
}
// now we got the hashes in the chunk, then hash the chunks
self.hashChunk(hasher, job, chunkC, storeWg)
case <-quitC:
return
}
// now we got the hashes in the chunk, then hash the chunks
self.hashChunk(hasher, job, chunkC, storeWg)
case <-quitC:
return
}
}
}()
}
// The treeChunkers own Hash hashes together