cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #70 from filecoin-project/asr/refactor

Browse Source 
extract GetRequiredPadding
This commit is contained in:
Łukasz Magiera 2020-07-13 12:52:43 +02:00 committed by GitHub
commit 937eba4785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ffiwrapper/sealer_cgo.go
View File

@ -598,45 +598,65 @@ func GeneratePieceCIDFromFile(proofType abi.RegisteredSealProof, piece io.Reader
return pieceCID, werr() return pieceCID, werr()
} }
func GenerateUnsealedCID(proofType abi.RegisteredSealProof, pieces []abi.PieceInfo) (cid.Cid, error) { func GetRequiredPadding(oldLength abi.PaddedPieceSize, newPieceLength abi.PaddedPieceSize) ([]abi.PaddedPieceSize, abi.PaddedPieceSize) {
allPieces := make([]abi.PieceInfo, 0, len(pieces))
var sum abi.PaddedPieceSize
padTo := func(s abi.PaddedPieceSize, trailing bool) { padPieces := make([]abi.PaddedPieceSize, 0)
// pad remaining space with 0 CommPs
toFill := uint64(-sum % s) toFill := uint64(-oldLength % newPieceLength)
if trailing && sum == 0 {
toFill = uint64(s)
}
n := bits.OnesCount64(toFill) n := bits.OnesCount64(toFill)
var sum abi.PaddedPieceSize
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
next := bits.TrailingZeros64(toFill) next := bits.TrailingZeros64(toFill)
psize := uint64(1) << uint(next) psize := uint64(1) << uint(next)
toFill ^= psize toFill ^= psize
padded := abi.PaddedPieceSize(psize) padded := abi.PaddedPieceSize(psize)
allPieces = append(allPieces, abi.PieceInfo{ padPieces = append(padPieces, padded)
Size: padded,
PieceCID: zerocomm.ZeroPieceCommitment(padded.Unpadded()),
})
sum += padded sum += padded
} }
return padPieces, sum
} }
for _, p := range pieces { func GenerateUnsealedCID(proofType abi.RegisteredSealProof, pieces []abi.PieceInfo) (cid.Cid, error) {
padTo(p.Size, false)
allPieces = append(allPieces, p)
sum += p.Size
}
ssize, err := proofType.SectorSize() ssize, err := proofType.SectorSize()
if err != nil { if err != nil {
return cid.Undef, err return cid.Undef, err
} }
padTo(abi.PaddedPieceSize(ssize), true) pssize := abi.PaddedPieceSize(ssize)
allPieces := make([]abi.PieceInfo, 0, len(pieces))
if len(pieces) == 0 {
allPieces = append(allPieces, abi.PieceInfo{
Size: pssize,
PieceCID: zerocomm.ZeroPieceCommitment(pssize.Unpadded()),
})
} else {
var sum abi.PaddedPieceSize
padTo := func(pads []abi.PaddedPieceSize) {
for _, p := range pads {
allPieces = append(allPieces, abi.PieceInfo{
Size: p,
PieceCID: zerocomm.ZeroPieceCommitment(p.Unpadded()),
})
sum += p
}
}
for _, p := range pieces {
ps, _ := GetRequiredPadding(sum, p.Size)
padTo(ps)
allPieces = append(allPieces, p)
sum += p.Size
}
ps, _ := GetRequiredPadding(sum, pssize)
padTo(ps)
}
return ffi.GenerateUnsealedCID(proofType, allPieces) return ffi.GenerateUnsealedCID(proofType, allPieces)
} }