forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 20:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix division by zero in split

Browse source 
- update chunk pretty printer
- add comments
This commit is contained in:
zelig 2015-02-01 19:35:45 +01:00
parent 99190409dd
commit 4d3af2ca33
1 changed files with 410 additions and 400 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bzz/chunker.go
View file

@ -115,25 +115,34 @@ func (self *TreeChunker) HashSize() int64 {
return self.hashSize return self.hashSize
} }
// Chunk serves also serves as a request object passed to ChunkStores
// in case it is a retrieval request, Data is nil and Size is 0
// Note that Size is not the size of the data chunk, which is Data.Size() see SectionReader
// but the size of the subtree encoded in the chunk
// 0 if request, to be supplied by the dpa
type Chunk struct { type Chunk struct {
Data SectionReader // nil if request, to be supplied by dpa Data SectionReader // nil if request, to be supplied by dpa
Size int64 // size of the data covered by the subtree encoded in this chunk Size int64 // size of the data covered by the subtree encoded in this chunk
// not the size of data, which is Data.Size() see SectionReader
// 0 if request, to be supplied by dpa
Key Key // always Key Key // always
C chan bool // to signal data delivery by the dpa C chan bool // to signal data delivery by the dpa
wg sync.WaitGroup update bool //
} }
// String() for pretty printing
func (self *Chunk) String() string { func (self *Chunk) String() string {
var size int64 var size int64
var slice []byte var slice []byte
var n int
var err error
if self.Data != nil { if self.Data != nil {
size = self.Data.Size() size = 32 // we are printing 32 bytes of the data
slice = make([]byte, size) slice = make([]byte, size)
self.Data.ReadAt(slice, 0) n, err = self.Data.ReadAt(slice, 0)
if err != nil && err != io.EOF {
slice = []byte(fmt.Sprintf("ERROR: %v", err))
} }
return fmt.Sprintf("Key: [%x..] TreeSize: %v Chunksize: %v Data: %x\n", self.Key[:4], self.Size, size, slice) }
return fmt.Sprintf("Key: [%x..] TreeSize: %v Chunksize: %v Data: %x\n", self.Key[:4], self.Size, size, slice[:n])
} }
// The treeChunkers own Hash hashes together // The treeChunkers own Hash hashes together
@ -206,6 +215,11 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data SectionR
var hash Key var hash Key
dpaLogger.Debugf("depth: %v, max subtree size: %v, data size: %v", depth, treeSize, size) dpaLogger.Debugf("depth: %v, max subtree size: %v, data size: %v", depth, treeSize, size)
for depth > 0 && size < treeSize {
treeSize /= self.Branches
depth--
}
if depth == 0 { if depth == 0 {
// leaf nodes -> content chunks // leaf nodes -> content chunks
hash = self.Hash(size, data) hash = self.Hash(size, data)
@ -216,10 +230,6 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data SectionR
Size: size, Size: size,
} }
} else { } else {
for size < treeSize {
treeSize /= self.Branches
depth--
}
// intermediate chunk containing child nodes hashes // intermediate chunk containing child nodes hashes
branches := int64((size-1)/treeSize) + 1 branches := int64((size-1)/treeSize) + 1
dpaLogger.Debugf("intermediate node: setting branches: %v, depth: %v, max subtree size: %v, data size: %v", branches, depth, treeSize, size) dpaLogger.Debugf("intermediate node: setting branches: %v, depth: %v, max subtree size: %v, data size: %v", branches, depth, treeSize, size)