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

lotus bench delete ix

Browse Source
This commit is contained in:
zgfzgf 2020-10-11 11:39:27 +08:00
parent c458f6e826
commit c810b157cf
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/lotus-bench/main.go
View File

@ -477,7 +477,7 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par
return nil, nil, fmt.Errorf("parallelism factor must cleanly divide numSectors") return nil, nil, fmt.Errorf("parallelism factor must cleanly divide numSectors")
} }
for i := abi.SectorNumber(1); i <= abi.SectorNumber(numSectors); i++ { for i := abi.SectorNumber(0); i < abi.SectorNumber(numSectors); i++ {
sid := abi.SectorID{ sid := abi.SectorID{
Miner: mid, Miner: mid,
Number: i, Number: i,
@ -495,7 +495,7 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par
pieces = append(pieces, pi) pieces = append(pieces, pi)
sealTimings[i-1].AddPiece = time.Since(start) sealTimings[i].AddPiece = time.Since(start)
} }
sectorsPerWorker := numSectors / par.PreCommit1 sectorsPerWorker := numSectors / par.PreCommit1
@ -504,10 +504,9 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par
for wid := 0; wid < par.PreCommit1; wid++ { for wid := 0; wid < par.PreCommit1; wid++ {
go func(worker int) { go func(worker int) {
sealerr := func() error { sealerr := func() error {
start := 1 + (worker * sectorsPerWorker) start := worker * sectorsPerWorker
end := start + sectorsPerWorker end := start + sectorsPerWorker
for i := abi.SectorNumber(start); i < abi.SectorNumber(end); i++ { for i := abi.SectorNumber(start); i < abi.SectorNumber(end); i++ {
ix := int(i - 1)
sid := abi.SectorID{ sid := abi.SectorID{
Miner: mid, Miner: mid,
Number: i, Number: i,
@ -519,8 +518,8 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par
ticket := abi.SealRandomness(trand[:]) ticket := abi.SealRandomness(trand[:])
log.Infof("[%d] Running replication(1)...", i) log.Infof("[%d] Running replication(1)...", i)
pieces := []abi.PieceInfo{pieces[ix]} piece := []abi.PieceInfo{pieces[i]}
pc1o, err := sb.SealPreCommit1(context.TODO(), sid, ticket, pieces) pc1o, err := sb.SealPreCommit1(context.TODO(), sid, ticket, piece)
if err != nil { if err != nil {
return xerrors.Errorf("commit: %w", err) return xerrors.Errorf("commit: %w", err)
} }
@ -538,7 +537,7 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par
precommit2 := time.Now() precommit2 := time.Now()
<-preCommit2Sema <-preCommit2Sema
sealedSectors[ix] = saproof.SectorInfo{ sealedSectors[i] = saproof.SectorInfo{
SealProof: sb.SealProofType(), SealProof: sb.SealProofType(),
SectorNumber: i, SectorNumber: i,
SealedCID: cids.Sealed, SealedCID: cids.Sealed,
@ -552,7 +551,7 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par
commitSema <- struct{}{} commitSema <- struct{}{}
commitStart := time.Now() commitStart := time.Now()
log.Infof("[%d] Generating PoRep for sector (1)", i) log.Infof("[%d] Generating PoRep for sector (1)", i)
c1o, err := sb.SealCommit1(context.TODO(), sid, ticket, seed.Value, pieces, cids) c1o, err := sb.SealCommit1(context.TODO(), sid, ticket, seed.Value, piece, cids)
if err != nil { if err != nil {
return err return err
} }
@ -633,12 +632,12 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par
} }
unseal := time.Now() unseal := time.Now()
sealTimings[ix].PreCommit1 = precommit1.Sub(start) sealTimings[i].PreCommit1 = precommit1.Sub(start)
sealTimings[ix].PreCommit2 = precommit2.Sub(pc2Start) sealTimings[i].PreCommit2 = precommit2.Sub(pc2Start)
sealTimings[ix].Commit1 = sealcommit1.Sub(commitStart) sealTimings[i].Commit1 = sealcommit1.Sub(commitStart)
sealTimings[ix].Commit2 = sealcommit2.Sub(sealcommit1) sealTimings[i].Commit2 = sealcommit2.Sub(sealcommit1)
sealTimings[ix].Verify = verifySeal.Sub(sealcommit2) sealTimings[i].Verify = verifySeal.Sub(sealcommit2)
sealTimings[ix].Unseal = unseal.Sub(verifySeal) sealTimings[i].Unseal = unseal.Sub(verifySeal)
} }
return nil return nil
}() }()